diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | tun.c | 29 | ||||
| -rw-r--r-- | version.m4 | 2 |
3 files changed, 1 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 342074f..729ce40 100644 --- a/configure.ac +++ b/configure.ac @@ -176,11 +176,6 @@ AC_ARG_ENABLE(iproute2, test $enableval = "yes" && AC_DEFINE(CONFIG_FEATURE_IPROUTE, 1, [enable iproute2 support]) ) -AC_ARG_ENABLE(osxipconfig, - [ --enable-osxipconfig Enable support for ipconfig on OS X], - test $enableval = "yes" && AC_DEFINE(DARWIN_USE_IPCONFIG, 1, [Enable support for ipconfig on OS X]) -) - AC_ARG_ENABLE(def-auth, [ --disable-def-auth Disable deferred authentication], [DEF_AUTH="$enableval"], @@ -786,34 +786,6 @@ do_ifconfig (struct tuntap *tt, tt->did_ifconfig = true; #elif defined(TARGET_DARWIN) -#ifdef DARWIN_USE_IPCONFIG - if (tun) - { - msg (M_FATAL, "Error: tun point-to-point mode not supported on Darwin when DARWIN_USE_IPCONFIG is defined"); - } - else - { - argv_printf (&argv, - "/usr/sbin/ipconfig set %s MANUAL %s %s", - actual, - ifconfig_local, - ifconfig_remote_netmask - ); - } - argv_msg (M_INFO, &argv); - { - int i; - const int n = 15; - for (i = 1; i <= n; ++i) /* OSX 10.5 needs retry */ - { - if (openvpn_execve_check (&argv, es, (i == n) ? S_FATAL : 0, "Mac OS X ipconfig failed")) - break; - msg (M_INFO, "Retry #%d", i); - openvpn_sleep(1); - } - } - tt->did_ifconfig = true; -#else /* * Darwin (i.e. Mac OS X) seems to exhibit similar behaviour to OpenBSD... */ @@ -863,7 +835,6 @@ do_ifconfig (struct tuntap *tt, argv_msg (M_INFO, &argv); openvpn_execve_check (&argv, es, S_FATAL, "Mac OS X ifconfig failed"); tt->did_ifconfig = true; -#endif /* Add a network route for the local tun interface */ if (!tun && tt->topology == TOP_SUBNET) @@ -1,5 +1,5 @@ dnl define the OpenVPN version -define(PRODUCT_VERSION,[2.1.3t]) +define(PRODUCT_VERSION,[2.1.3u]) dnl define the TAP version define(PRODUCT_TAP_ID,[tap0901]) define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9]) |