[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.130 and 1.131

version 1.130, 2003/12/23 16:12:10 version 1.131, 2004/04/27 09:46:37
Line 96 
Line 96 
         options->client_alive_count_max = -1;          options->client_alive_count_max = -1;
         options->authorized_keys_file = NULL;          options->authorized_keys_file = NULL;
         options->authorized_keys_file2 = NULL;          options->authorized_keys_file2 = NULL;
           options->num_accept_env = 0;
   
         /* Needs to be accessable in many places */          /* Needs to be accessable in many places */
         use_privsep = -1;          use_privsep = -1;
Line 243 
Line 244 
         sBanner, sUseDNS, sHostbasedAuthentication,          sBanner, sUseDNS, sHostbasedAuthentication,
         sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,          sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
         sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,          sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
         sGssAuthentication, sGssCleanupCreds,          sGssAuthentication, sGssCleanupCreds, sAcceptEnv,
         sUsePrivilegeSeparation,          sUsePrivilegeSeparation,
         sDeprecated, sUnsupported          sDeprecated, sUnsupported
 } ServerOpCodes;  } ServerOpCodes;
Line 331 
Line 332 
         { "authorizedkeysfile", sAuthorizedKeysFile },          { "authorizedkeysfile", sAuthorizedKeysFile },
         { "authorizedkeysfile2", sAuthorizedKeysFile2 },          { "authorizedkeysfile2", sAuthorizedKeysFile2 },
         { "useprivilegeseparation", sUsePrivilegeSeparation},          { "useprivilegeseparation", sUsePrivilegeSeparation},
           { "acceptenv", sAcceptEnv },
         { NULL, sBadOption }          { NULL, sBadOption }
 };  };
   
Line 850 
Line 852 
         case sClientAliveCountMax:          case sClientAliveCountMax:
                 intptr = &options->client_alive_count_max;                  intptr = &options->client_alive_count_max;
                 goto parse_int;                  goto parse_int;
   
           case sAcceptEnv:
                   while ((arg = strdelim(&cp)) && *arg != '\0') {
                           if (strchr(arg, '=') != NULL)
                                   fatal("%s line %d: Invalid environment name.",
                                       filename, linenum);
                           if (options->num_accept_env >= MAX_ACCEPT_ENV)
                                   fatal("%s line %d: too many allow env.",
                                       filename, linenum);
                           options->accept_env[options->num_accept_env++] =
                               xstrdup(arg);
                   }
                   break;
   
         case sDeprecated:          case sDeprecated:
                 logit("%s line %d: Deprecated option %s",                  logit("%s line %d: Deprecated option %s",
Legend:
Removed from v.1.130  
changed lines
  Added in v.1.131