- djm@cvs.openbsd.org 2003/05/16 03:27:12

     [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@

diff --git a/ChangeLog b/ChangeLog
index 112c26823a7c5f8c2c99f5dc760be2050467129a..57a0d4d0c1d2a72dd985f598c3c2dcd58bac1785 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 20030517
  - (djm) Return of the dreaded PAM_TTY_KLUDGE, which went missing in 
    recent merge
 20030517
  - (djm) Return of the dreaded PAM_TTY_KLUDGE, which went missing in 
    recent merge

+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2003/05/16 03:27:12
+     [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@

 
 20030517
  - (bal) strcat -> strlcat on openbsd-compat/realpath.c (rev 1.8 OpenBSD)
 
 20030517
  - (bal) strcat -> strlcat on openbsd-compat/realpath.c (rev 1.8 OpenBSD)

diff --git a/readconf.c b/readconf.c
index a0cf3d6873215efbb6e6d876f21892b22e35eb91..2a77ea14fd9eaecfa83a083b5f1470de64e54f10 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
  */
 
 #include "includes.h"

-RCSID("$OpenBSD: readconf.c,v 1.111 2003/05/15 14:55:25 djm Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.112 2003/05/16 03:27:12 djm Exp $");

 
 #include "ssh.h"
 #include "xmalloc.h"
 
 #include "ssh.h"
 #include "xmalloc.h"


@@ -107,6 +107,7 @@ typedef enum {
        oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
        oClearAllForwardings, oNoHostAuthenticationForLocalhost,
        oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
        oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
        oClearAllForwardings, oNoHostAuthenticationForLocalhost,
        oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,

+       oAddressFamily,

        oDeprecated, oUnsupported
 } OpCodes;
 
        oDeprecated, oUnsupported
 } OpCodes;
 


@@ -194,6 +195,7 @@ static struct {
        { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
        { "rekeylimit", oRekeyLimit },
        { "connecttimeout", oConnectTimeout },
        { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
        { "rekeylimit", oRekeyLimit },
        { "connecttimeout", oConnectTimeout },

+       { "addressfamily", oAddressFamily },

        { NULL, oBadOption }
 };
 
        { NULL, oBadOption }
 };
 


@@ -286,6 +288,7 @@ process_config_line(Options *options, const char *host,
        size_t len;
        u_short fwd_port, fwd_host_port;
        char sfwd_host_port[6];
        size_t len;
        u_short fwd_port, fwd_host_port;
        char sfwd_host_port[6];

+       extern int IPv4or6;

 
        /* Strip trailing whitespace */
        for(len = strlen(line) - 1; len > 0; len--) {
 
        /* Strip trailing whitespace */
        for(len = strlen(line) - 1; len > 0; len--) {


@@ -720,6 +723,18 @@ parse_int:
                        *intptr = value;
                break;
 
                        *intptr = value;
                break;
 

+       case oAddressFamily:
+               arg = strdelim(&s);
+               if (strcasecmp(arg, "inet") == 0)
+                       IPv4or6 = AF_INET;
+               else if (strcasecmp(arg, "inet6") == 0)
+                       IPv4or6 = AF_INET6;
+               else if (strcasecmp(arg, "any") == 0)
+                       IPv4or6 = AF_UNSPEC;
+               else
+                       fatal("Unsupported AddressFamily \"%s\"", arg);
+               break;
+

        case oEnableSSHKeysign:
                intptr = &options->enable_ssh_keysign;
                goto parse_flag;
        case oEnableSSHKeysign:
                intptr = &options->enable_ssh_keysign;
                goto parse_flag;

diff --git a/ssh-keysign.c b/ssh-keysign.c
index 97a76cd9f72c693d6ec69220e3ecc4cf9b2e732a..063364ee73b7f289afbb82dd04d663e7a02ac415 100644 (file)
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"

-RCSID("$OpenBSD: ssh-keysign.c,v 1.11 2003/04/02 14:36:26 markus Exp $");
+RCSID("$OpenBSD: ssh-keysign.c,v 1.12 2003/05/16 03:27:12 djm Exp $");

 
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 
 #include <openssl/evp.h>
 #include <openssl/rand.h>


@@ -42,7 +42,9 @@ RCSID("$OpenBSD: ssh-keysign.c,v 1.11 2003/04/02 14:36:26 markus Exp $");
 #include "pathnames.h"
 #include "readconf.h"
 
 #include "pathnames.h"
 #include "readconf.h"
 

-uid_t original_real_uid;       /* XXX readconf.c needs this */
+/* XXX readconf.c needs these */
+uid_t original_real_uid;
+int IPv4or6;

 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;

diff --git a/ssh_config b/ssh_config
index 8a0acc17ffde0767ef638846c7d8f0d8a5fc320b..721e374e0fb92fe252ce83e03f0299472969004b 100644 (file)
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: ssh_config,v 1.17 2003/05/15 14:55:25 djm Exp $
+#      $OpenBSD: ssh_config,v 1.18 2003/05/16 03:27:12 djm Exp $

 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for


@@ -25,6 +25,7 @@
 #   HostbasedAuthentication no
 #   BatchMode no
 #   CheckHostIP yes
 #   HostbasedAuthentication no
 #   BatchMode no
 #   CheckHostIP yes

+#   AddressFamily any

 #   ConnectTimeout 0
 #   StrictHostKeyChecking ask
 #   IdentityFile ~/.ssh/identity
 #   ConnectTimeout 0
 #   StrictHostKeyChecking ask
 #   IdentityFile ~/.ssh/identity

diff --git a/ssh_config.5 b/ssh_config.5
index c5de4a9de9284982fbcfbd1c30772302288d5d21..67166b75808f67b63e9e81bf84c6b938b9ec3c6b 100644 (file)
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"

-.\" $OpenBSD: ssh_config.5,v 1.9 2003/05/15 14:55:25 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.10 2003/05/16 03:27:12 djm Exp $

 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os


@@ -115,6 +115,13 @@ The host is the
 .Ar hostname
 argument given on the command line (i.e., the name is not converted to
 a canonicalized host name before matching).
 .Ar hostname
 argument given on the command line (i.e., the name is not converted to
 a canonicalized host name before matching).

+.It Cm AddressFamily
+Specifies which address family to use when connecting. Valid arguments are
+.Dq any ,
+.Dq inet
+(Use IPv4 only) or
+.Dq inet6
+(Use IPv6 only.)

 .It Cm AFSTokenPassing
 Specifies whether to pass AFS tokens to remote host.
 The argument to this keyword must be
 .It Cm AFSTokenPassing
 Specifies whether to pass AFS tokens to remote host.
 The argument to this keyword must be