[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.199 and 1.200

version 1.199, 2009/12/29 16:38:41 version 1.200, 2010/01/09 23:04:13
Line 121 
Line 121 
         options->adm_forced_command = NULL;          options->adm_forced_command = NULL;
         options->chroot_directory = NULL;          options->chroot_directory = NULL;
         options->zero_knowledge_password_authentication = -1;          options->zero_knowledge_password_authentication = -1;
         options->rdomain = -1;  
 }  }
   
 void  void
Line 280 
Line 279 
         sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,          sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
         sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,          sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
         sMatch, sPermitOpen, sForceCommand, sChrootDirectory,          sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
         sUsePrivilegeSeparation, sAllowAgentForwarding, sRDomain,          sUsePrivilegeSeparation, sAllowAgentForwarding,
         sZeroKnowledgePasswordAuthentication,          sZeroKnowledgePasswordAuthentication,
         sDeprecated, sUnsupported          sDeprecated, sUnsupported
 } ServerOpCodes;  } ServerOpCodes;
Line 387 
Line 386 
         { "match", sMatch, SSHCFG_ALL },          { "match", sMatch, SSHCFG_ALL },
         { "permitopen", sPermitOpen, SSHCFG_ALL },          { "permitopen", sPermitOpen, SSHCFG_ALL },
         { "forcecommand", sForceCommand, SSHCFG_ALL },          { "forcecommand", sForceCommand, SSHCFG_ALL },
         { "routingdomain", sRDomain, SSHCFG_GLOBAL },  
         { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },          { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
         { NULL, sBadOption, 0 }          { NULL, sBadOption, 0 }
 };  };
Line 1253 
Line 1251 
                         *charptr = xstrdup(arg);                          *charptr = xstrdup(arg);
                 break;                  break;
   
         case sRDomain:  
                 intptr = &options->rdomain;  
                 arg = strdelim(&cp);  
                 if (!arg || *arg == '\0')  
                         fatal("%s line %d: missing rdomain value.",  
                             filename, linenum);  
                 if ((value = a2rdomain(arg)) == -1)  
                         fatal("%s line %d: invalid rdomain value.",  
                             filename, linenum);  
                 if (*intptr == -1)  
                         *intptr = value;  
                 break;  
   
         case sDeprecated:          case sDeprecated:
                 logit("%s line %d: Deprecated option %s",                  logit("%s line %d: Deprecated option %s",
                     filename, linenum, arg);                      filename, linenum, arg);
Line 1539 
Line 1524 
         dump_cfg_int(sMaxSessions, o->max_sessions);          dump_cfg_int(sMaxSessions, o->max_sessions);
         dump_cfg_int(sClientAliveInterval, o->client_alive_interval);          dump_cfg_int(sClientAliveInterval, o->client_alive_interval);
         dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max);          dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max);
         dump_cfg_int(sRDomain, o->rdomain);  
   
         /* formatted integer arguments */          /* formatted integer arguments */
         dump_cfg_fmtint(sPermitRootLogin, o->permit_root_login);          dump_cfg_fmtint(sPermitRootLogin, o->permit_root_login);

Legend:
Removed from v.1.199  
changed lines
  Added in v.1.200