diff options
author | Damien Miller <djm@mindrot.org> | 2002-03-13 13:19:42 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-03-13 13:19:42 +1100 |
commit | 3a5b0233306a3db3a5db5b9ddc187c55e9b251f4 (patch) | |
tree | 86478addb63771a9a1be0e13cfbdea9f964f963a /servconf.c | |
parent | 3225fb454d0e79cf6f824dd00ff478749620277b (diff) |
Stupid djm commits experimental code to head instead of branch
revert
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/servconf.c b/servconf.c index c3f1253e8..9bbd994ca 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -36,8 +36,6 @@ static void add_one_listen_addr(ServerOptions *, char *, u_short); | |||
36 | 36 | ||
37 | /* AF_UNSPEC or AF_INET or AF_INET6 */ | 37 | /* AF_UNSPEC or AF_INET or AF_INET6 */ |
38 | extern int IPv4or6; | 38 | extern int IPv4or6; |
39 | /* Use of privilege separation or not */ | ||
40 | extern int use_privsep; | ||
41 | 39 | ||
42 | /* Initializes the server options to their default values. */ | 40 | /* Initializes the server options to their default values. */ |
43 | 41 | ||
@@ -112,9 +110,6 @@ initialize_server_options(ServerOptions *options) | |||
112 | options->client_alive_count_max = -1; | 110 | options->client_alive_count_max = -1; |
113 | options->authorized_keys_file = NULL; | 111 | options->authorized_keys_file = NULL; |
114 | options->authorized_keys_file2 = NULL; | 112 | options->authorized_keys_file2 = NULL; |
115 | |||
116 | /* Needs to be accessable in many places */ | ||
117 | use_privsep = -1; | ||
118 | } | 113 | } |
119 | 114 | ||
120 | void | 115 | void |
@@ -240,10 +235,6 @@ fill_default_server_options(ServerOptions *options) | |||
240 | } | 235 | } |
241 | if (options->authorized_keys_file == NULL) | 236 | if (options->authorized_keys_file == NULL) |
242 | options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS; | 237 | options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS; |
243 | |||
244 | /* Turn privilege separation on by default */ | ||
245 | if (use_privsep == -1) | ||
246 | use_privsep = 1; | ||
247 | } | 238 | } |
248 | 239 | ||
249 | /* Keyword tokens. */ | 240 | /* Keyword tokens. */ |
@@ -276,7 +267,6 @@ typedef enum { | |||
276 | sBanner, sVerifyReverseMapping, sHostbasedAuthentication, | 267 | sBanner, sVerifyReverseMapping, sHostbasedAuthentication, |
277 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, | 268 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, |
278 | sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, | 269 | sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, |
279 | sUsePrivilegeSeparation, | ||
280 | sDeprecated | 270 | sDeprecated |
281 | } ServerOpCodes; | 271 | } ServerOpCodes; |
282 | 272 | ||
@@ -352,7 +342,6 @@ static struct { | |||
352 | { "clientalivecountmax", sClientAliveCountMax }, | 342 | { "clientalivecountmax", sClientAliveCountMax }, |
353 | { "authorizedkeysfile", sAuthorizedKeysFile }, | 343 | { "authorizedkeysfile", sAuthorizedKeysFile }, |
354 | { "authorizedkeysfile2", sAuthorizedKeysFile2 }, | 344 | { "authorizedkeysfile2", sAuthorizedKeysFile2 }, |
355 | { "useprivilegeseparation", sUsePrivilegeSeparation}, | ||
356 | { NULL, sBadOption } | 345 | { NULL, sBadOption } |
357 | }; | 346 | }; |
358 | 347 | ||
@@ -729,10 +718,6 @@ parse_flag: | |||
729 | intptr = &options->allow_tcp_forwarding; | 718 | intptr = &options->allow_tcp_forwarding; |
730 | goto parse_flag; | 719 | goto parse_flag; |
731 | 720 | ||
732 | case sUsePrivilegeSeparation: | ||
733 | intptr = &use_privsep; | ||
734 | goto parse_flag; | ||
735 | |||
736 | case sAllowUsers: | 721 | case sAllowUsers: |
737 | while ((arg = strdelim(&cp)) && *arg != '\0') { | 722 | while ((arg = strdelim(&cp)) && *arg != '\0') { |
738 | if (options->num_allow_users >= MAX_ALLOW_USERS) | 723 | if (options->num_allow_users >= MAX_ALLOW_USERS) |