From: Paul Mackerras <paulus@samba.org>
Date: Wed, 26 Nov 2008 10:02:29 +0000 (+1100)
Subject: Fix authentication on second time around with multilink and persist
X-Git-Tag: ppp-2.4.7~61
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=9f7c27af1b0b3ca29c673574322b2c23f1184803

Fix authentication on second time around with multilink and persist

Frédéric Brière reported that when using multilink and persist, pppd
would fail to authenticate itself on the second and subsequent times
of bringing up a bundle.  The reason was that the doing_multilink and
multilink_master flags never got reset when the first bundle was
destroyed.  This adds lines to mp_bundle_terminated to do that.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/pppd/multilink.c b/pppd/multilink.c
index b4748cd..135cab0 100644
--- a/pppd/multilink.c
+++ b/pppd/multilink.c
@@ -278,8 +278,11 @@ void mp_bundle_terminated()
 	key.dsize = strlen(blinks_id);
 	tdb_delete(pppdb, key);
 	unlock_db();
-	
-new_phase(PHASE_DEAD);
+
+	new_phase(PHASE_DEAD);
+
+	doing_multilink = 0;
+	multilink_master = 0;
 }
 
 static void make_bundle_links(int append)