- Merged OpenBSD IPv6 patch:

   - [sshd.c sshd.8 sshconnect.c ssh.h ssh.c servconf.h servconf.c scp.1]
     [scp.c packet.h packet.c login.c log.c canohost.c channels.c]
     [hostfile.c sshd_config]
     ipv6 support: mostly gethostbyname->getaddrinfo/getnameinfo, new
     features: sshd allows multiple ListenAddress and Port options. note
     that libwrap is not IPv6-ready. (based on patches from
     fujiwara@rcac.tdi.co.jp)
   - [ssh.c canohost.c]
     more hints (hints.ai_socktype=SOCK_STREAM) for getaddrinfo,
     from itojun@
   - [channels.c]
     listen on _all_ interfaces for X11-Fwd (hints.ai_flags = AI_PASSIVE)
   - [packet.h]
     allow auth-kerberos for IPv4 only
   - [scp.1 sshd.8 servconf.h scp.c]
     document -4, -6, and 'ssh -L 2022/::1/22'
   - [ssh.c]
     'ssh @host' is illegal (null user name), from
     karsten@gedankenpolizei.de
   - [sshconnect.c]
     better error message
   - [sshd.c]
     allow auth-kerberos for IPv4 only
 - Big IPv6 merge:
   - Cleanup overrun in sockaddr copying on RHL 6.1
   - Replacements for getaddrinfo, getnameinfo, etc based on versions
     from patch from KIKUCHI Takahiro <kick@kyoto.wide.ad.jp>
   - Replacement for missing structures on systems that lack IPv6
   - record_login needed to know about AF_INET6 addresses
   - Borrowed more code from OpenBSD: rresvport_af and requisites

1 files changed, 8 insertions, 4 deletions

diff --git a/servconf.h b/servconf.h
index e3ac5bdee..ab5c22c7d 100644
--- a/servconf.h
+++ b/servconf.h
@@ -13,20 +13,24 @@
  * 
  */
 
-/* RCSID("$Id: servconf.h,v 1.5 1999/11/25 00:54:59 damien Exp $"); */
+/* RCSID("$Id: servconf.h,v 1.6 2000/01/14 04:45:51 damien Exp $"); */
 
 #ifndef SERVCONF_H
 #define SERVCONF_H
 
+#define MAX_PORTS               256     /* Max # ports. */
+
 #define MAX_ALLOW_USERS         256     /* Max # users on allow list. */
 #define MAX_DENY_USERS          256     /* Max # users on deny list. */
 #define MAX_ALLOW_GROUPS        256     /* Max # groups on allow list. */
 #define MAX_DENY_GROUPS         256     /* Max # groups on deny list. */
 
 typedef struct {
-        int     port;           /* Port number to listen on. */
-        struct in_addr listen_addr;     /* Address on which the server
-                                         * listens. */
+        unsigned int num_ports;
+        unsigned int ports_from_cmdline;
+        u_short ports[MAX_PORTS];       /* Port number to listen on. */
+        char   *listen_addr;            /* Address on which the server listens. */
+        struct addrinfo *listen_addrs;  /* Addresses on which the server listens. */
         char   *host_key_file;  /* File containing host key. */
         int     server_key_bits;/* Size of the server key. */
         int     login_grace_time;       /* Disconnect if no auth in this time