From: Gert Doering <gert@greenie.muc.de>
Date: Sun, 28 Feb 2010 22:09:40 +0000 (+0100)
Subject: remove duplicate code in FREEBSD+DRAGONFLY system-dependent ifconfig
X-Git-Tag: v2.2-beta1~6^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ed4098663cc0fc5457bd2f6e67b44c0b24e6f6c;p=thirdparty%2Fopenvpn.git

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 <dazo@users.sourceforge.net>
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/tun.c b/tun.c
index d82ac49a5..04573d46f 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");