[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.202 and 1.203

version 1.202, 2010/01/13 03:48:12 version 1.203, 2010/02/26 20:29:54
Line 58 
Line 58 
         options->listen_addrs = NULL;          options->listen_addrs = NULL;
         options->address_family = -1;          options->address_family = -1;
         options->num_host_key_files = 0;          options->num_host_key_files = 0;
           options->num_host_cert_files = 0;
         options->pid_file = NULL;          options->pid_file = NULL;
         options->server_key_bits = -1;          options->server_key_bits = -1;
         options->login_grace_time = -1;          options->login_grace_time = -1;
Line 140 
Line 141 
                             _PATH_HOST_DSA_KEY_FILE;                              _PATH_HOST_DSA_KEY_FILE;
                 }                  }
         }          }
           /* No certificates by default */
         if (options->num_ports == 0)          if (options->num_ports == 0)
                 options->ports[options->num_ports++] = SSH_DEFAULT_PORT;                  options->ports[options->num_ports++] = SSH_DEFAULT_PORT;
         if (options->listen_addrs == NULL)          if (options->listen_addrs == NULL)
Line 280 
Line 282 
         sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,          sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
         sMatch, sPermitOpen, sForceCommand, sChrootDirectory,          sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
         sUsePrivilegeSeparation, sAllowAgentForwarding,          sUsePrivilegeSeparation, sAllowAgentForwarding,
         sZeroKnowledgePasswordAuthentication,          sZeroKnowledgePasswordAuthentication, sHostCertificate,
         sDeprecated, sUnsupported          sDeprecated, sUnsupported
 } ServerOpCodes;  } ServerOpCodes;
   
Line 387 
Line 389 
         { "permitopen", sPermitOpen, SSHCFG_ALL },          { "permitopen", sPermitOpen, SSHCFG_ALL },
         { "forcecommand", sForceCommand, SSHCFG_ALL },          { "forcecommand", sForceCommand, SSHCFG_ALL },
         { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },          { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
           { "hostcertificate", sHostCertificate, SSHCFG_GLOBAL },
         { NULL, sBadOption, 0 }          { NULL, sBadOption, 0 }
 };  };
   
Line 773 
Line 776 
                 }                  }
                 break;                  break;
   
           case sHostCertificate:
                   intptr = &options->num_host_cert_files;
                   if (*intptr >= MAX_HOSTKEYS)
                           fatal("%s line %d: too many host certificates "
                               "specified (max %d).", filename, linenum,
                               MAX_HOSTCERTS);
                   charptr = &options->host_cert_files[*intptr];
                   goto parse_filename;
                   break;
   
         case sPidFile:          case sPidFile:
                 charptr = &options->pid_file;                  charptr = &options->pid_file;
                 goto parse_filename;                  goto parse_filename;
Line 1603 
Line 1616 
         /* string array arguments */          /* string array arguments */
         dump_cfg_strarray(sHostKeyFile, o->num_host_key_files,          dump_cfg_strarray(sHostKeyFile, o->num_host_key_files,
              o->host_key_files);               o->host_key_files);
           dump_cfg_strarray(sHostKeyFile, o->num_host_cert_files,
                o->host_cert_files);
         dump_cfg_strarray(sAllowUsers, o->num_allow_users, o->allow_users);          dump_cfg_strarray(sAllowUsers, o->num_allow_users, o->allow_users);
         dump_cfg_strarray(sDenyUsers, o->num_deny_users, o->deny_users);          dump_cfg_strarray(sDenyUsers, o->num_deny_users, o->deny_users);
         dump_cfg_strarray(sAllowGroups, o->num_allow_groups, o->allow_groups);          dump_cfg_strarray(sAllowGroups, o->num_allow_groups, o->allow_groups);
Legend:
Removed from v.1.202  
changed lines
  Added in v.1.203