[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.16 and 1.17

version 1.16, 1999/10/14 20:17:24 version 1.17, 1999/10/17 20:48:07
Line 58 
Line 58 
 #endif  #endif
   options->permit_empty_passwd = -1;    options->permit_empty_passwd = -1;
   options->use_login = -1;    options->use_login = -1;
   options->silent_deny = -1;  
   options->num_allow_hosts = 0;  
   options->num_deny_hosts = 0;  
   options->num_allow_users = 0;    options->num_allow_users = 0;
   options->num_deny_users = 0;    options->num_deny_users = 0;
   options->num_allow_groups = 0;    options->num_allow_groups = 0;
Line 140 
Line 137 
     options->permit_empty_passwd = 1;      options->permit_empty_passwd = 1;
   if (options->use_login == -1)    if (options->use_login == -1)
     options->use_login = 0;      options->use_login = 0;
   if (options->silent_deny == -1)  
     options->silent_deny = 0;  
 }  }
   
 #define WHITESPACE " \t\r\n"  #define WHITESPACE " \t\r\n"
Line 161 
Line 156 
 #ifdef SKEY  #ifdef SKEY
   sSkeyAuthentication,    sSkeyAuthentication,
 #endif  #endif
   sPasswordAuthentication, sAllowHosts, sDenyHosts, sListenAddress,    sPasswordAuthentication, sListenAddress,
   sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset,    sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset,
   sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives, sCheckMail,    sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives, sCheckMail,
   sUseLogin, sSilentDeny, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups    sUseLogin, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups
   
 } ServerOpCodes;  } ServerOpCodes;
   
Line 200 
Line 195 
 #ifdef SKEY  #ifdef SKEY
   { "skeyauthentication", sSkeyAuthentication },    { "skeyauthentication", sSkeyAuthentication },
 #endif  #endif
   { "allowhosts", sAllowHosts },  
   { "checkmail", sCheckMail },    { "checkmail", sCheckMail },
   { "denyhosts", sDenyHosts },  
   { "listenaddress", sListenAddress },    { "listenaddress", sListenAddress },
   { "printmotd", sPrintMotd },    { "printmotd", sPrintMotd },
   { "ignorerhosts", sIgnoreRhosts },    { "ignorerhosts", sIgnoreRhosts },
Line 211 
Line 204 
   { "strictmodes", sStrictModes },    { "strictmodes", sStrictModes },
   { "permitemptypasswords", sEmptyPasswd },    { "permitemptypasswords", sEmptyPasswd },
   { "uselogin", sUseLogin },    { "uselogin", sUseLogin },
   { "silentdeny", sSilentDeny },  
   { "randomseed", sRandomSeedFile },    { "randomseed", sRandomSeedFile },
   { "keepalive", sKeepAlives },    { "keepalive", sKeepAlives },
   { "allowusers", sAllowUsers },    { "allowusers", sAllowUsers },
Line 486 
Line 478 
           intptr = &options->use_login;            intptr = &options->use_login;
           goto parse_flag;            goto parse_flag;
   
         case sSilentDeny:  
           intptr = &options->silent_deny;  
           goto parse_flag;  
   
         case sLogFacility:          case sLogFacility:
           cp = strtok(NULL, WHITESPACE);            cp = strtok(NULL, WHITESPACE);
           if (!cp)            if (!cp)
Line 511 
Line 499 
             options->log_facility = log_facilities[i].facility;              options->log_facility = log_facilities[i].facility;
           break;            break;
   
         case sAllowHosts:  
           while ((cp = strtok(NULL, WHITESPACE)))  
             {  
               if (options->num_allow_hosts >= MAX_ALLOW_HOSTS)  
                 {  
                   fprintf(stderr, "%s line %d: too many allow hosts.\n",  
                           filename, linenum);  
                   exit(1);  
                 }  
               options->allow_hosts[options->num_allow_hosts++] = xstrdup(cp);  
             }  
           break;  
   
         case sDenyHosts:  
           while ((cp = strtok(NULL, WHITESPACE)))  
             {  
               if (options->num_deny_hosts >= MAX_DENY_HOSTS)  
                 {  
                   fprintf(stderr, "%s line %d: too many deny hosts.\n",  
                           filename, linenum);  
                   exit(1);  
                 }  
               options->deny_hosts[options->num_deny_hosts++] = xstrdup(cp);  
             }  
           break;  
   
         case sAllowUsers:          case sAllowUsers:
           while ((cp = strtok(NULL, WHITESPACE)))            while ((cp = strtok(NULL, WHITESPACE)))
             {              {
Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17