Conditionalize calls to print_default_gateway on !ENABLE_SMALL

Calls to print_default_gateway() depended on #ifdef ENABLE_DEBUG, but
the actual function wasn't compiled in #ifdef ENABLE_SMALL, so the
combination "configure --enable-small --enable-debug" didn't work. Fix.

Fix trac #397

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <1398805779-29376-1-git-send-email-gert@greenie.muc.de>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8670

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 40210e62c327e09af1694ab4f2483944399fb3cd..fe9b99d28da97877ba2c9d73c2baab7eb80645b8 100644 (file)
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -4144,7 +4144,7 @@ add_option (struct options *options,
 
       read_config_file (options, p[1], level, file, line, msglevel, permission_mask, option_types_found, es);
     }
-#ifdef ENABLE_DEBUG
+#if defined(ENABLE_DEBUG) && !defined(ENABLE_SMALL)
   else if (streq (p[0], "show-gateway"))
     {
       struct route_gateway_info rgi;

diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index 1d9da422f6d9bf8eda88c745f37a8eb885419b6e..12f5b62fbe273352c6a755312261b5e6d061b831 100644 (file)
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -579,7 +579,7 @@ init_route_list (struct route_list *rl,
   if (rl->rgi.flags & RGI_ADDR_DEFINED)
     {
       setenv_route_addr (es, "net_gateway", rl->rgi.gateway.addr, -1);
-#ifdef ENABLE_DEBUG
+#if defined(ENABLE_DEBUG) && !defined(ENABLE_SMALL)
       print_default_gateway (D_ROUTE, &rl->rgi);
 #endif
     }