setclasscontext: support LOGIN_SETRTABLE too

Do not clear LOGIN_SETRTABLE if it is set in flags.
OK deraadt@

diff --git a/lib/libc/gen/login_cap.3 b/lib/libc/gen/login_cap.3
index 5e57057..169c670 100644 (file)
--- a/lib/libc/gen/login_cap.3
+++ b/lib/libc/gen/login_cap.3
@@ -29,10 +29,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $OpenBSD: login_cap.3,v 1.19 2022/03/04 08:47:53 tb Exp $
+.\" $OpenBSD: login_cap.3,v 1.20 2022/03/23 14:39:52 millert Exp $
 .\" BSDI $From: login_cap.3,v 1.4 1997/11/07 16:22:27 jch Exp $
 .\"
-.Dd $Mdocdate: March 4 2022 $
+.Dd $Mdocdate: March 23 2022 $
 .Dt LOGIN_GETCLASS 3
 .Os
 .Sh NAME
@@ -181,6 +181,7 @@ Only the
 .Dv LOGIN_SETPATH ,
 .Dv LOGIN_SETPRIORITY ,
 .Dv LOGIN_SETRESOURCES ,
+.Dv LOGIN_SETRTABLE ,
 and
 .Dv LOGIN_SETUMASK
 bits are used

diff --git a/lib/libc/gen/login_cap.c b/lib/libc/gen/login_cap.c
index 4779f48..53e27d7 100644 (file)
--- a/lib/libc/gen/login_cap.c
+++ b/lib/libc/gen/login_cap.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: login_cap.c,v 1.44 2022/03/20 23:24:03 millert Exp $  */
+/*     $OpenBSD: login_cap.c,v 1.45 2022/03/23 14:39:52 millert Exp $  */
 
 /*
  * Copyright (c) 2000-2004 Todd C. Miller <millert@openbsd.org>
@@ -573,7 +573,7 @@ setclasscontext(char *class, u_int flags)
        login_cap_t *lc;
 
        flags &= LOGIN_SETRESOURCES | LOGIN_SETPRIORITY | LOGIN_SETUMASK |
-           LOGIN_SETPATH;
+           LOGIN_SETPATH | LOGIN_SETRTABLE;
 
        lc = login_getclass(class);
        ret = lc ? setusercontext(lc, NULL, 0, flags) : -1;