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

[openssh.git] / readconf.c

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"
-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"
@@ -107,6 +107,7 @@ typedef enum {
        oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
        oClearAllForwardings, oNoHostAuthenticationForLocalhost,
        oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
+       oAddressFamily,
        oDeprecated, oUnsupported
 } OpCodes;
 
@@ -194,6 +195,7 @@ static struct {
        { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
        { "rekeylimit", oRekeyLimit },
        { "connecttimeout", oConnectTimeout },
+       { "addressfamily", oAddressFamily },
        { 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];
+       extern int IPv4or6;
 
        /* Strip trailing whitespace */
        for(len = strlen(line) - 1; len > 0; len--) {
@@ -720,6 +723,18 @@ parse_int:
                        *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;