6 files changed, 4 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 6b657c8ee..126f497aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
      [readconf.c ssh_config ssh_config.5 ssh-keysign.c]
      add AddressFamily option to ssh_config (like -4, -6 on commandline).
      Portable bug #534; ok markus@
+ - (djm) Remove IPv4 by default hack now that we can specify AF in config
 
 20030517
  - (bal) strcat -> strlcat on openbsd-compat/realpath.c (rev 1.8 OpenBSD)
@@ -1561,4 +1562,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2733 2003/05/18 10:50:30 djm Exp $
+$Id: ChangeLog,v 1.2734 2003/05/18 10:52:40 djm Exp $
diff --git a/acconfig.h b/acconfig.h
index 8ea6b9ab8..7914deb52 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.153 2003/05/15 02:27:08 djm Exp $ */
+/* $Id: acconfig.h,v 1.154 2003/05/18 10:52:40 djm Exp $ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -295,9 +295,6 @@
 /* Specify location of ssh.pid */
 #undef _PATH_SSH_PIDDIR
 
-/* Use IPv4 for connection by default, IPv6 can still if explicity asked */
-#undef IPV4_DEFAULT
-
 /* getaddrinfo is broken (if present) */
 #undef BROKEN_GETADDRINFO
 
diff --git a/configure.ac b/configure.ac
index 99a85264c..bdc198592 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.121 2003/05/15 11:42:59 dtucker Exp $
+# $Id: configure.ac,v 1.122 2003/05/18 10:52:40 djm Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -95,7 +95,6 @@ case "$host" in
         AC_DEFINE(HAVE_CYGWIN)
         AC_DEFINE(USE_PIPES)
         AC_DEFINE(DISABLE_SHADOW)
-        AC_DEFINE(IPV4_DEFAULT)
         AC_DEFINE(IP_TOS_IS_BROKEN)
         AC_DEFINE(NO_X11_UNIX_SOCKETS)
         AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT)
@@ -2249,18 +2248,6 @@ AC_ARG_WITH(superuser-path,
 )
 
 
-# Whether to force IPv4 by default (needed on broken glibc Linux)
-IPV4_HACK_MSG="no" 
-AC_ARG_WITH(ipv4-default,
-        [  --with-ipv4-default     Use IPv4 by connections unless '-6' specified],
-        [
-                if test "x$withval" != "xno" ; then     
-                        AC_DEFINE(IPV4_DEFAULT)
-                        IPV4_HACK_MSG="yes" 
-                fi
-        ]
-)
-
 AC_MSG_CHECKING([if we need to convert IPv4 in IPv6-mapped addresses])
 IPV4_IN6_HACK_MSG="no" 
 AC_ARG_WITH(4in6,
@@ -2601,7 +2588,6 @@ echo "                     S/KEY support: $SKEY_MSG"
 echo "              TCP Wrappers support: $TCPW_MSG"
 echo "              MD5 password support: $MD5_MSG"
 echo "       IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
-echo "          Use IPv4 by default hack: $IPV4_HACK_MSG"
 echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
 echo "                  BSD Auth support: $BSD_AUTH_MSG"
 echo "              Random number source: $RAND_MSG"
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 6b1954269..e2cd789b5 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -31,11 +31,7 @@ RCSID("$OpenBSD: ssh-keyscan.c,v 1.43 2003/04/26 04:29:49 deraadt Exp $");
 
 /* Flag indicating whether IPv4 or IPv6.  This can be set on the command line.
    Default value is AF_UNSPEC means both IPv4 and IPv6. */
-#ifdef IPV4_DEFAULT
-int IPv4or6 = AF_INET;
-#else
 int IPv4or6 = AF_UNSPEC;
-#endif
 
 int ssh_port = SSH_DEFAULT_PORT;
 
diff --git a/ssh.c b/ssh.c
index 096116b8b..480bd85e6 100644
--- a/ssh.c
+++ b/ssh.c
@@ -81,11 +81,7 @@ char *__progname;
 
 /* Flag indicating whether IPv4 or IPv6.  This can be set on the command line.
    Default value is AF_UNSPEC means both IPv4 and IPv6. */
-#ifdef IPV4_DEFAULT
-int IPv4or6 = AF_INET;
-#else
 int IPv4or6 = AF_UNSPEC;
-#endif
 
 /* Flag indicating whether debug mode is on.  This can be set on the command line. */
 int debug_flag = 0;
diff --git a/sshd.c b/sshd.c
index c0221bea7..65837c938 100644
--- a/sshd.c
+++ b/sshd.c
@@ -112,11 +112,7 @@ char *config_file_name = _PATH_SERVER_CONFIG_FILE;
  * Flag indicating whether IPv4 or IPv6.  This can be set on the command line.
  * Default value is AF_UNSPEC means both IPv4 and IPv6.
  */
-#ifdef IPV4_DEFAULT
-int IPv4or6 = AF_INET;
-#else
 int IPv4or6 = AF_UNSPEC;
-#endif
 
 /*
  * Debug mode flag.  This can be set on the command line.  If debug