Fixed the old chap.c so that it works with the new auth.c, since

[ppp.git] / pppd / chap.c

diff --git a/pppd/chap.c b/pppd/chap.c
index 10673f26648df469b44d00af3b5d64f1294b89fb..aa07d0e941e8dfede3df882c86bf818769136921 100644 (file)
--- a/pppd/chap.c
+++ b/pppd/chap.c
@@ -49,7 +49,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define RCSID  "$Id: chap.c,v 1.39 2003/02/16 22:32:14 paulus Exp $"
+#define RCSID  "$Id: chap.c,v 1.41 2003/07/28 12:25:41 carlsonj Exp $"
 
 /*
  * TODO:
@@ -68,12 +68,6 @@
 #include "chap_ms.h"
 #endif
 
-/* Hook for a plugin to say if we can possibly authenticate a peer using CHAP */
-int (*chap_check_hook) __P((void)) = NULL;
-
-/* Hook for a plugin to get the CHAP password for authenticating us */
-int (*chap_passwd_hook) __P((char *user, char *passwd)) = NULL;
-
 /* Hook for a plugin to validate CHAP challenge */
 int (*chap_auth_hook) __P((char *user,
                           u_char *remmd,
@@ -183,14 +177,11 @@ ChapInit(unit)
 
 
 /*
- * ChapAuthWithPeer - Authenticate us with our peer (start client).
+ * chap_auth_with_peer - Authenticate us with our peer (start client).
  *
  */
 void
-ChapAuthWithPeer(unit, our_name, digest)
-    int unit;
-    char *our_name;
-    int digest;
+chap_auth_with_peer(int unit, char *our_name, int digest)
 {
     chap_state *cstate = &chap[unit];
 
@@ -214,13 +205,10 @@ ChapAuthWithPeer(unit, our_name, digest)
 
 
 /*
- * ChapAuthPeer - Authenticate our peer (start server).
+ * chap_auth_peer - Authenticate our peer (start server).
  */
 void
-ChapAuthPeer(unit, our_name, digest)
-    int unit;
-    char *our_name;
-    int digest;
+chap_auth_peer(int unit, char *our_name, int digest)
 {
     chap_state *cstate = &chap[unit];
 
@@ -810,7 +798,9 @@ ChapReceiveFailure(cstate, inp, id, len)
     u_char id;
     int len;
 {
+#ifdef CHAPMS
     u_char *msg;
+#endif
     u_char *p = inp;
 
     if (cstate->clientstate != CHAPCS_RESPONSE) {
@@ -898,7 +888,9 @@ ChapReceiveFailure(cstate, inp, id, len)
     /*
      * Print message.
      */
+#ifdef CHAPMS
 print_msg:
+#endif
     if (len > 0 && p != NULL)
        PRINTMSG(p, len);
 
@@ -955,7 +947,7 @@ ChapSendStatus(cstate, code)
     int code;
 {
     u_char *outp;
-    int i, outlen, msglen;
+    int outlen, msglen;
     char msg[256];
     char *p, *q;
 
@@ -1023,6 +1015,8 @@ ChapSendStatus(cstate, code)
             * Basically, this whole bit is useless code, even the small
             * implementation here is only because of overspecification.
             */
+           int i;
+
            slprintf(p, q - p, "E=691 R=1 C=");
            p += 12;
            for (i = 0; i < cstate->chal_len; i++)
@@ -1035,7 +1029,9 @@ ChapSendStatus(cstate, code)
 
        slprintf(p, q - p, "I don't like you.  Go 'way.");
     }
+#ifdef CHAPMS
 msgdone:
+#endif
     msglen = strlen(msg);
 
     outlen = CHAP_HEADERLEN + msglen;