Error message if max-routes used incorrectly

the route/route-ipv6/redirect-gateway options allocate the route structe
with max_routes number of routes. A max-routes after any of this commands
has no effect. This can be problematic
(http://code.google.com/p/ics-openvpn/issues/detail?id=101)

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: 1353348737-21920-1-git-send-email-arne@rfc2549.org
URL: http://article.gmane.org/gmane.network.openvpn.devel/7131
Signed-off-by: David Sommerseth <davids@redhat.com>
(cherry picked from commit f83ccec6525179968b68696acb6ccf22182fc6de)

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 9baa4ffe8fc3ad4c7e78932080b863db24055761..5cec3443e5253de07fa941744bac2511a720ce76 100644 (file)
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -5141,6 +5141,11 @@ add_option (struct options *options,
          msg (msglevel, "--max-routes parameter is out of range");
          goto err;
        }
+      if (options->routes || options->routes_ipv6)
+        {
+          msg (msglevel, "--max-routes must to be specifed before any route/route-ipv6/redirect-gateway option");
+          goto err;
+        }
       options->max_routes = max_routes;
     }
   else if (streq (p[0], "route-gateway") && p[1])