[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.65 and 1.66

version 1.65, 2001/02/04 15:32:24 version 1.66, 2001/02/11 12:59:25
Line 28 
Line 28 
 #include "tildexpand.h"  #include "tildexpand.h"
 #include "misc.h"  #include "misc.h"
 #include "cipher.h"  #include "cipher.h"
   #include "kex.h"
   #include "mac.h"
   
 /* add listen address */  /* add listen address */
 void add_listen_addr(ServerOptions *options, char *addr);  void add_listen_addr(ServerOptions *options, char *addr);
Line 85 
Line 87 
         options->num_allow_groups = 0;          options->num_allow_groups = 0;
         options->num_deny_groups = 0;          options->num_deny_groups = 0;
         options->ciphers = NULL;          options->ciphers = NULL;
           options->macs = NULL;
         options->protocol = SSH_PROTO_UNKNOWN;          options->protocol = SSH_PROTO_UNKNOWN;
         options->gateway_ports = -1;          options->gateway_ports = -1;
         options->num_subsystems = 0;          options->num_subsystems = 0;
Line 209 
Line 212 
         sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives, sCheckMail,          sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives, sCheckMail,
         sUseLogin, sAllowTcpForwarding,          sUseLogin, sAllowTcpForwarding,
         sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,          sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
         sIgnoreUserKnownHosts, sCiphers, sProtocol, sPidFile,          sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile,
         sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, sMaxStartups,          sGatewayPorts, sPubkeyAuthentication, sXAuthLocation, sSubsystem, sMaxStartups,
         sBanner, sReverseMappingCheck          sBanner, sReverseMappingCheck
 } ServerOpCodes;  } ServerOpCodes;
Line 266 
Line 269 
         { "allowgroups", sAllowGroups },          { "allowgroups", sAllowGroups },
         { "denygroups", sDenyGroups },          { "denygroups", sDenyGroups },
         { "ciphers", sCiphers },          { "ciphers", sCiphers },
           { "macs", sMacs },
         { "protocol", sProtocol },          { "protocol", sProtocol },
         { "gatewayports", sGatewayPorts },          { "gatewayports", sGatewayPorts },
         { "subsystem", sSubsystem },          { "subsystem", sSubsystem },
Line 656 
Line 660 
                                     filename, linenum, arg ? arg : "<NONE>");                                      filename, linenum, arg ? arg : "<NONE>");
                         if (options->ciphers == NULL)                          if (options->ciphers == NULL)
                                 options->ciphers = xstrdup(arg);                                  options->ciphers = xstrdup(arg);
                           break;
   
                   case sMacs:
                           arg = strdelim(&cp);
                           if (!arg || *arg == '\0')
                                   fatal("%s line %d: Missing argument.", filename, linenum);
                           if (!mac_valid(arg))
                                   fatal("%s line %d: Bad SSH2 mac spec '%s'.",
                                       filename, linenum, arg ? arg : "<NONE>");
                           if (options->macs == NULL)
                                   options->macs = xstrdup(arg);
                         break;                          break;
   
                 case sProtocol:                  case sProtocol:
Legend:
Removed from v.1.65  
changed lines
  Added in v.1.66