Skip to contentSkip to conversation

make "explicit-exit-notify" pullable again

PATCH Applied Jan Just Keijser 2 participants 2 messages May 24, 2013 2 messages not in the archive

lore
Share & tools
lore
#2 lore raw

PATCH 1/1 make "explicit-exit-notify" pullable again

In reply to a message not in the archive
src/openvpn/options.c +0 -0
index d44f835..47df4cb 100644
@@ -5084,8 +5084,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]);

share and enjoy,

JJK

Quoted 46 lines · Gert Doering

Hi,

Quoted 2 lines · Dmitry Melekhov

Posted the same on forum :-)

I'm not sure why that is *funny* - in general, I'd frown upon putting the same question in multiple places at the same time, as it causes extra work for other people who might not see both questions, so I might answer here and someone else might spend the time answering in the forum.

Quoted 6 lines

But today I installed update to 2.3.1 and I now I see:

Options error: option 'explicit-exit-notify' cannot be used in this context ([PUSH-OPTIONS])

Why? How can I revert to previous behavior?

That is, indeed, a good question. "git blame" points to...

commit 76809cae0eae07817160b423d3f9551df1a1d68e

Author: Jan Just Keijser <[email protected]...>
Date:   Tue Feb 7 16:29:47 2012 +0100

Made some options connection-entry specific

... which has lots of changes we thought we understand, plus:

(quoted diff) +2 -1
@@ -5106,14 +5108,15 @@ add_option (struct options *options,
 #ifdef ENABLE_OCC
   else if (streq (p[0], "explicit-exit-notify"))
     {
-      VERIFY_PERMISSION (OPT_P_EXPLICIT_NOTIFY);
+      VERIFY_PERMISSION (OPT_P_GENERAL|OPT_P_CONNECTION);
+//      VERIFY_PERMISSION (OPT_P_EXPLICIT_NOTIFY);
 
 

... but since JJK is reading this list, he might have an answer, and a suggested fix for 2.3.2 :-)

gert

Applied
#3 lore raw

Hi,

src/openvpn/options.c

Quoted 4 lines · Jan Just Keijser
src/openvpn/options.c +0 -0
index d44f835..47df4cb 100644

ACK, and thanks.

Applied to master and release/2.3 branches.

commit 49f714942d5afd5f274aea52c790c896babc8c05 (master) commit 14dfec07c91fc42df7ee4abeada104b4fb847f8f (release/2.3)

Author: Jan Just Keijser <[email protected]...>
Date:   Fri May 24 14:36:32 2013 +0200
    make 'explicit-exit-notify' pullable again
    
    Acked-by: Gert Doering <[email protected]...>
    Message-Id: <[email protected]...>
    URL: http://article.gmane.org/gmane.network.openvpn.devel/7605

gert

Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             [email protected]...
fax: +49-89-35655025                        [email protected]...