From: David Sommerseth Date: Tue, 10 Jan 2017 20:34:33 +0000 (+0100) Subject: management: Remove a redundant #ifdef block X-Git-Tag: v2.4.1~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=977f0b9ff4b600212b603279153ff1b1b10cf527;p=thirdparty%2Fopenvpn.git management: Remove a redundant #ifdef block Bascially removes two independent #ifdef ENABLE_MANAGEMENT blocks into a single block, which makes the logic flow more easy to read. Signed-off-by: David Sommerseth Cc: Selva Nair Acked-by: Selva Nair Message-Id: <1484080473-10415-2-git-send-email-davids@openvpn.net> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13852.html Signed-off-by: David Sommerseth (cherry picked from commit 7b02cc2aa8318dc8f2677064dadcbec295b2f937) --- diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 4786232c2..5296345e1 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -414,11 +414,7 @@ next_connection_entry(struct context *c) break; } } - else -#endif - -#ifdef ENABLE_MANAGEMENT - if (ce_defined && management && management_query_proxy_enabled(management)) + else if (ce_defined && management && management_query_proxy_enabled(management)) { ce_defined = ce_management_query_proxy(c); if (IS_SIG(c))