aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-11-05 17:28:09 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-11-05 17:28:09 +0000
commitbd0a5857fb76f35673dcb408e50d5b7c7e79e997 (patch)
tree5f24856cb86cdcf20e13c391b624b18e8111b1b7
parentAdded config file option "setenv FORWARD_COMPATIBLE 1" to relax (diff)
downloadopenvpn-bd0a5857fb76f35673dcb408e50d5b7c7e79e997.tar.xz
Minor fix to previous commit (r3476).
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3477 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r--options.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/options.c b/options.c
index 7187d6e..5e579e9 100644
--- a/options.c
+++ b/options.c
@@ -3270,7 +3270,7 @@ no_more_than_n_args (const int msglevel,
}
static inline int
-msglevel_forward_compatible (struct options *options)
+msglevel_forward_compatible (struct options *options, const int msglevel)
{
return options->forward_compatible ? M_WARN : msglevel;
}
@@ -3288,7 +3288,7 @@ add_option (struct options *options,
{
struct gc_arena gc = gc_new ();
const bool pull_mode = BOOL_CAST (permission_mask & OPT_P_PULL_MODE);
- int msglevel_fc = msglevel_forward_compatible (options);
+ int msglevel_fc = msglevel_forward_compatible (options, msglevel);
ASSERT (MAX_PARMS >= 5);
if (!file)
@@ -4389,7 +4389,7 @@ add_option (struct options *options,
if (streq (p[1], "FORWARD_COMPATIBLE") && p[2] && streq (p[2], "1"))
{
options->forward_compatible = true;
- msglevel_fc = msglevel_forward_compatible (options);
+ msglevel_fc = msglevel_forward_compatible (options, msglevel);
}
setenv_str (es, p[1], p[2] ? p[2] : "");
}