]> git.ozlabs.org Git - ppp.git/blobdiff - pppd/chap.c
projects / ppp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
typo
[ppp.git] / pppd / chap.c
diff --git a/pppd/chap.c b/pppd/chap.c
index 06c17e8bfdf71daeb31fef91e1f3bdc39a618cfa..b8a5d0f726ffe9f723d1eaf344a52d45b1591ef9 100644 (file)
--- a/pppd/chap.c
+++ b/pppd/chap.c
@@ -33,9 +33,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static char rcsid[] = "$Id: chap.c,v 1.16 1998/11/07 06:59:26 paulus Exp $";
-#endif
+#define RCSID  "$Id: chap.c,v 1.23 1999/08/13 06:46:11 paulus Exp $"
 
 /*
  * TODO:
@@ -45,7 +43,6 @@ static char rcsid[] = "$Id: chap.c,v 1.16 1998/11/07 06:59:26 paulus Exp $";
 #include <string.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <syslog.h>
 
 #include "pppd.h"
 #include "chap.h"
@@ -54,6 +51,8 @@ static char rcsid[] = "$Id: chap.c,v 1.16 1998/11/07 06:59:26 paulus Exp $";
 #include "chap_ms.h"
 #endif
 
+static const char rcsid[] = RCSID;
+
 /*
  * Command-line options.
  */
@@ -66,7 +65,7 @@ static option_t chap_option_list[] = {
       "Set interval for rechallenge" },
 #ifdef MSLANMAN
     { "ms-lanman", o_bool, &ms_lanman,
-      "Use LanMan psswd when using MS-CHAP", 1 },
+      "Use LanMan passwd when using MS-CHAP", 1 },
 #endif
     { NULL }
 };
@@ -95,6 +94,7 @@ struct protent chap_protent = {
     NULL,
     1,
     "CHAP",
+    NULL,
     chap_option_list,
     NULL,
     NULL,
@@ -212,7 +212,7 @@ ChapChallengeTimeout(arg)
 
     if (cstate->chal_transmits >= cstate->max_transmits) {
        /* give up on peer */
-       syslog(LOG_ERR, "Peer failed to respond to CHAP challenge");
+       error("Peer failed to respond to CHAP challenge");
        cstate->serverstate = CHAPSS_BADAUTH;
        auth_peer_fail(cstate->unit, PPP_CHAP);
        return;
@@ -349,18 +349,18 @@ ChapInput(unit, inpacket, packet_len)
      */
     inp = inpacket;
     if (packet_len < CHAP_HEADERLEN) {
-       CHAPDEBUG((LOG_INFO, "ChapInput: rcvd short header."));
+       CHAPDEBUG(("ChapInput: rcvd short header."));
        return;
     }
     GETCHAR(code, inp);
     GETCHAR(id, inp);
     GETSHORT(len, inp);
     if (len < CHAP_HEADERLEN) {
-       CHAPDEBUG((LOG_INFO, "ChapInput: rcvd illegal length."));
+       CHAPDEBUG(("ChapInput: rcvd illegal length."));
        return;
     }
     if (len > packet_len) {
-       CHAPDEBUG((LOG_INFO, "ChapInput: rcvd short packet."));
+       CHAPDEBUG(("ChapInput: rcvd short packet."));
        return;
     }
     len -= CHAP_HEADERLEN;
@@ -386,7 +386,7 @@ ChapInput(unit, inpacket, packet_len)
        break;
 
     default:                           /* Need code reject? */
-       syslog(LOG_WARNING, "Unknown CHAP code (%d) received.", code);
+       warn("Unknown CHAP code (%d) received.", code);
        break;
     }
 }
@@ -410,23 +410,21 @@ ChapReceiveChallenge(cstate, inp, id, len)
     MD5_CTX mdContext;
     u_char hash[MD5_SIGNATURE_SIZE];
  
-    CHAPDEBUG((LOG_INFO, "ChapReceiveChallenge: Rcvd id %d.", id));
     if (cstate->clientstate == CHAPCS_CLOSED ||
        cstate->clientstate == CHAPCS_PENDING) {
-       CHAPDEBUG((LOG_INFO, "ChapReceiveChallenge: in state %d",
-                  cstate->clientstate));
+       CHAPDEBUG(("ChapReceiveChallenge: in state %d", cstate->clientstate));
        return;
     }
 
     if (len < 2) {
-       CHAPDEBUG((LOG_INFO, "ChapReceiveChallenge: rcvd short packet."));
+       CHAPDEBUG(("ChapReceiveChallenge: rcvd short packet."));
        return;
     }
 
     GETCHAR(rchallenge_len, inp);
     len -= sizeof (u_char) + rchallenge_len;   /* now name field length */
     if (len < 0) {
-       CHAPDEBUG((LOG_INFO, "ChapReceiveChallenge: rcvd short packet."));
+       CHAPDEBUG(("ChapReceiveChallenge: rcvd short packet."));
        return;
     }
     rchallenge = inp;
@@ -437,14 +435,10 @@ ChapReceiveChallenge(cstate, inp, id, len)
     BCOPY(inp, rhostname, len);
     rhostname[len] = '\000';
 
-    CHAPDEBUG((LOG_INFO, "ChapReceiveChallenge: received name field '%s'",
-              rhostname));
-
     /* Microsoft doesn't send their name back in the PPP packet */
-    if (remote_name[0] != 0 && (explicit_remote || rhostname[0] == 0)) {
-       strncpy(rhostname, remote_name, sizeof(rhostname));
-       rhostname[sizeof(rhostname) - 1] = 0;
-       CHAPDEBUG((LOG_INFO, "ChapReceiveChallenge: using '%s' as remote name",
+    if (explicit_remote || (remote_name[0] != 0 && rhostname[0] == 0)) {
+       strlcpy(rhostname, remote_name, sizeof(rhostname));
+       CHAPDEBUG(("ChapReceiveChallenge: using '%q' as remote name",
                   rhostname));
     }
 
@@ -452,8 +446,7 @@ ChapReceiveChallenge(cstate, inp, id, len)
     if (!get_secret(cstate->unit, cstate->resp_name, rhostname,
                    secret, &secret_len, 0)) {
        secret_len = 0;         /* assume null secret if can't find one */
-       syslog(LOG_WARNING, "No CHAP secret found for authenticating us to %s",
-              rhostname);
+       warn("No CHAP secret found for authenticating us to %q", rhostname);
     }
 
     /* cancel response send timeout if necessary */
@@ -483,7 +476,7 @@ ChapReceiveChallenge(cstate, inp, id, len)
 #endif
 
     default:
-       CHAPDEBUG((LOG_INFO, "unknown digest type %d", cstate->resp_type));
+       CHAPDEBUG(("unknown digest type %d", cstate->resp_type));
        return;
     }
 
@@ -510,12 +503,9 @@ ChapReceiveResponse(cstate, inp, id, len)
     char secret[MAXSECRETLEN];
     u_char hash[MD5_SIGNATURE_SIZE];
 
-    CHAPDEBUG((LOG_INFO, "ChapReceiveResponse: Rcvd id %d.", id));
-
     if (cstate->serverstate == CHAPSS_CLOSED ||
        cstate->serverstate == CHAPSS_PENDING) {
-       CHAPDEBUG((LOG_INFO, "ChapReceiveResponse: in state %d",
-                  cstate->serverstate));
+       CHAPDEBUG(("ChapReceiveResponse: in state %d", cstate->serverstate));
        return;
     }
 
@@ -537,7 +527,7 @@ ChapReceiveResponse(cstate, inp, id, len)
     }
 
     if (len < 2) {
-       CHAPDEBUG((LOG_INFO, "ChapReceiveResponse: rcvd short packet."));
+       CHAPDEBUG(("ChapReceiveResponse: rcvd short packet."));
        return;
     }
     GETCHAR(remmd_len, inp);           /* get length of MD */
@@ -546,7 +536,7 @@ ChapReceiveResponse(cstate, inp, id, len)
 
     len -= sizeof (u_char) + remmd_len;
     if (len < 0) {
-       CHAPDEBUG((LOG_INFO, "ChapReceiveResponse: rcvd short packet."));
+       CHAPDEBUG(("ChapReceiveResponse: rcvd short packet."));
        return;
     }
 
@@ -557,18 +547,14 @@ ChapReceiveResponse(cstate, inp, id, len)
     BCOPY(inp, rhostname, len);
     rhostname[len] = '\000';
 
-    CHAPDEBUG((LOG_INFO, "ChapReceiveResponse: received name field: %s",
-              rhostname));
-
     /*
      * Get secret for authenticating them with us,
      * do the hash ourselves, and compare the result.
      */
     code = CHAP_FAILURE;
-    if (!get_secret(cstate->unit, rhostname, cstate->chal_name,
-                  secret, &secret_len, 1)) {
-       syslog(LOG_WARNING, "No CHAP secret found for authenticating %s",
-              rhostname);
+    if (!get_secret(cstate->unit, (explicit_remote? remote_name: rhostname),
+                   cstate->chal_name, secret, &secret_len, 1)) {
+       warn("No CHAP secret found for authenticating %q", rhostname);
     } else {
 
        /*  generate MD based on negotiated type */
@@ -589,7 +575,7 @@ ChapReceiveResponse(cstate, inp, id, len)
            break;
 
        default:
-           CHAPDEBUG((LOG_INFO, "unknown digest type %d", cstate->chal_type));
+           CHAPDEBUG(("unknown digest type %d", cstate->chal_type));
        }
     }
 
@@ -604,12 +590,10 @@ ChapReceiveResponse(cstate, inp, id, len)
        }
        if (cstate->chal_interval != 0)
            TIMEOUT(ChapRechallenge, cstate, cstate->chal_interval);
-       syslog(LOG_NOTICE, "CHAP peer authentication succeeded for %s",
-              rhostname);
+       notice("CHAP peer authentication succeeded for %q", rhostname);
 
     } else {
-       syslog(LOG_ERR, "CHAP peer authentication failed for remote host %s",
-              rhostname);
+       error("CHAP peer authentication failed for remote host %q", rhostname);
        cstate->serverstate = CHAPSS_BADAUTH;
        auth_peer_fail(cstate->unit, PPP_CHAP);
     }
@@ -626,16 +610,13 @@ ChapReceiveSuccess(cstate, inp, id, len)
     int len;
 {
 
-    CHAPDEBUG((LOG_INFO, "ChapReceiveSuccess: Rcvd id %d.", id));
-
     if (cstate->clientstate == CHAPCS_OPEN)
        /* presumably an answer to a duplicate response */
        return;
 
     if (cstate->clientstate != CHAPCS_RESPONSE) {
        /* don't know what this is */
-       CHAPDEBUG((LOG_INFO, "ChapReceiveSuccess: in state %d\n",
-                  cstate->clientstate));
+       CHAPDEBUG(("ChapReceiveSuccess: in state %d\n", cstate->clientstate));
        return;
     }
 
@@ -663,12 +644,9 @@ ChapReceiveFailure(cstate, inp, id, len)
     u_char id;
     int len;
 {
-    CHAPDEBUG((LOG_INFO, "ChapReceiveFailure: Rcvd id %d.", id));
-
     if (cstate->clientstate != CHAPCS_RESPONSE) {
        /* don't know what this is */
-       CHAPDEBUG((LOG_INFO, "ChapReceiveFailure: in state %d\n",
-                  cstate->clientstate));
+       CHAPDEBUG(("ChapReceiveFailure: in state %d\n", cstate->clientstate));
        return;
     }
 
@@ -680,7 +658,7 @@ ChapReceiveFailure(cstate, inp, id, len)
     if (len > 0)
        PRINTMSG(inp, len);
 
-    syslog(LOG_ERR, "CHAP authentication failed");
+    error("CHAP authentication failed");
     auth_withpeer_fail(cstate->unit, PPP_CHAP);
 }
 
@@ -715,8 +693,6 @@ ChapSendChallenge(cstate)
 
     output(cstate->unit, outpacket_buf, outlen + PPP_HDRLEN);
   
-    CHAPDEBUG((LOG_INFO, "ChapSendChallenge: Sent id %d.", cstate->chal_id));
-
     TIMEOUT(ChapChallengeTimeout, cstate, cstate->timeouttime);
     ++cstate->chal_transmits;
 }
@@ -735,9 +711,9 @@ ChapSendStatus(cstate, code)
     char msg[256];
 
     if (code == CHAP_SUCCESS)
-       sprintf(msg, "Welcome to %s.", hostname);
+       slprintf(msg, sizeof(msg), "Welcome to %s.", hostname);
     else
-       sprintf(msg, "I don't like you.  Go 'way.");
+       slprintf(msg, sizeof(msg), "I don't like you.  Go 'way.");
     msglen = strlen(msg);
 
     outlen = CHAP_HEADERLEN + msglen;
@@ -750,9 +726,6 @@ ChapSendStatus(cstate, code)
     PUTSHORT(outlen, outp);
     BCOPY(msg, outp, msglen);
     output(cstate->unit, outpacket_buf, outlen + PPP_HDRLEN);
-  
-    CHAPDEBUG((LOG_INFO, "ChapSendStatus: Sent code %d, id %d.", code,
-              cstate->chal_id));
 }
 
 /*
PPP (Point-to-Point Protocol) implementation for Linux and Solaris