Stupid djm commits experimental code to head instead of branch

[openssh.git] / servconf.c

diff --git a/servconf.c b/servconf.c
index c3f1253e8dd4036f15c117f913a526341d1f0f5e..9bbd994ca556417462dee5f9dbfcc79eeb4789b0 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -36,8 +36,6 @@ static void add_one_listen_addr(ServerOptions *, char *, u_short);
 
 /* AF_UNSPEC or AF_INET or AF_INET6 */
 extern int IPv4or6;
-/* Use of privilege separation or not */
-extern int use_privsep;
 
 /* Initializes the server options to their default values. */
 
@@ -112,9 +110,6 @@ initialize_server_options(ServerOptions *options)
        options->client_alive_count_max = -1;
        options->authorized_keys_file = NULL;
        options->authorized_keys_file2 = NULL;
-
-       /* Needs to be accessable in many places */
-       use_privsep = -1;
 }
 
 void
@@ -240,10 +235,6 @@ fill_default_server_options(ServerOptions *options)
        }
        if (options->authorized_keys_file == NULL)
                options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS;
-
-       /* Turn privilege separation on by default */
-       if (use_privsep == -1)
-               use_privsep = 1;
 }
 
 /* Keyword tokens. */
@@ -276,7 +267,6 @@ typedef enum {
        sBanner, sVerifyReverseMapping, sHostbasedAuthentication,
        sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
        sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
-       sUsePrivilegeSeparation,
        sDeprecated
 } ServerOpCodes;
 
@@ -352,7 +342,6 @@ static struct {
        { "clientalivecountmax", sClientAliveCountMax },
        { "authorizedkeysfile", sAuthorizedKeysFile },
        { "authorizedkeysfile2", sAuthorizedKeysFile2 },
-       { "useprivilegeseparation", sUsePrivilegeSeparation},
        { NULL, sBadOption }
 };
 
@@ -729,10 +718,6 @@ parse_flag:
                intptr = &options->allow_tcp_forwarding;
                goto parse_flag;
 
-       case sUsePrivilegeSeparation:
-               intptr = &use_privsep;
-               goto parse_flag;
-
        case sAllowUsers:
                while ((arg = strdelim(&cp)) && *arg != '\0') {
                        if (options->num_allow_users >= MAX_ALLOW_USERS)