init.d script now checks for listen=YES or listen_ipv6=YES - fixes #54228

xinetd USE flag added to make support of it optional - fixes #75892
USERID removed from xinetd files - fixes #78764
init.d script now does a "killall vsftpd" when stopping - fixes #81819
cleaner ebuild - fixes #84733
(Portage version: 2.0.51.19)

5 files changed, 26 insertions, 16 deletions

diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.3 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.3
new file mode 100644
index 000000000000..24cabb401608
--- /dev/null
+++ b/net-ftp/vsftpd/files/digest-vsftpd-2.0.3
@@ -0,0 +1 @@
+MD5 74936cbd8e8251deb1cd99c5fb18b6f8 vsftpd-2.0.3.tar.gz 153266
diff --git a/net-ftp/vsftpd/files/vsftpd.init.d b/net-ftp/vsftpd/files/vsftpd.init.d
index 5f1c4ca527e9..26c650492e7f 100644
--- a/net-ftp/vsftpd/files/vsftpd.init.d
+++ b/net-ftp/vsftpd/files/vsftpd.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 2003-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init.d,v 1.4 2004/10/01 03:16:13 jforman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init.d,v 1.5 2005/06/07 18:34:17 uberlord Exp $
 
 depend() {
 	need net
@@ -9,29 +9,33 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -e ${VSFTPD_CONF} ] ; then
+	if [[ ! -e ${VSFTPD_CONF} ]] ; then
 		eerror "Please setup ${VSFTPD_CONF} before starting vsftpd"
 		eerror "There are sample configurations in /usr/share/doc/vsftpd"
 		return 1
-	else
-		( grep -q "^background=YES" ${VSFTPD_CONF}  && grep -q "^listen=YES" ${VSFTPD_CONF} )  || {
-		eerror "${VSFTPD_CONF} must contain background=YES and listen=YES"
-		eerror "in order to start vsftpd from /etc/init.d/vsftpd"
-		return 2
-	}
 	fi
+
+	if grep -q "^background=YES" ${VSFTPD_CONF} ; then
+		local c=$( grep -c "^\(listen\|listen_ipv6\)=YES" "${VSFTPD_CONF}" )
+		[[ ${c} == "1" ]] && return 0
+	fi
+		
+	eerror "${VSFTPD_CONF} must contain background=YES and either"
+	eerror "listen=YES or listen_ipv6=YES (but not both)"
+	eerror "in order to start vsftpd from /etc/init.d/vsftpd"
+	return 1
 }
 
 start() {
 	checkconfig || return 1
 	ebegin "Starting vsftpd"
-	start-stop-daemon --start --quiet \
+	start-stop-daemon --start \
 		--exec /usr/sbin/vsftpd ${VSFTPD_CONF}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping vsftpd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/vsftpd
+	killall vsftpd
 	eend $?
 }
diff --git a/net-ftp/vsftpd/files/vsftpd.pam-include b/net-ftp/vsftpd/files/vsftpd.pam-include
new file mode 100644
index 000000000000..8ecb27573e61
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd.pam-include
@@ -0,0 +1,7 @@
+#%PAM-1.0
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.pam-include,v 1.1 2005/06/07 18:34:17 uberlord Exp $
+auth     required	pam_listfile.so item=user sense=deny file=/etc/vsftpd/ftpusers onerr=succeed
+auth     include	system-auth
+auth     required	pam_shells.so
+account  include	system-auth
+session  include	system-auth
diff --git a/net-ftp/vsftpd/files/vsftpd.xinetd b/net-ftp/vsftpd/files/vsftpd.xinetd
index 59dcf3ca6347..d1d88e93daae 100644
--- a/net-ftp/vsftpd/files/vsftpd.xinetd
+++ b/net-ftp/vsftpd/files/vsftpd.xinetd
@@ -1,6 +1,6 @@
 # default: off
 # description: Vsftpd is an FTP server, designed to be secure.
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.xinetd,v 1.3 2004/07/18 03:56:09 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.xinetd,v 1.4 2005/06/07 18:34:17 uberlord Exp $
 
 service ftp
 {
@@ -9,8 +9,7 @@ service ftp
 	user            = root
 	server          = /usr/sbin/vsftpd
 	server_args     = /etc/vsftpd/vsftpd.conf
-	log_on_success  += DURATION USERID
-	log_on_failure  += USERID
+	log_on_success  += DURATION 
 	nice            = 10
 	disable         = yes
 }
diff --git a/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6 b/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6
index 3fabd5dbdcd0..0d294a72f8db 100644
--- a/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6
+++ b/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6
@@ -1,6 +1,6 @@
 # default: off
 # description: Vsftpd is an FTP server, designed to be secure.
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6,v 1.2 2004/07/18 03:56:09 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6,v 1.3 2005/06/07 18:34:17 uberlord Exp $
 
 service ftp
 {
@@ -9,8 +9,7 @@ service ftp
 	user            = root
 	server          = /usr/sbin/vsftpd
 	server_args     = /etc/vsftpd/vsftpd.conf
-	log_on_success  += DURATION USERID
-	log_on_failure  += USERID
+	log_on_success  += DURATION
 	nice            = 10
 	disable         = yes
 	flags		= IPv6