From: fendo <fendo@bi12info.com>
Date: Tue, 4 Jun 2013 12:39:00 +0000 (+0200)
Subject: Merge from master
X-Git-Tag: 2.2.1-2sames3.10
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/f6b5140de23dd17f9a9c28fcca0fcef58b161a78?hp=14db37d6230b67fcb2897729a626ad35dbe41d06

Merge from master
---

diff --git a/debian/changelog b/debian/changelog
index d4a8108..4a37290 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+l2tpns (2.2.1-2sames3.10) unstable; urgency=low
+
+  * Fix: authentication success was sent 2 times.
+  * Fix: session mismatch on group.
+
+ -- Fernando Alves <fernando.alves@sameswireless.fr>  Tue, 04 Jun 2013 14:36:37 +0200
+
 l2tpns (2.2.1-2sames3.9) unstable; urgency=low
 
   * Adding the possibility to set multiple hostname.
diff --git a/radius.c b/radius.c
index 266f100..4ee1bfc 100644
--- a/radius.c
+++ b/radius.c
@@ -598,40 +598,6 @@ void processrad(uint8_t *buf, int len, char socket_index)
 			run_plugins(PLUGIN_POST_AUTH, &packet);
 			r_code = packet.auth_allowed ? AccessAccept : AccessReject;
 
-#ifndef LAC
-			// process auth response
-			if (radius[r].chap)
-			{
-				// CHAP
-				uint8_t *p = makeppp(b, sizeof(b), 0, 0, s, t, PPPCHAP, 0, 0, 0);
-				if (!p) return;	// Abort!
-
-				*p = (r_code == AccessAccept) ? 3 : 4;     // ack/nak
-				p[1] = radius[r].id;
-				*(uint16_t *) (p + 2) = ntohs(4); // no message
-				tunnelsend(b, (p - b) + 4, t); // send it
-
-				LOG(3, s, session[s].tunnel, "   CHAP User %s authentication %s.\n", session[s].user,
-						(r_code == AccessAccept) ? "allowed" : "denied");
-			}
-			else
-			{
-				// PAP
-				uint8_t *p = makeppp(b, sizeof(b), 0, 0, s, t, PPPPAP, 0, 0, 0);
-				if (!p) return;		// Abort!
-
-				// ack/nak
-				*p = r_code;
-				p[1] = radius[r].id;
-				*(uint16_t *) (p + 2) = ntohs(5);
-				p[4] = 0; // no message
-				tunnelsend(b, (p - b) + 5, t); // send it
-
-				LOG(3, s, session[s].tunnel, "   PAP User %s authentication %s.\n", session[s].user,
-						(r_code == AccessAccept) ? "allowed" : "denied");
-			}
-#endif
-
 			if (r_code == AccessAccept)
 			{
 				// Login successful