- 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, 11 insertions, 17 deletions

diff --git a/acconfig.h b/acconfig.h
index e61bfd33a..52aef76a6 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -40,31 +40,17 @@
  * message at run-time. */
 #undef RSAREF
 
-/* Define is utmp.h has a ut_host field */
+/* struct utmp and struct utmpx fields */
 #undef HAVE_HOST_IN_UTMP
-
-/* Define is utmpx.h has a ut_host field */
 #undef HAVE_HOST_IN_UTMPX
-
-/* Define is utmp.h has a ut_addr field */
 #undef HAVE_ADDR_IN_UTMP
-
-/* Define is utmpx.h has a ut_addr field */
 #undef HAVE_ADDR_IN_UTMPX
-
-/* Define is utmpx.h has a syslen field */
+#undef HAVE_ADDR_V6_IN_UTMP
+#undef HAVE_ADDR_V6_IN_UTMPX
 #undef HAVE_SYSLEN_IN_UTMPX
-
-/* Define is utmp.h has a ut_pid field */
 #undef HAVE_PID_IN_UTMP
-
-/* Define is utmp.h has a ut_type field */
 #undef HAVE_TYPE_IN_UTMP
-
-/* Define is utmp.h has a ut_tv field */
 #undef HAVE_TV_IN_UTMP
-
-/* Define is utmp.h has a ut_id field */
 #undef HAVE_ID_IN_UTMP
 
 /* Define if you want to use utmpx */
@@ -125,6 +111,14 @@
 #undef HAVE_UINTXX_T
 #undef HAVE_SOCKLEN_T
 #undef HAVE_SIZE_T
+#undef HAVE_STRUCT_SOCKADDR_STORAGE
+#undef HAVE_STRUCT_ADDRINFO
+#undef HAVE_STRUCT_IN6_ADDR
+#undef HAVE_STRUCT_SOCKADDR_IN6
+
+/* Fields in struct sockaddr_storage */
+#undef HAVE_SS_FAMILY_IN_SS
+#undef HAVE___SS_FAMILY_IN_SS
 
 /* Define if you have /dev/ptmx */
 #undef HAVE_DEV_PTMX