From: David Sommerseth <davids@redhat.com>
Date: Mon, 13 Feb 2012 15:03:46 +0000 (+0100)
Subject: Remove --show-gateway if debug info is not enabled (--disable-debug)
X-Git-Tag: v2.3-alpha1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecede953d6366e9fbfecea62cc1f61fd2347dab7;p=thirdparty%2Fopenvpn.git

Remove --show-gateway if debug info is not enabled (--disable-debug)

The --show-gateway feature depends on functions only being enabled when
--disable-debug is _not_ used.  As this I consider --show-gateway more
a handy function for debugging, removing this feature when --disable-debug
is used seems like the proper approach.

Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/options.c b/options.c
index 42b0b52c0..bfba5c40e 100644
--- a/options.c
+++ b/options.c
@@ -735,7 +735,9 @@ static const char usage_message[] =
 #endif				/* ENABLE_PKCS11 */
   "\n"
   "General Standalone Options:\n"
+#ifdef ENABLE_DEBUG
   "--show-gateway : Show info about default gateway.\n"
+#endif
  ;
 
 #endif /* !ENABLE_SMALL */
@@ -4058,6 +4060,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
   else if (streq (p[0], "show-gateway"))
     {
       struct route_gateway_info rgi;
@@ -4066,6 +4069,7 @@ add_option (struct options *options,
       print_default_gateway(M_INFO, &rgi);
       openvpn_exit (OPENVPN_EXIT_STATUS_GOOD); /* exit point */
     }
+#endif
 #if 0
   else if (streq (p[0], "foreign-option") && p[1])
     {