summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-03-22 02:40:03 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-03-22 02:40:03 +0000
commit01426a67c86850a06af757c2661409f87ed05414 (patch)
tree1e28c6c215d7b40795ed561a04d0fd6e648ec3da
parent191c8e5eb92bd482ad7444a4287fea0bae57af25 (diff)
- stevesk@cvs.openbsd.org 2002/03/18 23:52:51
[servconf.c] UnprivUser/UnprivGroup usable now--specify numeric user/group; ok provos@
-rw-r--r--ChangeLog6
-rw-r--r--servconf.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index df05e15ac..d70c27a78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,10 @@
71 - provos@cvs.openbsd.org 2002/03/18 17:59:09 71 - provos@cvs.openbsd.org 2002/03/18 17:59:09
72 [sshd.8] 72 [sshd.8]
73 document UsePrivilegeSeparation 73 document UsePrivilegeSeparation
74 - stevesk@cvs.openbsd.org 2002/03/18 23:52:51
75 [servconf.c]
76 UnprivUser/UnprivGroup usable now--specify numeric user/group; ok
77 provos@
74 78
7520020317 7920020317
76 - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, 80 - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted,
@@ -7917,4 +7921,4 @@
7917 - Wrote replacements for strlcpy and mkdtemp 7921 - Wrote replacements for strlcpy and mkdtemp
7918 - Released 1.0pre1 7922 - Released 1.0pre1
7919 7923
7920$Id: ChangeLog,v 1.1945 2002/03/22 02:37:50 mouring Exp $ 7924$Id: ChangeLog,v 1.1946 2002/03/22 02:40:03 mouring Exp $
diff --git a/servconf.c b/servconf.c
index 3b6b55e93..72d75cc98 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.102 2002/03/18 17:50:31 provos Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.103 2002/03/18 23:52:51 stevesk Exp $");
14 14
15#if defined(KRB4) || defined(KRB5) 15#if defined(KRB4) || defined(KRB5)
16#include <krb.h> 16#include <krb.h>
@@ -748,11 +748,11 @@ parse_flag:
748 748
749 case sUnprivUser: 749 case sUnprivUser:
750 intptr = &options->unprivileged_user; 750 intptr = &options->unprivileged_user;
751 goto parse_flag; 751 goto parse_int;
752 752
753 case sUnprivGroup: 753 case sUnprivGroup:
754 intptr = &options->unprivileged_group; 754 intptr = &options->unprivileged_group;
755 goto parse_flag; 755 goto parse_int;
756 756
757 case sUnprivDir: 757 case sUnprivDir:
758 charptr = &options->unprivileged_dir; 758 charptr = &options->unprivileged_dir;