Browse Source

pptpctrl: exit when bailing (cherry-picked from upstream git)

Christoph Biedl 7 years ago
parent
commit
326364b750
2 changed files with 25 additions and 0 deletions
  1. 24 0
      debian/patches/cherry-pick.1.4.0-14-gb84360b.patch
  2. 1 0
      debian/patches/series

+ 24 - 0
debian/patches/cherry-pick.1.4.0-14-gb84360b.patch

@@ -0,0 +1,24 @@
+Subject: pptpctrl: exit when bailing
+Origin: b84360bb7d2d1c603a9e99f0640e962673c135e7
+Author: James Cameron <quozl@laptop.org>
+Date: Sat Oct 18 15:08:00 2014 +1100
+
+    Commit 0770455 in 2004 removed the call to exit, and so now pptpctrl
+    continues instead of terminating.
+    
+    http://sourceforge.net/p/poptop/bugs/51/
+    
+    Reported-by: Gavin Wan <gavin-wan-nd@users.sf.net>
+    Signed-off-by: James Cameron <quozl@laptop.org>
+
+--- a/pptpctrl.c
++++ b/pptpctrl.c
+@@ -545,6 +545,8 @@
+ 
+         if (pptpctrl_debug)
+                 syslog(LOG_DEBUG, "CTRL: Exiting now");
++
++        exit((GET_VALUE(PAC, call_id_pair) == htons(-1)) ? 0 : 1);
+ }
+ 
+ /*

+ 1 - 0
debian/patches/series

@@ -1,3 +1,4 @@
 build_hardening-flags.patch
 build_plugin.patch
 cherry-pick.1.4.0-11-g4ea2db6.ff.patch
+cherry-pick.1.4.0-14-gb84360b.patch