X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Flcp.c;h=eabdfbabb61bca6083d1ead9fc23f954677a6158;hb=21ab3f06bd87f022186fffcd123ecbd9d3a5f9dd;hp=e44a78125dde573b62bad33c87b966dfcfdca78a;hpb=cb67581446e926290c6147634f7f467f48c806b5;p=ppp.git

diff --git a/pppd/lcp.c b/pppd/lcp.c
index e44a781..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.65 2003/03/03 05:11:46 paulus Exp $"
+#define RCSID	"$Id: lcp.c,v 1.67 2003/05/09 11:49:46 carlsonj Exp $"
 
 /*
  * TODO:
@@ -414,7 +414,7 @@ lcp_close(unit, reason)
 	lcp_finished(f);
 
     } else
-	fsm_close(&lcp_fsm[unit], reason);
+	fsm_close(f, reason);
 }
 
 
@@ -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);