old DLPI doesn't have dl_sap_length

[ppp.git] / pppd / auth.c

diff --git a/pppd/auth.c b/pppd/auth.c
index dd9735b89efdf4243b9e133e47517c8cb483de25..4ac139de69ef2b11d2190a276374c42ec782320f 100644 (file)
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char rcsid[] = "$Id: auth.c,v 1.17 1995/08/16 01:37:22 paulus Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.19 1995/12/11 05:17:42 paulus Exp $";

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -96,8 +96,7 @@ static struct wordlist *addresses[NUM_PPP];
 #define CHAP_WITHPEER  4
 #define CHAP_PEER      8
 
 #define CHAP_WITHPEER  4
 #define CHAP_PEER      8
 

-/* Prototypes */
-void check_access __P((FILE *, char *));
+/* Prototypes for procedures local to this file. */

 
 static void network_phase __P((int));
 static int  login __P((char *, char *, char **, int *));
 
 static void network_phase __P((int));
 static int  login __P((char *, char *, char **, int *));


@@ -392,7 +391,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen)
     f = fopen(filename, "r");
     if (f == NULL) {
        if (!uselogin) {
     f = fopen(filename, "r");
     if (f == NULL) {
        if (!uselogin) {

-           syslog(LOG_ERR, "Can't open upap password file %s: %m", filename);
+           syslog(LOG_ERR, "Can't open PAP password file %s: %m", filename);

            ret = UPAP_AUTHNAK;
        }
 
            ret = UPAP_AUTHNAK;
        }
 


@@ -401,7 +400,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen)
        if (scan_authfile(f, user, our_name, secret, &addrs, filename) < 0
            || (secret[0] != 0 && (cryptpap || strcmp(passwd, secret) != 0)
                && strcmp(crypt(passwd, secret), secret) != 0)) {
        if (scan_authfile(f, user, our_name, secret, &addrs, filename) < 0
            || (secret[0] != 0 && (cryptpap || strcmp(passwd, secret) != 0)
                && strcmp(crypt(passwd, secret), secret) != 0)) {

-           syslog(LOG_WARNING, "upap authentication failure for %s", user);
+           syslog(LOG_WARNING, "PAP authentication failure for %s", user);

            ret = UPAP_AUTHNAK;
        }
        fclose(f);
            ret = UPAP_AUTHNAK;
        }
        fclose(f);


@@ -410,7 +409,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen)
     if (uselogin && ret == UPAP_AUTHACK) {
        ret = login(user, passwd, msg, msglen);
        if (ret == UPAP_AUTHNAK) {
     if (uselogin && ret == UPAP_AUTHACK) {
        ret = login(user, passwd, msg, msglen);
        if (ret == UPAP_AUTHNAK) {

-           syslog(LOG_WARNING, "upap login failure for %s", user);
+           syslog(LOG_WARNING, "PAP login failure for %s", user);

        }
     }
 
        }
     }