summaryrefslogtreecommitdiff
path: root/src/openvpn/tun.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2020-04-10 23:10:07 +0200
committerJörg Frings-Fürst <debian@jff.email>2020-04-10 23:10:07 +0200
commit4f3065b441a19ac8661a487a1f87c25d7173ac03 (patch)
treeccf4fa15d6322e1c080d29500261cc7dc0be042a /src/openvpn/tun.c
parenta351f71e82badcc71a2ce881bbb97eccfcebc06b (diff)
parent8a3450ef8682b9085637d7b94afc5c7e6f92e64b (diff)
Update upstream source from tag 'upstream/2.4.8'
Update to upstream version '2.4.8' with Debian dir 00c9c7e7fdd8b0a1729f9102507c151f67ca8c5d
Diffstat (limited to 'src/openvpn/tun.c')
-rw-r--r--src/openvpn/tun.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index 63f9d1b..80eaa2c 100644
--- a/src/openvpn/tun.c
+++ b/src/openvpn/tun.c
@@ -5044,7 +5044,6 @@ void
ipconfig_register_dns(const struct env_set *es)
{
struct argv argv = argv_new();
- bool status;
const char err[] = "ERROR: Windows ipconfig command failed";
msg(D_TUNTAP_INFO, "Start ipconfig commands for register-dns...");
@@ -5054,14 +5053,14 @@ ipconfig_register_dns(const struct env_set *es)
get_win_sys_path(),
WIN_IPCONFIG_PATH_SUFFIX);
argv_msg(D_TUNTAP_INFO, &argv);
- status = openvpn_execve_check(&argv, es, 0, err);
+ openvpn_execve_check(&argv, es, 0, err);
argv_reset(&argv);
argv_printf(&argv, "%s%sc /registerdns",
get_win_sys_path(),
WIN_IPCONFIG_PATH_SUFFIX);
argv_msg(D_TUNTAP_INFO, &argv);
- status = openvpn_execve_check(&argv, es, 0, err);
+ openvpn_execve_check(&argv, es, 0, err);
argv_reset(&argv);
netcmd_semaphore_release();
@@ -5355,8 +5354,7 @@ netsh_ifconfig(const struct tuntap_options *to,
}
static void
-netsh_enable_dhcp(const struct tuntap_options *to,
- const char *actual_name)
+netsh_enable_dhcp(const char *actual_name)
{
struct argv argv = argv_new();
@@ -5902,7 +5900,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun
}
else
{
- netsh_enable_dhcp(&tt->options, tt->actual_name);
+ netsh_enable_dhcp(tt->actual_name);
}
}
dhcp_masq = true;