[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.196 and 1.197

version 1.196, 2009/10/08 14:03:41 version 1.197, 2009/10/28 16:38:18
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 279 
Line 280 
         sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,          sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
         sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,          sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
         sMatch, sPermitOpen, sForceCommand, sChrootDirectory,          sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
         sUsePrivilegeSeparation, sAllowAgentForwarding,          sUsePrivilegeSeparation, sAllowAgentForwarding, sRDomain,
         sZeroKnowledgePasswordAuthentication,          sZeroKnowledgePasswordAuthentication,
         sDeprecated, sUnsupported          sDeprecated, sUnsupported
 } ServerOpCodes;  } ServerOpCodes;
Line 386 
Line 387 
         { "match", sMatch, SSHCFG_ALL },          { "match", sMatch, SSHCFG_ALL },
         { "permitopen", sPermitOpen, SSHCFG_ALL },          { "permitopen", sPermitOpen, SSHCFG_ALL },
         { "forcecommand", sForceCommand, SSHCFG_ALL },          { "forcecommand", sForceCommand, SSHCFG_ALL },
           { "rdomain", sRDomain, SSHCFG_GLOBAL },
         { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },          { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
         { NULL, sBadOption, 0 }          { NULL, sBadOption, 0 }
 };  };
Line 1251 
Line 1253 
                         *charptr = xstrdup(arg);                          *charptr = xstrdup(arg);
                 break;                  break;
   
           case sRDomain:
                   intptr = &options->rdomain;
                   goto parse_int;
   
         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 1524 
Line 1530 
         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.196  
changed lines
  Added in v.1.197