===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/servconf.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- src/usr.bin/ssh/servconf.c	1999/10/14 20:17:24	1.16
+++ src/usr.bin/ssh/servconf.c	1999/10/17 20:48:07	1.17
@@ -12,7 +12,7 @@
 */
 
 #include "includes.h"
-RCSID("$Id: servconf.c,v 1.16 1999/10/14 20:17:24 markus Exp $");
+RCSID("$Id: servconf.c,v 1.17 1999/10/17 20:48:07 dugsong Exp $");
 
 #include "ssh.h"
 #include "servconf.h"
@@ -58,9 +58,6 @@
 #endif
   options->permit_empty_passwd = -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_deny_users = 0;
   options->num_allow_groups = 0;
@@ -140,8 +137,6 @@
     options->permit_empty_passwd = 1;
   if (options->use_login == -1)
     options->use_login = 0;
-  if (options->silent_deny == -1)
-    options->silent_deny = 0;
 }
 
 #define WHITESPACE " \t\r\n"
@@ -161,10 +156,10 @@
 #ifdef SKEY
   sSkeyAuthentication,
 #endif
-  sPasswordAuthentication, sAllowHosts, sDenyHosts, sListenAddress,
+  sPasswordAuthentication, sListenAddress,
   sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset,
   sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives, sCheckMail,
-  sUseLogin, sSilentDeny, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups
+  sUseLogin, sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups
 
 } ServerOpCodes;
 
@@ -200,9 +195,7 @@
 #ifdef SKEY
   { "skeyauthentication", sSkeyAuthentication },
 #endif
-  { "allowhosts", sAllowHosts },
   { "checkmail", sCheckMail },
-  { "denyhosts", sDenyHosts },
   { "listenaddress", sListenAddress },
   { "printmotd", sPrintMotd },
   { "ignorerhosts", sIgnoreRhosts },
@@ -211,7 +204,6 @@
   { "strictmodes", sStrictModes },
   { "permitemptypasswords", sEmptyPasswd },
   { "uselogin", sUseLogin },
-  { "silentdeny", sSilentDeny },
   { "randomseed", sRandomSeedFile },
   { "keepalive", sKeepAlives },
   { "allowusers", sAllowUsers },
@@ -486,10 +478,6 @@
           intptr = &options->use_login;
           goto parse_flag;
 
-        case sSilentDeny:
-          intptr = &options->silent_deny;
-          goto parse_flag;
-
 	case sLogFacility:
 	  cp = strtok(NULL, WHITESPACE);
 	  if (!cp)
@@ -511,32 +499,6 @@
 	    options->log_facility = log_facilities[i].facility;
 	  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:
 	  while ((cp = strtok(NULL, WHITESPACE)))
 	    {