diff options
author | Damien Miller <djm@mindrot.org> | 2003-05-18 20:52:40 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-05-18 20:52:40 +1000 |
commit | 7e1bbc55af32d8f5d81200323198c65b548faaad (patch) | |
tree | be317e9ceb17268984b58d8f6c243123a66107f2 | |
parent | 20a8f97b034df418d0e5e04b11000b44ab07e628 (diff) |
- (djm) Remove IPv4 by default hack now that we can specify AF in config
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | configure.ac | 16 | ||||
-rw-r--r-- | ssh-keyscan.c | 4 | ||||
-rw-r--r-- | ssh.c | 4 | ||||
-rw-r--r-- | sshd.c | 4 |
6 files changed, 4 insertions, 32 deletions
@@ -6,6 +6,7 @@ | |||
6 | [readconf.c ssh_config ssh_config.5 ssh-keysign.c] | 6 | [readconf.c ssh_config ssh_config.5 ssh-keysign.c] |
7 | add AddressFamily option to ssh_config (like -4, -6 on commandline). | 7 | add AddressFamily option to ssh_config (like -4, -6 on commandline). |
8 | Portable bug #534; ok markus@ | 8 | Portable bug #534; ok markus@ |
9 | - (djm) Remove IPv4 by default hack now that we can specify AF in config | ||
9 | 10 | ||
10 | 20030517 | 11 | 20030517 |
11 | - (bal) strcat -> strlcat on openbsd-compat/realpath.c (rev 1.8 OpenBSD) | 12 | - (bal) strcat -> strlcat on openbsd-compat/realpath.c (rev 1.8 OpenBSD) |
@@ -1561,4 +1562,4 @@ | |||
1561 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1562 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1562 | ok provos@ | 1563 | ok provos@ |
1563 | 1564 | ||
1564 | $Id: ChangeLog,v 1.2733 2003/05/18 10:50:30 djm Exp $ | 1565 | $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 @@ | |||
1 | /* $Id: acconfig.h,v 1.153 2003/05/15 02:27:08 djm Exp $ */ | 1 | /* $Id: acconfig.h,v 1.154 2003/05/18 10:52:40 djm Exp $ */ |
2 | 2 | ||
3 | #ifndef _CONFIG_H | 3 | #ifndef _CONFIG_H |
4 | #define _CONFIG_H | 4 | #define _CONFIG_H |
@@ -295,9 +295,6 @@ | |||
295 | /* Specify location of ssh.pid */ | 295 | /* Specify location of ssh.pid */ |
296 | #undef _PATH_SSH_PIDDIR | 296 | #undef _PATH_SSH_PIDDIR |
297 | 297 | ||
298 | /* Use IPv4 for connection by default, IPv6 can still if explicity asked */ | ||
299 | #undef IPV4_DEFAULT | ||
300 | |||
301 | /* getaddrinfo is broken (if present) */ | 298 | /* getaddrinfo is broken (if present) */ |
302 | #undef BROKEN_GETADDRINFO | 299 | #undef BROKEN_GETADDRINFO |
303 | 300 | ||
diff --git a/configure.ac b/configure.ac index 99a85264c..bdc198592 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.121 2003/05/15 11:42:59 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.122 2003/05/18 10:52:40 djm Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -95,7 +95,6 @@ case "$host" in | |||
95 | AC_DEFINE(HAVE_CYGWIN) | 95 | AC_DEFINE(HAVE_CYGWIN) |
96 | AC_DEFINE(USE_PIPES) | 96 | AC_DEFINE(USE_PIPES) |
97 | AC_DEFINE(DISABLE_SHADOW) | 97 | AC_DEFINE(DISABLE_SHADOW) |
98 | AC_DEFINE(IPV4_DEFAULT) | ||
99 | AC_DEFINE(IP_TOS_IS_BROKEN) | 98 | AC_DEFINE(IP_TOS_IS_BROKEN) |
100 | AC_DEFINE(NO_X11_UNIX_SOCKETS) | 99 | AC_DEFINE(NO_X11_UNIX_SOCKETS) |
101 | AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT) | 100 | AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT) |
@@ -2249,18 +2248,6 @@ AC_ARG_WITH(superuser-path, | |||
2249 | ) | 2248 | ) |
2250 | 2249 | ||
2251 | 2250 | ||
2252 | # Whether to force IPv4 by default (needed on broken glibc Linux) | ||
2253 | IPV4_HACK_MSG="no" | ||
2254 | AC_ARG_WITH(ipv4-default, | ||
2255 | [ --with-ipv4-default Use IPv4 by connections unless '-6' specified], | ||
2256 | [ | ||
2257 | if test "x$withval" != "xno" ; then | ||
2258 | AC_DEFINE(IPV4_DEFAULT) | ||
2259 | IPV4_HACK_MSG="yes" | ||
2260 | fi | ||
2261 | ] | ||
2262 | ) | ||
2263 | |||
2264 | AC_MSG_CHECKING([if we need to convert IPv4 in IPv6-mapped addresses]) | 2251 | AC_MSG_CHECKING([if we need to convert IPv4 in IPv6-mapped addresses]) |
2265 | IPV4_IN6_HACK_MSG="no" | 2252 | IPV4_IN6_HACK_MSG="no" |
2266 | AC_ARG_WITH(4in6, | 2253 | AC_ARG_WITH(4in6, |
@@ -2601,7 +2588,6 @@ echo " S/KEY support: $SKEY_MSG" | |||
2601 | echo " TCP Wrappers support: $TCPW_MSG" | 2588 | echo " TCP Wrappers support: $TCPW_MSG" |
2602 | echo " MD5 password support: $MD5_MSG" | 2589 | echo " MD5 password support: $MD5_MSG" |
2603 | echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" | 2590 | echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" |
2604 | echo " Use IPv4 by default hack: $IPV4_HACK_MSG" | ||
2605 | echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" | 2591 | echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" |
2606 | echo " BSD Auth support: $BSD_AUTH_MSG" | 2592 | echo " BSD Auth support: $BSD_AUTH_MSG" |
2607 | echo " Random number source: $RAND_MSG" | 2593 | 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 $"); | |||
31 | 31 | ||
32 | /* Flag indicating whether IPv4 or IPv6. This can be set on the command line. | 32 | /* Flag indicating whether IPv4 or IPv6. This can be set on the command line. |
33 | Default value is AF_UNSPEC means both IPv4 and IPv6. */ | 33 | Default value is AF_UNSPEC means both IPv4 and IPv6. */ |
34 | #ifdef IPV4_DEFAULT | ||
35 | int IPv4or6 = AF_INET; | ||
36 | #else | ||
37 | int IPv4or6 = AF_UNSPEC; | 34 | int IPv4or6 = AF_UNSPEC; |
38 | #endif | ||
39 | 35 | ||
40 | int ssh_port = SSH_DEFAULT_PORT; | 36 | int ssh_port = SSH_DEFAULT_PORT; |
41 | 37 | ||
@@ -81,11 +81,7 @@ char *__progname; | |||
81 | 81 | ||
82 | /* Flag indicating whether IPv4 or IPv6. This can be set on the command line. | 82 | /* Flag indicating whether IPv4 or IPv6. This can be set on the command line. |
83 | Default value is AF_UNSPEC means both IPv4 and IPv6. */ | 83 | Default value is AF_UNSPEC means both IPv4 and IPv6. */ |
84 | #ifdef IPV4_DEFAULT | ||
85 | int IPv4or6 = AF_INET; | ||
86 | #else | ||
87 | int IPv4or6 = AF_UNSPEC; | 84 | int IPv4or6 = AF_UNSPEC; |
88 | #endif | ||
89 | 85 | ||
90 | /* Flag indicating whether debug mode is on. This can be set on the command line. */ | 86 | /* Flag indicating whether debug mode is on. This can be set on the command line. */ |
91 | int debug_flag = 0; | 87 | int debug_flag = 0; |
@@ -112,11 +112,7 @@ char *config_file_name = _PATH_SERVER_CONFIG_FILE; | |||
112 | * Flag indicating whether IPv4 or IPv6. This can be set on the command line. | 112 | * Flag indicating whether IPv4 or IPv6. This can be set on the command line. |
113 | * Default value is AF_UNSPEC means both IPv4 and IPv6. | 113 | * Default value is AF_UNSPEC means both IPv4 and IPv6. |
114 | */ | 114 | */ |
115 | #ifdef IPV4_DEFAULT | ||
116 | int IPv4or6 = AF_INET; | ||
117 | #else | ||
118 | int IPv4or6 = AF_UNSPEC; | 115 | int IPv4or6 = AF_UNSPEC; |
119 | #endif | ||
120 | 116 | ||
121 | /* | 117 | /* |
122 | * Debug mode flag. This can be set on the command line. If debug | 118 | * Debug mode flag. This can be set on the command line. If debug |