From: James Carlson <carlsonj@workingcode.com>
Date: Fri, 9 May 2003 11:49:46 +0000 (+0000)
Subject: Repaired bad LCP Configure-Nak generated to request EAP instead of PAP.
X-Git-Tag: ppp-2.4.7~296
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=7f417198cd0911ddbd890565298a4a400e09cae2

Repaired bad LCP Configure-Nak generated to request EAP instead of PAP.
---

diff --git a/pppd/lcp.c b/pppd/lcp.c
index f2134b8..eabdfba 100644
--- a/pppd/lcp.c
+++ b/pppd/lcp.c
@@ -40,7 +40,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID	"$Id: lcp.c,v 1.66 2003/03/04 05:13:59 fcusack Exp $"
+#define RCSID	"$Id: lcp.c,v 1.67 2003/05/09 11:49:46 carlsonj Exp $"
 
 /*
  * TODO:
@@ -1603,11 +1603,11 @@ lcp_reqci(f, inp, lenp, reject_if_disagree)
 		}
 		if (!ao->neg_upap) {	/* we don't want to do PAP */
 		    orc = CONFNAK;	/* NAK it and suggest CHAP or EAP */
+		    PUTCHAR(CI_AUTHTYPE, nakp);
 		    if (ao->neg_eap) {
 			PUTCHAR(CILEN_SHORT, nakp);
 			PUTSHORT(PPP_EAP, nakp);
 		    } else {
-			PUTCHAR(CI_AUTHTYPE, nakp);
 			PUTCHAR(CILEN_CHAP, nakp);
 			PUTSHORT(PPP_CHAP, nakp);
 			PUTCHAR(CHAP_DIGEST(ao->chap_mdtype), nakp);