[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.269 and 1.270

version 1.269, 2015/05/04 06:10:48 version 1.270, 2015/05/21 06:43:30
Line 151 
Line 151 
         options->revoked_keys_file = NULL;          options->revoked_keys_file = NULL;
         options->trusted_user_ca_keys = NULL;          options->trusted_user_ca_keys = NULL;
         options->authorized_principals_file = NULL;          options->authorized_principals_file = NULL;
           options->authorized_principals_command = NULL;
           options->authorized_principals_command_user = NULL;
         options->ip_qos_interactive = -1;          options->ip_qos_interactive = -1;
         options->ip_qos_bulk = -1;          options->ip_qos_bulk = -1;
         options->version_addendum = NULL;          options->version_addendum = NULL;
Line 371 
Line 373 
         sUsePrivilegeSeparation, sAllowAgentForwarding,          sUsePrivilegeSeparation, sAllowAgentForwarding,
         sHostCertificate,          sHostCertificate,
         sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,          sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,
           sAuthorizedPrincipalsCommand, sAuthorizedPrincipalsCommandUser,
         sKexAlgorithms, sIPQoS, sVersionAddendum,          sKexAlgorithms, sIPQoS, sVersionAddendum,
         sAuthorizedKeysCommand, sAuthorizedKeysCommandUser,          sAuthorizedKeysCommand, sAuthorizedKeysCommandUser,
         sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,          sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
Line 491 
Line 494 
         { "ipqos", sIPQoS, SSHCFG_ALL },          { "ipqos", sIPQoS, SSHCFG_ALL },
         { "authorizedkeyscommand", sAuthorizedKeysCommand, SSHCFG_ALL },          { "authorizedkeyscommand", sAuthorizedKeysCommand, SSHCFG_ALL },
         { "authorizedkeyscommanduser", sAuthorizedKeysCommandUser, SSHCFG_ALL },          { "authorizedkeyscommanduser", sAuthorizedKeysCommandUser, SSHCFG_ALL },
           { "authorizedprincipalscommand", sAuthorizedPrincipalsCommand, SSHCFG_ALL },
           { "authorizedprincipalscommanduser", sAuthorizedPrincipalsCommandUser, SSHCFG_ALL },
         { "versionaddendum", sVersionAddendum, SSHCFG_GLOBAL },          { "versionaddendum", sVersionAddendum, SSHCFG_GLOBAL },
         { "authenticationmethods", sAuthenticationMethods, SSHCFG_ALL },          { "authenticationmethods", sAuthenticationMethods, SSHCFG_ALL },
         { "streamlocalbindmask", sStreamLocalBindMask, SSHCFG_ALL },          { "streamlocalbindmask", sStreamLocalBindMask, SSHCFG_ALL },
Line 1687 
Line 1692 
                         *charptr = xstrdup(arg);                          *charptr = xstrdup(arg);
                 break;                  break;
   
           case sAuthorizedPrincipalsCommand:
                   if (cp == NULL)
                           fatal("%.200s line %d: Missing argument.", filename,
                               linenum);
                   len = strspn(cp, WHITESPACE);
                   if (*activep &&
                       options->authorized_principals_command == NULL) {
                           if (cp[len] != '/' && strcasecmp(cp + len, "none") != 0)
                                   fatal("%.200s line %d: "
                                       "AuthorizedPrincipalsCommand must be "
                                       "an absolute path", filename, linenum);
                           options->authorized_principals_command =
                               xstrdup(cp + len);
                   }
                   return 0;
   
           case sAuthorizedPrincipalsCommandUser:
                   charptr = &options->authorized_principals_command_user;
   
                   arg = strdelim(&cp);
                   if (!arg || *arg == '\0')
                           fatal("%s line %d: missing "
                               "AuthorizedPrincipalsCommandUser argument.",
                               filename, linenum);
                   if (*activep && *charptr == NULL)
                           *charptr = xstrdup(arg);
                   break;
   
         case sAuthenticationMethods:          case sAuthenticationMethods:
                 if (options->num_auth_methods == 0) {                  if (options->num_auth_methods == 0) {
                         while ((arg = strdelim(&cp)) && *arg != '\0') {                          while ((arg = strdelim(&cp)) && *arg != '\0') {
Line 2177 
Line 2210 
             ? "none" : o->version_addendum);              ? "none" : o->version_addendum);
         dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);          dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);
         dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);          dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);
           dump_cfg_string(sAuthorizedPrincipalsCommand, o->authorized_principals_command);
           dump_cfg_string(sAuthorizedPrincipalsCommandUser, o->authorized_principals_command_user);
         dump_cfg_string(sHostKeyAgent, o->host_key_agent);          dump_cfg_string(sHostKeyAgent, o->host_key_agent);
         dump_cfg_string(sKexAlgorithms,          dump_cfg_string(sKexAlgorithms,
             o->kex_algorithms ? o->kex_algorithms : KEX_SERVER_KEX);              o->kex_algorithms ? o->kex_algorithms : KEX_SERVER_KEX);
Legend:
Removed from v.1.269  
changed lines
  Added in v.1.270