(cherry picked from commit dd66b12647852e3f1267be70b0fb3b11deedf377)
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Signed-off-by: Gert Doering <gert@greenie.muc.de>
| ... | ... |
@@ -860,26 +860,15 @@ do_ifconfig (struct tuntap *tt, |
| 860 | 860 |
ifconfig_remote_netmask, |
| 861 | 861 |
tun_mtu |
| 862 | 862 |
); |
| 863 |
- else {
|
|
| 864 |
- if (tt->topology == TOP_SUBNET) |
|
| 865 |
- argv_printf (&argv, |
|
| 866 |
- "%s %s %s netmask %s mtu %d up", |
|
| 863 |
+ else |
|
| 864 |
+ argv_printf (&argv, |
|
| 865 |
+ "%s %s %s netmask %s mtu %d up", |
|
| 867 | 866 |
IFCONFIG_PATH, |
| 868 | 867 |
actual, |
| 869 | 868 |
ifconfig_local, |
| 870 | 869 |
ifconfig_remote_netmask, |
| 871 | 870 |
tun_mtu |
| 872 | 871 |
); |
| 873 |
- else |
|
| 874 |
- argv_printf (&argv, |
|
| 875 |
- "%s %s %s netmask %s mtu %d up", |
|
| 876 |
- IFCONFIG_PATH, |
|
| 877 |
- actual, |
|
| 878 |
- ifconfig_local, |
|
| 879 |
- ifconfig_remote_netmask, |
|
| 880 |
- tun_mtu |
|
| 881 |
- ); |
|
| 882 |
- } |
|
| 883 | 872 |
|
| 884 | 873 |
argv_msg (M_INFO, &argv); |
| 885 | 874 |
openvpn_execve_check (&argv, es, S_FATAL, "FreeBSD ifconfig failed"); |