diff options
| author |   Jeffrey Forman <jforman@gentoo.org> | 2004-10-01 03:16:13 +0000 |
|---|---|---|
| committer | Jeffrey Forman <jforman@gentoo.org> | 2004-10-01 03:16:13 +0000 |
| commit | 4ef8ac6686702cd99f8046cde14c62bdedc8bf0a (patch) | |
| tree | 654667f7e626d400c107bd3706d57d6105f2331a /net-ftp/vsftpd | |
| parent | bleh, removed wrong ebuild, fix KEYWORDS (Manifest recommit) (diff) | |
| download | gentoo-2-4ef8ac6686702cd99f8046cde14c62bdedc8bf0a.tar.gz gentoo-2-4ef8ac6686702cd99f8046cde14c62bdedc8bf0a.tar.bz2 gentoo-2-4ef8ac6686702cd99f8046cde14c62bdedc8bf0a.zip | |
updated init.d/vsftpd to remove insecure source cmd call, bug 51908
Diffstat (limited to 'net-ftp/vsftpd')
| -rw-r--r-- | net-ftp/vsftpd/ChangeLog | 5 | ||||
| -rw-r--r-- | net-ftp/vsftpd/files/vsftpd.init.d | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog index f92e2446bf93..ed631ad65124 100644 --- a/net-ftp/vsftpd/ChangeLog +++ b/net-ftp/vsftpd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-ftp/vsftpd # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.44 2004/09/29 03:11:23 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.45 2004/10/01 03:16:13 jforman Exp $ + + 30 Sep 2004; Jeffrey Forman <jforman@gentoo.org> files/vsftpd.init.d: + updated init.d/vsftpd to remove source cmd per bug #51908 28 Sep 2004; Tom Gall <tgall@gentoo.org> vsftpd-1.2.2.ebuild, +vsftpd-1.2.2-ppc64.diff: diff --git a/net-ftp/vsftpd/files/vsftpd.init.d b/net-ftp/vsftpd/files/vsftpd.init.d index 3ac01e6a5221..5f1c4ca527e9 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.3 2004/07/14 23:44:02 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init.d,v 1.4 2004/10/01 03:16:13 jforman Exp $ depend() { need net @@ -14,12 +14,11 @@ checkconfig() { eerror "There are sample configurations in /usr/share/doc/vsftpd" return 1 else - source ${VSFTPD_CONF} - if [ "${background}" != "YES" ] || [ "${listen}" != "YES" ] ; then - eerror "${VSFTPD_CONF} must contain background=YES and listen=YES" - eerror "in order to start vsftpd from /etc/init.d/vsftpd" - return 2 - fi + ( 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 } |