From 8528e2b77d19384f9077fe41fd39da58cb761168 Mon Sep 17 00:00:00 2001 From: Gert Doering Date: Sun, 28 Feb 2010 23:09:40 +0100 Subject: remove duplicate code in FREEBSD+DRAGONFLY system-dependent ifconfig (ACKed by Eric F Crist and David Sommerseth) (cherry picked from commit dd66b12647852e3f1267be70b0fb3b11deedf377) Signed-off-by: David Sommerseth Signed-off-by: Gert Doering --- tun.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/tun.c b/tun.c index f6fb505..10dde6b 100644 --- a/tun.c +++ b/tun.c @@ -860,26 +860,15 @@ do_ifconfig (struct tuntap *tt, ifconfig_remote_netmask, tun_mtu ); - else { - if (tt->topology == TOP_SUBNET) - argv_printf (&argv, - "%s %s %s netmask %s mtu %d up", + else + argv_printf (&argv, + "%s %s %s netmask %s mtu %d up", IFCONFIG_PATH, actual, ifconfig_local, ifconfig_remote_netmask, tun_mtu ); - else - argv_printf (&argv, - "%s %s %s netmask %s mtu %d up", - IFCONFIG_PATH, - actual, - ifconfig_local, - ifconfig_remote_netmask, - tun_mtu - ); - } argv_msg (M_INFO, &argv); openvpn_execve_check (&argv, es, S_FATAL, "FreeBSD ifconfig failed"); -- cgit v1.2.3