Browse code
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
(cherry picked from commit c29e08a2f33234fb705a8323c0d9e1e07b0773fd)
Gert Doering authored on 2014/04/30 06:09:39Showing 2 changed files
| ... | ... |
@@ -4147,7 +4147,7 @@ add_option (struct options *options, |
| 4147 | 4147 |
|
| 4148 | 4148 |
read_config_file (options, p[1], level, file, line, msglevel, permission_mask, option_types_found, es); |
| 4149 | 4149 |
} |
| 4150 |
-#ifdef ENABLE_DEBUG |
|
| 4150 |
+#if defined(ENABLE_DEBUG) && !defined(ENABLE_SMALL) |
|
| 4151 | 4151 |
else if (streq (p[0], "show-gateway")) |
| 4152 | 4152 |
{
|
| 4153 | 4153 |
struct route_gateway_info rgi; |
| ... | ... |
@@ -595,7 +595,7 @@ init_route_list (struct route_list *rl, |
| 595 | 595 |
if (rl->rgi.flags & RGI_ADDR_DEFINED) |
| 596 | 596 |
{
|
| 597 | 597 |
setenv_route_addr (es, "net_gateway", rl->rgi.gateway.addr, -1); |
| 598 |
-#ifdef ENABLE_DEBUG |
|
| 598 |
+#if defined(ENABLE_DEBUG) && !defined(ENABLE_SMALL) |
|
| 599 | 599 |
print_default_gateway (D_ROUTE, &rl->rgi); |
| 600 | 600 |
#endif |
| 601 | 601 |
} |