old DLPI doesn't have dl_sap_length

[ppp.git] / pppd / auth.c

diff --git a/pppd/auth.c b/pppd/auth.c
index 5660bcb325247ee8b8356a8ca6c2ff7301e57eac..4ac139de69ef2b11d2190a276374c42ec782320f 100644 (file)
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: auth.c,v 1.13 1995/04/24 06:01:54 paulus Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.19 1995/12/11 05:17:42 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -66,7 +66,7 @@ static char rcsid[] = "$Id: auth.c,v 1.13 1995/04/24 06:01:54 paulus Exp $";
 #include "ccp.h"
 #include "pathnames.h"
 
-#ifdef sparc
+#if defined(sun) && defined(sparc)
 #include <alloca.h>
 #endif /*sparc*/
 
@@ -96,8 +96,7 @@ static struct wordlist *addresses[NUM_PPP];
 #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 *));
@@ -392,16 +391,16 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen)
     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;
        }
 
     } else {
        check_access(f, filename);
        if (scan_authfile(f, user, our_name, secret, &addrs, filename) < 0
-           || (secret[0] != 0 && strcmp(passwd, secret) != 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);
@@ -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) {
-           syslog(LOG_WARNING, "upap login failure for %s", user);
+           syslog(LOG_WARNING, "PAP login failure for %s", user);
        }
     }
 
@@ -492,7 +491,7 @@ login(user, passwd, msg, msglen)
 #ifdef HAS_SHADOW
     if ((pw->pw_passwd && pw->pw_passwd[0] == '@'
         && pw_auth (pw->pw_passwd+1, pw->pw_name, PW_PPP, NULL))
-    || !valid (passwd, pw)) {
+       || !valid (passwd, pw)) {
        return (UPAP_AUTHNAK);
     }
 #else
@@ -507,11 +506,9 @@ login(user, passwd, msg, msglen)
     /*
      * Write a wtmp entry for this user.
      */
-    tty = strrchr(devnam, '/');
-    if (tty == NULL)
-       tty = devnam;
-    else
-       tty++;
+    tty = devnam;
+    if (strncmp(tty, "/dev/", 5) == 0)
+       tty += 5;
     logwtmp(tty, user, "");            /* Add wtmp login entry */
     logged_in = TRUE;
 
@@ -526,11 +523,9 @@ logout()
 {
     char *tty;
 
-    tty = strrchr(devnam, '/');
-    if (tty == NULL)
-       tty = devnam;
-    else
-       tty++;
+    tty = devnam;
+    if (strncmp(tty, "/dev/", 5) == 0)
+       tty += 5;
     logwtmp(tty, "", "");              /* Wipe out wtmp logout entry */
     logged_in = FALSE;
 }