From: David Sommerseth <dazo@users.sourceforge.net>
Date: Thu, 5 Aug 2010 19:28:21 +0000 (+0200)
Subject: Merge branch 'bugfix2.1' into beta2.2
X-Git-Tag: v2.2-beta1~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee0f176643f7ac05a167fd0170ee95a3e0262974;p=thirdparty%2Fopenvpn.git

Merge branch 'bugfix2.1' into beta2.2
---

ee0f176643f7ac05a167fd0170ee95a3e0262974
diff --cc options.c
index 2c2a782ff,e39a8ba76..d40c7f0ea
--- a/options.c
+++ b/options.c
@@@ -5750,13 -5725,9 +5767,14 @@@ add_option (struct options *options
        VERIFY_PERMISSION (OPT_P_SCRIPT);
        if (!no_more_than_n_args (msglevel, p, 2, NM_QUOTE_HINT))
  	goto err;
+       warn_multiple_script (options->tls_verify, "tls-verify");
        options->tls_verify = string_substitute (p[1], ',', ' ', &options->gc);
      }
 +  else if (streq (p[0], "tls-export-cert") && p[1])
 +    {
 +      VERIFY_PERMISSION (OPT_P_GENERAL);
 +      options->tls_export_cert = p[1];
 +    }
    else if (streq (p[0], "tls-remote") && p[1])
      {
        VERIFY_PERMISSION (OPT_P_GENERAL);