diff options
| author | Alon Bar-Lev <alon.barlev@gmail.com> | 2012-04-08 22:21:47 +0300 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-04-26 20:04:55 +0200 |
| commit | 88f3a4026c48e92bf3ce18d7611b7b88f7bed0be (patch) | |
| tree | 0c2684da6771032776971a0866f7999abf71576b /src | |
| parent | 4025a59575a9a90cb96fde01eba8db3c1cab0b2b (diff) | |
| download | openvpn-88f3a4026c48e92bf3ce18d7611b7b88f7bed0be.tar.gz openvpn-88f3a4026c48e92bf3ce18d7611b7b88f7bed0be.tar.xz openvpn-88f3a4026c48e92bf3ce18d7611b7b88f7bed0be.zip | |
build: properly detect TUNSETPERSIST
Do not rely on system symbol throught sources
but on autoconf detection.
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/openvpn/init.c | 2 | ||||
| -rw-r--r-- | src/openvpn/options.c | 8 | ||||
| -rw-r--r-- | src/openvpn/tun.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/openvpn/init.c b/src/openvpn/init.c index bc7718e..d022edc 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -954,7 +954,7 @@ do_genkey (const struct options * options) bool do_persist_tuntap (const struct options *options) { -#ifdef TUNSETPERSIST +#ifdef ENABLE_FEATURE_TUN_PERSIST if (options->persist_config) { /* sanity check on options for --mktun or --rmtun */ diff --git a/src/openvpn/options.c b/src/openvpn/options.c index bd83843..33fcb87 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -725,7 +725,7 @@ static const char usage_message[] = " for use with the --secret option.\n" "--secret file : Write key to file.\n" #endif /* ENABLE_CRYPTO */ -#ifdef TUNSETPERSIST +#ifdef ENABLE_FEATURE_TUN_PERSIST "\n" "Tun/tap config mode (available with linux 2.4+):\n" "--mktun : Create a persistent tunnel.\n" @@ -791,7 +791,7 @@ init_options (struct options *o, const bool init_gc) o->management_echo_buffer_size = 100; o->management_state_buffer_size = 100; #endif -#ifdef TUNSETPERSIST +#ifdef ENABLE_FEATURE_TUN_PERSIST o->persist_mode = 1; #endif #ifndef WIN32 @@ -1420,7 +1420,7 @@ show_settings (const struct options *o) SHOW_INT (mode); -#ifdef TUNSETPERSIST +#ifdef ENABLE_FEATURE_TUN_PERSIST SHOW_BOOL (persist_config); SHOW_INT (persist_mode); #endif @@ -6788,7 +6788,7 @@ add_option (struct options *options, options->pkcs11_id_management = true; } #endif -#ifdef TUNSETPERSIST +#ifdef ENABLE_FEATURE_TUN_PERSIST else if (streq (p[0], "rmtun")) { VERIFY_PERMISSION (OPT_P_GENERAL); diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index b99071c..227bfde 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1517,7 +1517,7 @@ open_tun (const char *dev, const char *dev_type, const char *dev_node, struct tu #endif /* HAVE_LINUX_IF_TUN_H */ -#ifdef TUNSETPERSIST +#ifdef ENABLE_FEATURE_TUN_PERSIST /* * This can be removed in future @@ -1567,7 +1567,7 @@ tuncfg (const char *dev, const char *dev_type, const char *dev_node, int persist msg (M_INFO, "Persist state set to: %s", (persist_mode ? "ON" : "OFF")); } -#endif /* TUNSETPERSIST */ +#endif /* ENABLE_FEATURE_TUN_PERSIST */ void close_tun (struct tuntap *tt) |