syslog -> notice/error/etc.

[ppp.git] / pppd / chap.c

diff --git a/pppd/chap.c b/pppd/chap.c
index 6b405f195d409d62734294544ed9707256c1080a..27a60f21d058f76b5695d2e61f468737668ff4c5 100644 (file)
--- a/pppd/chap.c
+++ b/pppd/chap.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: chap.c,v 1.18 1999/03/12 06:07:15 paulus Exp $";
+static char rcsid[] = "$Id: chap.c,v 1.19 1999/03/16 03:15:13 paulus Exp $";
 #endif
 
 /*
@@ -45,7 +45,6 @@ static char rcsid[] = "$Id: chap.c,v 1.18 1999/03/12 06:07:15 paulus Exp $";
 #include <string.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <syslog.h>
 
 #include "pppd.h"
 #include "chap.h"
@@ -212,7 +211,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 +348,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 +385,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 +409,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,13 +434,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)) {
        strlcpy(rhostname, sizeof(rhostname), remote_name);
-       CHAPDEBUG((LOG_INFO, "ChapReceiveChallenge: using '%s' as remote name",
+       CHAPDEBUG(("ChapReceiveChallenge: using '%q' as remote name",
                   rhostname));
     }
 
@@ -451,8 +445,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 */
@@ -482,7 +475,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;
     }
 
@@ -509,12 +502,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;
     }
 
@@ -536,7 +526,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 */
@@ -545,7 +535,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;
     }
 
@@ -556,18 +546,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);
+                   secret, &secret_len, 1)) {
+       warn("No CHAP secret found for authenticating %q", rhostname);
     } else {
 
        /*  generate MD based on negotiated type */
@@ -588,7 +574,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));
        }
     }
 
@@ -603,12 +589,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);
     }
@@ -625,16 +609,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;
     }
 
@@ -662,12 +643,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;
     }
 
@@ -679,7 +657,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);
 }
 
@@ -714,8 +692,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;
 }
@@ -734,9 +710,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;
@@ -749,9 +725,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));
 }
 
 /*