[BACK]Return to servconf.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/servconf.c between version 1.104 and 1.105

version 1.104, 2002/03/19 03:03:43 version 1.105, 2002/03/20 19:12:24
Line 108 
Line 108 
         options->authorized_keys_file = NULL;          options->authorized_keys_file = NULL;
         options->authorized_keys_file2 = NULL;          options->authorized_keys_file2 = NULL;
   
         options->unprivileged_user = -1;  
         options->unprivileged_group = -1;  
   
         /* Needs to be accessable in many places */          /* Needs to be accessable in many places */
         use_privsep = -1;          use_privsep = -1;
 }  }
Line 237 
Line 234 
         /* Turn privilege separation _off_ by default */          /* Turn privilege separation _off_ by default */
         if (use_privsep == -1)          if (use_privsep == -1)
                 use_privsep = 0;                  use_privsep = 0;
         if (options->unprivileged_user == -1)  
                 options->unprivileged_user = 32767;  
         if (options->unprivileged_group == -1)  
                 options->unprivileged_group = 32767;  
 }  }
   
 /* Keyword tokens. */  /* Keyword tokens. */
Line 270 
Line 263 
         sBanner, sVerifyReverseMapping, sHostbasedAuthentication,          sBanner, sVerifyReverseMapping, sHostbasedAuthentication,
         sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,          sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
         sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,          sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
         sUsePrivilegeSeparation, sUnprivUser, sUnprivGroup,          sUsePrivilegeSeparation,
         sDeprecated          sDeprecated
 } ServerOpCodes;  } ServerOpCodes;
   
Line 344 
Line 337 
         { "authorizedkeysfile", sAuthorizedKeysFile },          { "authorizedkeysfile", sAuthorizedKeysFile },
         { "authorizedkeysfile2", sAuthorizedKeysFile2 },          { "authorizedkeysfile2", sAuthorizedKeysFile2 },
         { "useprivilegeseparation", sUsePrivilegeSeparation},          { "useprivilegeseparation", sUsePrivilegeSeparation},
         { "unprivuser", sUnprivUser},  
         { "unprivgroup", sUnprivGroup},  
         { NULL, sBadOption }          { NULL, sBadOption }
 };  };
   
Line 719 
Line 710 
         case sUsePrivilegeSeparation:          case sUsePrivilegeSeparation:
                 intptr = &use_privsep;                  intptr = &use_privsep;
                 goto parse_flag;                  goto parse_flag;
   
         case sUnprivUser:  
                 intptr = &options->unprivileged_user;  
                 goto parse_int;  
   
         case sUnprivGroup:  
                 intptr = &options->unprivileged_group;  
                 goto parse_int;  
   
         case sAllowUsers:          case sAllowUsers:
                 while ((arg = strdelim(&cp)) && *arg != '\0') {                  while ((arg = strdelim(&cp)) && *arg != '\0') {

Legend:
Removed from v.1.104  
changed lines
  Added in v.1.105