summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/servconf.c b/servconf.c
index 72d75cc98..085854908 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.103 2002/03/18 23:52:51 stevesk Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.104 2002/03/19 03:03:43 stevesk Exp $");
14 14
15#if defined(KRB4) || defined(KRB5) 15#if defined(KRB4) || defined(KRB5)
16#include <krb.h> 16#include <krb.h>
@@ -115,7 +115,6 @@ initialize_server_options(ServerOptions *options)
115 115
116 options->unprivileged_user = -1; 116 options->unprivileged_user = -1;
117 options->unprivileged_group = -1; 117 options->unprivileged_group = -1;
118 options->unprivileged_dir = NULL;
119 118
120 /* Needs to be accessable in many places */ 119 /* Needs to be accessable in many places */
121 use_privsep = -1; 120 use_privsep = -1;
@@ -252,8 +251,6 @@ fill_default_server_options(ServerOptions *options)
252 options->unprivileged_user = 32767; 251 options->unprivileged_user = 32767;
253 if (options->unprivileged_group == -1) 252 if (options->unprivileged_group == -1)
254 options->unprivileged_group = 32767; 253 options->unprivileged_group = 32767;
255 if (options->unprivileged_dir == NULL)
256 options->unprivileged_dir = "/var/empty";
257} 254}
258 255
259/* Keyword tokens. */ 256/* Keyword tokens. */
@@ -286,7 +283,7 @@ typedef enum {
286 sBanner, sVerifyReverseMapping, sHostbasedAuthentication, 283 sBanner, sVerifyReverseMapping, sHostbasedAuthentication,
287 sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, 284 sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
288 sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, 285 sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
289 sUsePrivilegeSeparation, sUnprivUser, sUnprivGroup, sUnprivDir, 286 sUsePrivilegeSeparation, sUnprivUser, sUnprivGroup,
290 sDeprecated 287 sDeprecated
291} ServerOpCodes; 288} ServerOpCodes;
292 289
@@ -365,7 +362,6 @@ static struct {
365 { "useprivilegeseparation", sUsePrivilegeSeparation}, 362 { "useprivilegeseparation", sUsePrivilegeSeparation},
366 { "unprivuser", sUnprivUser}, 363 { "unprivuser", sUnprivUser},
367 { "unprivgroup", sUnprivGroup}, 364 { "unprivgroup", sUnprivGroup},
368 { "unprivdir", sUnprivDir},
369 { NULL, sBadOption } 365 { NULL, sBadOption }
370}; 366};
371 367
@@ -754,10 +750,6 @@ parse_flag:
754 intptr = &options->unprivileged_group; 750 intptr = &options->unprivileged_group;
755 goto parse_int; 751 goto parse_int;
756 752
757 case sUnprivDir:
758 charptr = &options->unprivileged_dir;
759 goto parse_filename;
760
761 case sAllowUsers: 753 case sAllowUsers:
762 while ((arg = strdelim(&cp)) && *arg != '\0') { 754 while ((arg = strdelim(&cp)) && *arg != '\0') {
763 if (options->num_allow_users >= MAX_ALLOW_USERS) 755 if (options->num_allow_users >= MAX_ALLOW_USERS)