summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2008-04-18 11:00:43 +0000
committerLuca Longinotti <chtekk@gentoo.org>2008-04-18 11:00:43 +0000
commitd31b88bd21ceedd203aa332f7fe498fca2e00e43 (patch)
treebbd3ccc70c038128cf61388665ad72d9a14c7552 /net-ftp/pure-ftpd/files
parentx86 stable wrt #217529 (diff)
downloadgentoo-2-d31b88bd21ceedd203aa332f7fe498fca2e00e43.tar.gz
gentoo-2-d31b88bd21ceedd203aa332f7fe498fca2e00e43.tar.bz2
gentoo-2-d31b88bd21ceedd203aa332f7fe498fca2e00e43.zip
Remove old version. Fix bugs #173365, #179375 and #182906.
(Portage version: 2.1.5_rc4)
Diffstat (limited to 'net-ftp/pure-ftpd/files')
-rw-r--r--net-ftp/pure-ftpd/files/ftpusers24
-rw-r--r--net-ftp/pure-ftpd/files/pure-ftpd.rc68
2 files changed, 5 insertions, 27 deletions
diff --git a/net-ftp/pure-ftpd/files/ftpusers b/net-ftp/pure-ftpd/files/ftpusers
deleted file mode 100644
index df1b69c0b0ad..000000000000
--- a/net-ftp/pure-ftpd/files/ftpusers
+++ /dev/null
@@ -1,24 +0,0 @@
-# /etc/ftpusers: list of users disallowed FTP access.
-#
-
-daemon
-bin
-sys
-sync
-games
-man
-lp
-mail
-news
-uucp
-proxy
-majordom
-postgres
-www-data
-backup
-msql
-operator
-list
-irc
-nobody
-
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc6 b/net-ftp/pure-ftpd/files/pure-ftpd.rc6
index 86bcae35b2ff..8f1d5f38b28d 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc6
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc6
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc6,v 1.10 2006/09/23 23:12:14 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc6,v 1.11 2008/04/18 11:00:43 chtekk Exp $
depend() {
need net
@@ -17,11 +17,13 @@ checkconfig() {
start() {
checkconfig || return 1
UPSCRIPT=""
+ OKNODO=""
if [ -n "$UPLOADSCRIPT" ] ; then
UPSCRIPT="--uploadscript"
+ OKNODO="--oknodo"
fi
ebegin "Starting Pure-FTPd"
- start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/pure-ftpd.pid --exec /usr/sbin/pure-ftpd -- $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
+ start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/pure-ftpd.pid $OKNODO --exec /usr/sbin/pure-ftpd -- $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
result=$?
if [ $result -ne 0 ] ; then
eend 1 "Could not launch Pure-FTPd"