[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.36 and 1.37

version 1.36, 2000/05/01 18:50:58 version 1.37, 2000/05/03 10:21:47
Line 32 
Line 32 
         options->ports_from_cmdline = 0;          options->ports_from_cmdline = 0;
         options->listen_addrs = NULL;          options->listen_addrs = NULL;
         options->host_key_file = NULL;          options->host_key_file = NULL;
         options->dsa_key_file = NULL;          options->host_dsa_key_file = NULL;
         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 83 
Line 83 
                 add_listen_addr(options, NULL);                  add_listen_addr(options, NULL);
         if (options->host_key_file == NULL)          if (options->host_key_file == NULL)
                 options->host_key_file = HOST_KEY_FILE;                  options->host_key_file = HOST_KEY_FILE;
         if (options->dsa_key_file == NULL)          if (options->host_dsa_key_file == NULL)
                 options->dsa_key_file = DSA_KEY_FILE;                  options->host_dsa_key_file = HOST_DSA_KEY_FILE;
         if (options->pid_file == NULL)          if (options->pid_file == NULL)
                 options->pid_file = SSH_DAEMON_PID_FILE;                  options->pid_file = SSH_DAEMON_PID_FILE;
         if (options->server_key_bits == -1)          if (options->server_key_bits == -1)
Line 170 
Line 170 
         sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset,          sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset,
         sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives, sCheckMail,          sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives, sCheckMail,
         sUseLogin, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,          sUseLogin, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
         sIgnoreUserKnownHosts, sDSAKeyFile, sCiphers, sProtocol, sPidFile          sIgnoreUserKnownHosts, sHostDSAKeyFile, sCiphers, sProtocol, sPidFile
 } ServerOpCodes;  } ServerOpCodes;
   
 /* Textual representation of the tokens. */  /* Textual representation of the tokens. */
Line 180 
Line 180 
 } keywords[] = {  } keywords[] = {
         { "port", sPort },          { "port", sPort },
         { "hostkey", sHostKeyFile },          { "hostkey", sHostKeyFile },
         { "dsakey", sDSAKeyFile },          { "hostdsakey", sHostDSAKeyFile },
         { "pidfile", sPidFile },          { "pidfile", sPidFile },
         { "serverkeybits", sServerKeyBits },          { "serverkeybits", sServerKeyBits },
         { "logingracetime", sLoginGraceTime },          { "logingracetime", sLoginGraceTime },
Line 353 
Line 353 
                         break;                          break;
   
                 case sHostKeyFile:                  case sHostKeyFile:
                 case sDSAKeyFile:                  case sHostDSAKeyFile:
                         charptr = (opcode == sHostKeyFile ) ?                          charptr = (opcode == sHostKeyFile ) ?
                             &options->host_key_file : &options->dsa_key_file;                              &options->host_key_file : &options->host_dsa_key_file;
                         cp = strtok(NULL, WHITESPACE);                          cp = strtok(NULL, WHITESPACE);
                         if (!cp) {                          if (!cp) {
                                 fprintf(stderr, "%s line %d: missing file name.\n",                                  fprintf(stderr, "%s line %d: missing file name.\n",
Legend:
Removed from v.1.36  
changed lines
  Added in v.1.37