From: Jan Just Keijser <janjust@nikhef.nl>
Date: Fri, 24 May 2013 12:36:32 +0000 (+0200)
Subject: make 'explicit-exit-notify' pullable again
X-Git-Tag: v2.3.2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14dfec07c91fc42df7ee4abeada104b4fb847f8f;p=thirdparty%2Fopenvpn.git

make 'explicit-exit-notify' pullable again

Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <519F5ED0.4070109@nikhef.nl>
URL: http://article.gmane.org/gmane.network.openvpn.devel/7605

Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 49f714942d5afd5f274aea52c790c896babc8c05)
---

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 606d05bfb..8b67dcbc6 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -5073,8 +5073,7 @@ add_option (struct options *options,
 #ifdef ENABLE_OCC
   else if (streq (p[0], "explicit-exit-notify"))
     {
-      VERIFY_PERMISSION (OPT_P_GENERAL|OPT_P_CONNECTION);
-/*      VERIFY_PERMISSION (OPT_P_EXPLICIT_NOTIFY); */
+      VERIFY_PERMISSION (OPT_P_GENERAL|OPT_P_CONNECTION|OPT_P_EXPLICIT_NOTIFY);
       if (p[1])
 	{
 	  options->ce.explicit_exit_notification = positive_atoi (p[1]);