From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Fri, 16 Oct 2009 16:31:01 +0000 (+0000)
Subject: Added "setenv GENERIC_CONFIG" directive, for generic configs
X-Git-Tag: v2.1_rc21~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f9c77b7d94338c6691eb59e80adb459afd364e0;p=thirdparty%2Fopenvpn.git

Added "setenv GENERIC_CONFIG" directive, for generic configs
that cannot directly be used as a config file.  The directive
will simply cause OpenVPN to exit with an error if a generic
config file is used.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@5077 e7ae566f-a301-0410-adde-c780ea21d3b5
---

diff --git a/options.c b/options.c
index acbb03660..183c21a84 100644
--- a/options.c
+++ b/options.c
@@ -4468,6 +4468,11 @@ add_option (struct options *options,
 	{
 	  options->sockflags |= SF_HOST_RANDOMIZE;
 	}
+      else if (streq (p[1], "GENERIC_CONFIG"))
+	{
+	  msg (msglevel, "this is a generic configuration and cannot directly be used");
+	  goto err;
+	}
 #if P2MP
       else if (streq (p[1], "SERVER_POLL_TIMEOUT") && p[2])
 	{