[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.203 and 1.204

version 1.203, 2010/02/26 20:29:54 version 1.204, 2010/03/04 10:36:03
Line 122 
Line 122 
         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->revoked_keys_file = NULL;
           options->trusted_user_ca_keys = NULL;
 }  }
   
 void  void
Line 283 
Line 285 
         sMatch, sPermitOpen, sForceCommand, sChrootDirectory,          sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
         sUsePrivilegeSeparation, sAllowAgentForwarding,          sUsePrivilegeSeparation, sAllowAgentForwarding,
         sZeroKnowledgePasswordAuthentication, sHostCertificate,          sZeroKnowledgePasswordAuthentication, sHostCertificate,
           sRevokedKeys, sTrustedUserCAKeys,
         sDeprecated, sUnsupported          sDeprecated, sUnsupported
 } ServerOpCodes;  } ServerOpCodes;
   
Line 390 
Line 393 
         { "forcecommand", sForceCommand, SSHCFG_ALL },          { "forcecommand", sForceCommand, SSHCFG_ALL },
         { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },          { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
         { "hostcertificate", sHostCertificate, SSHCFG_GLOBAL },          { "hostcertificate", sHostCertificate, SSHCFG_GLOBAL },
           { "revokedkeys", sRevokedKeys, SSHCFG_ALL },
           { "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
         { NULL, sBadOption, 0 }          { NULL, sBadOption, 0 }
 };  };
   
Line 1280 
Line 1285 
                         *charptr = xstrdup(arg);                          *charptr = xstrdup(arg);
                 break;                  break;
   
           case sTrustedUserCAKeys:
                   charptr = &options->trusted_user_ca_keys;
                   goto parse_filename;
   
           case sRevokedKeys:
                   charptr = &options->revoked_keys_file;
                   goto parse_filename;
   
         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 1394 
Line 1407 
                 return;                  return;
         M_CP_STROPT(adm_forced_command);          M_CP_STROPT(adm_forced_command);
         M_CP_STROPT(chroot_directory);          M_CP_STROPT(chroot_directory);
           M_CP_STROPT(trusted_user_ca_keys);
           M_CP_STROPT(revoked_keys_file);
 }  }
   
 #undef M_CP_INTOPT  #undef M_CP_INTOPT
Line 1608 
Line 1623 
         dump_cfg_string(sAuthorizedKeysFile2, o->authorized_keys_file2);          dump_cfg_string(sAuthorizedKeysFile2, o->authorized_keys_file2);
         dump_cfg_string(sForceCommand, o->adm_forced_command);          dump_cfg_string(sForceCommand, o->adm_forced_command);
         dump_cfg_string(sChrootDirectory, o->chroot_directory);          dump_cfg_string(sChrootDirectory, o->chroot_directory);
           dump_cfg_string(sTrustedUserCAKeys, o->trusted_user_ca_keys);
           dump_cfg_string(sRevokedKeys, o->revoked_keys_file);
   
         /* string arguments requiring a lookup */          /* string arguments requiring a lookup */
         dump_cfg_string(sLogLevel, log_level_name(o->log_level));          dump_cfg_string(sLogLevel, log_level_name(o->log_level));
Legend:
Removed from v.1.203  
changed lines
  Added in v.1.204