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 <davids@openvpn.net>
Cc: Selva Nair <selva.nair@gmail.com>
Acked-by: Selva Nair <selva.nair@gmail.com>
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 <davids@openvpn.net>
(cherry picked from commit 7b02cc2aa8318dc8f2677064dadcbec295b2f937)

diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 4786232c2df4c56c4531071a7b7be3295c9af58d..5296345e1e11ef67656c0294c4fcab393e1e3e8b 100644 (file)
--- 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))