I've changed my mind about what the IP version selection options in

the config should do when IPv6 is configured out. They shouldn't sit
there looking silly with only `Auto' and `IPv4' settings: they
should instead be completely absent. I had thought the former was
acceptable since IPv4-only was a configuration that people should
only be using if their compilers didn't support IPv6, but now it
occurs to me that ports to fundamentally non-IPv6-supporting
platforms are not implausible, and on such ports the presence of a
vestigial config option under the _standard_ build conditions would
be a low-quality solution.

[originally from svn r5084]

diff --git a/config.c b/config.c
index 8e67a542af1b1a20343fb0721ed8657c214fae77..a685ed2f3c3d4b58614d14ed513afce3d7d6b782 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1378,23 +1378,18 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
                          'p', HELPCTX(connection_tcpkeepalive),
                          dlg_stdcheckbox_handler,
                          I(offsetof(Config,tcp_keepalives)));
+#ifndef NO_IPV6
            s = ctrl_getset(b, "Connection", "ipversion",
                          "Internet protocol version");
-           ctrl_radiobuttons(s, NULL, NO_SHORTCUT,
-#ifndef NO_IPV6
-                         3,
-#else
-                         2,
-#endif
+           ctrl_radiobuttons(s, NULL, NO_SHORTCUT, 3,
                          HELPCTX(connection_ipversion),
                          dlg_stdradiobutton_handler,
                          I(offsetof(Config, addressfamily)),
                          "Auto", NO_SHORTCUT, I(ADDRTYPE_UNSPEC),
                          "IPv4", NO_SHORTCUT, I(ADDRTYPE_IPV4),
-#ifndef NO_IPV6
                          "IPv6", NO_SHORTCUT, I(ADDRTYPE_IPV6),
-#endif
                          NULL);
+#endif
        }
 
        /*
@@ -1801,21 +1796,16 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
                                           "Remote", 'm', P(NULL),
                                           "Dynamic", 'y', P(NULL),
                                           NULL);
-       pfd->addressfamily =
-           ctrl_radiobuttons(s, NULL, NO_SHORTCUT,
 #ifndef NO_IPV6
-                             3,
-#else
-                             2,
-#endif
+       pfd->addressfamily =
+           ctrl_radiobuttons(s, NULL, NO_SHORTCUT, 3,
                              HELPCTX(ssh_tunnels_portfwd_ipversion),
                              portfwd_handler, P(pfd),
                              "Auto", NO_SHORTCUT, I(ADDRTYPE_UNSPEC),
                              "IPv4", NO_SHORTCUT, I(ADDRTYPE_IPV4),
-#ifndef NO_IPV6
                              "IPv6", NO_SHORTCUT, I(ADDRTYPE_IPV6),
-#endif
                              NULL);
+#endif
        ctrl_tabdelay(s, pfd->addbutton);
        ctrl_columns(s, 1, 100);