Skip to contentSkip to conversation

Fix warning for max-routes: do not quit when parsing an old configuration. Format the message to be more like the other deprecated options

PATCH In review Arne Schwabe 2 participants 2 messages Mar 17, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix warning for max-routes: do not quit when parsing an old configuration. Format the message to be more like the other deprecated options

---
 src/openvpn/options.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
src/openvpn/options.c +4 -2
index ef6170c..d69e28f 100644
@@ -5225,8 +5225,10 @@ add_option (struct options *options,
     }
   else if (streq (p[0], "max-routes"))
     {
-      msg (msglevel, "--max-routes option ignored. The number of routes is unlimited as of version 2.4. "
-           "This option will be removed in a future version, please remove it from your configuration.");
+      msg (M_WARN, "DEPRECATED OPTION: --max-routes option ignored."
+	   "The number of routes is unlimited as of version 2.4. "
+	   "This option will be removed in a future version, "
+	   "please remove it from your configuration.");
     }
   else if (streq (p[0], "route-gateway") && p[1])
     {
Signature · 1 line
1.8.5.2 (Apple Git-48)
#1 lore raw

ACK. Patch has been applied to the master branch (no reason to apply to 2.3 as it fixes a change introduced in master only).

commit 4affd9c98636e6c83aad4f0e7859a29f66898b72 (master)

Author: Arne Schwabe
Date:   Mon Mar 17 13:45:45 2014 +0100
     Fix warning for max-routes: do not quit when parsing an old configuration. Format the message to be more like the other deprecated options

     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/8354
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering