X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fauth.c;h=4ac139de69ef2b11d2190a276374c42ec782320f;hp=18f60f0197c850dd4eb245d38f83052cc83ab745;hb=dee72905271845128ad26cff5cf770c433f3f4a7;hpb=728fd83b1728a00b690379006da00a966da1c4fe

diff --git a/pppd/auth.c b/pppd/auth.c
index 18f60f0..4ac139d 100644
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: auth.c,v 1.16 1995/07/04 12:34:17 paulus Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.19 1995/12/11 05:17:42 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -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,7 +391,7 @@ 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;
 	}
 
@@ -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)) {
-	    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);
 	}
     }
 
@@ -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;
 }