Index: ftpd.c
===================================================================
RCS file: /home/ncvs/src/libexec/ftpd/ftpd.c,v
retrieving revision 1.94
diff -u -r1.94 ftpd.c
--- ftpd.c	21 Jan 2002 19:07:15 -0000	1.94
+++ ftpd.c	29 Jan 2002 00:15:59 -0000
@@ -956,7 +956,8 @@
 				break;
 		endusershell();
 
-		if (cp == NULL || checkuser(_PATH_FTPUSERS, name, 1)) {
+		if ((cp == NULL || checkuser(_PATH_FTPUSERS, name, 1)) &&
+		    (!checkuser(_PATH_ALLOWEDUSERS, name, 1))) {
 			reply(530, "User %s access denied.", name);
 			if (logging)
 				syslog(LOG_NOTICE,
Index: pathnames.h
===================================================================
RCS file: /home/ncvs/src/libexec/ftpd/pathnames.h,v
retrieving revision 1.11
diff -u -r1.11 pathnames.h
--- pathnames.h	28 Aug 1999 00:09:31 -0000	1.11
+++ pathnames.h	29 Jan 2002 00:08:18 -0000
@@ -36,6 +36,7 @@
 
 #include <paths.h>
 
+#define	_PATH_ALLOWEDUSERS	"/etc/ftpallowedusers"
 #define	_PATH_FTPCHROOT		"/etc/ftpchroot"
 #define	_PATH_FTPWELCOME	"/etc/ftpwelcome"
 #define	_PATH_FTPLOGINMESG	"/etc/ftpmotd"