Suggested by: David Nugent

Use /etc/ppp/ppp.deny instead of /etc/ppp/ppp.disabled

3 files changed, 10 insertions, 10 deletions

diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index 56fbd28..42e23f3 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: auth.c,v 1.13 1997/04/13 01:06:56 brian Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.14 1997/04/15 07:00:32 danny Exp $";
 #endif
 
 #include <stdio.h>
@@ -536,14 +536,14 @@ ppplogin(user, passwd, msg, msglen)
     }
 
 /*
- * Check that the user is not listed in /etc/ppp/ppp.disabled
+ * Check that the user is not listed in /etc/ppp/ppp.deny
  * and that the user's shell is listed in /etc/ppp/ppp.shells
  * if /etc/ppp/ppp.shells exists.
  */
 
-    if (checkfile(_PATH_PPPDISABLED, user) == 1) {
-	    	syslog(LOG_WARNING, "upap user %s: account disabled in %s",
-			user, _PATH_PPPDISABLED);
+    if (checkfile(_PATH_PPPDENY, user) == 1) {
+	    	syslog(LOG_WARNING, "upap user %s: login denied in %s",
+			user, _PATH_PPPDENY);
 		return (UPAP_AUTHNAK);
     }
 
diff --git a/usr.sbin/pppd/pathnames.h b/usr.sbin/pppd/pathnames.h
index 7033ff0..c06aad8 100644
--- a/usr.sbin/pppd/pathnames.h
+++ b/usr.sbin/pppd/pathnames.h
@@ -1,7 +1,7 @@
 /*
  * define path names
  *
- * $Id: pathnames.h,v 1.5 1997/02/22 16:11:52 peter Exp $
+ * $Id: pathnames.h,v 1.6 1997/04/15 07:00:34 danny Exp $
  */
 
 #ifdef HAVE_PATHS_H
@@ -20,6 +20,6 @@
 #define _PATH_TTYOPT	"/etc/ppp/options."
 #define _PATH_CONNERRS	"/etc/ppp/connect-errors"
 #define _PATH_USEROPT	".ppprc"
-#define _PATH_PPPDISABLED  "/etc/ppp/ppp.disabled"
+#define _PATH_PPPDENY  "/etc/ppp/ppp.deny"
 #define _PATH_PPPSHELLS	"/etc/ppp/ppp.shells"
 
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index e0e8bfa..33f72bf 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -1,5 +1,5 @@
 .\" manual page [] for pppd 2.0
-.\" $Id: pppd.8,v 1.10 1997/04/13 01:07:00 brian Exp $
+.\" $Id: pppd.8,v 1.11 1997/04/15 07:00:35 danny Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
@@ -567,7 +567,7 @@ set of IP addresses that each user can use.  Typically, when using the
 avoid the need to have the same secret in two places.
 .LP
 Additional checks are performed when the \fBlogin\fR option is used.  
-If the file /etc/ppp/ppp.disabled exists, and the user is listed in it,
+If the file /etc/ppp/ppp.deny exists, and the user is listed in it,
 the authentication fails.  If the file /etc/ppp/ppp.shells exists and 
 the user's normal login shell is not listed, the authentication fails.
 .LP
@@ -735,7 +735,7 @@ User default options, read before command-line options.
 System default options for the serial port being used, read after
 command-line options.
 .TP
-.B /etc/ppp/ppp.disabled
+.B /etc/ppp/ppp.deny
 Lists users who may not use the system password PAP authentication.
 .TP
 .B /etc/ppp/ppp.shells