- djm@cvs.openbsd.org 2003/07/03 08:09:06

     [readconf.c readconf.h ssh-keysign.c ssh.c]
     fix AddressFamily option in config file, from brent@graveland.net;
     ok markus@

1 files changed, 7 insertions, 10 deletions

diff --git a/ssh.c b/ssh.c
index a86f9204f..1f1f06834 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.195 2003/07/02 20:37:48 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.196 2003/07/03 08:09:06 djm Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -79,10 +79,6 @@ extern char *__progname;
 char *__progname;
 #endif
 
-/* Flag indicating whether IPv4 or IPv6.  This can be set on the command line.
-   Default value is AF_UNSPEC means both IPv4 and IPv6. */
-int IPv4or6 = AF_UNSPEC;
-
 /* Flag indicating whether debug mode is on.  This can be set on the command line. */
 int debug_flag = 0;
 
@@ -280,10 +276,10 @@ again:
                         options.protocol = SSH_PROTO_2;
                         break;
                 case '4':
-                        IPv4or6 = AF_INET;
+                        options.address_family = AF_INET;
                         break;
                 case '6':
-                        IPv4or6 = AF_INET6;
+                        options.address_family = AF_INET6;
                         break;
                 case 'n':
                         stdin_null_flag = 1;
@@ -514,7 +510,6 @@ again:
 
         SSLeay_add_all_algorithms();
         ERR_load_crypto_strings();
-        channel_set_af(IPv4or6);
 
         /* Initialize the command to execute on remote host. */
         buffer_init(&command);
@@ -586,6 +581,8 @@ again:
         /* Fill configuration defaults. */
         fill_default_options(&options);
 
+        channel_set_af(options.address_family);
+
         /* reinit */
         log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 1);
 
@@ -621,8 +618,8 @@ again:
         }
         /* Open a connection to the remote host. */
 
-        if (ssh_connect(host, &hostaddr, options.port, IPv4or6,
-            options.connection_attempts,
+        if (ssh_connect(host, &hostaddr, options.port,
+            options.address_family, options.connection_attempts,
 #ifdef HAVE_CYGWIN
             options.use_privileged_port,
 #else