diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2010-11-16 13:00:29 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2010-11-16 13:00:29 +0000 |
| commit | a4fbf237ceb56def39570bf47320408fb8156ad5 (patch) | |
| tree | 1af69ef85b2d1d58c722a21d0f01d51f8abc3f0b /net-ftp | |
| parent | Drop vulnerable versions, security bug #343389 (diff) | |
| download | gentoo-2-a4fbf237ceb56def39570bf47320408fb8156ad5.tar.gz gentoo-2-a4fbf237ceb56def39570bf47320408fb8156ad5.tar.bz2 gentoo-2-a4fbf237ceb56def39570bf47320408fb8156ad5.zip | |
Really fix init script --quiet reload, patch by Bernd Lommerzheim, bug #314055
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/proftpd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-ftp/proftpd/files/proftpd.initd | 23 |
2 files changed, 15 insertions, 14 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index ec5fd5e91e18..28aeabdf3608 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-ftp/proftpd # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.249 2010/11/16 12:54:15 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.250 2010/11/16 13:00:29 voyageur Exp $ + + 16 Nov 2010; Bernard Cafarelli <voyageur@gentoo.org> files/proftpd.initd: + Really fix init script --quiet reload, patch by Bernd Lommerzheim, bug + #314055 16 Nov 2010; Bernard Cafarelli <voyageur@gentoo.org> -files/proftpd-1.3.2-mysql-include.patch, diff --git a/net-ftp/proftpd/files/proftpd.initd b/net-ftp/proftpd/files/proftpd.initd index d5a0eb79807c..ff03b411488b 100644 --- a/net-ftp/proftpd/files/proftpd.initd +++ b/net-ftp/proftpd/files/proftpd.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.initd,v 1.2 2010/07/29 21:50:32 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.initd,v 1.3 2010/11/16 13:00:29 voyageur Exp $ opts="reload" @@ -16,13 +16,13 @@ check_configuration() { eerror "file. In /etc/proftpd you can find a sample configuration." return 1 fi - /usr/sbin/proftpd -t &>/dev/null - if [ $? -ne 0 ] ; then - eerror "The ProFTPD configuration file /etc/proftpd/proftpd.conf is invalid! You have to" - eerror "fix your configuration in order to run the ProFTPD server. For more information" - eerror "you may execute the ProFTPD configuration check '/usr/sbin/proftpd -t'." - return 2 - fi + /usr/sbin/proftpd -t &>/dev/null + if [ $? -ne 0 ] ; then + eerror "The ProFTPD configuration file /etc/proftpd/proftpd.conf is invalid! You have to" + eerror "fix your configuration in order to run the ProFTPD server. For more information" + eerror "you may execute the ProFTPD configuration check '/usr/sbin/proftpd -t'." + return 2 + fi } start() { @@ -44,12 +44,9 @@ stop() { } reload() { - if [ ! -f /var/run/proftpd/proftpd.pid ] ; then - eerror "ProFTPD is not running." - return 1 - fi check_configuration || return 1 ebegin "Reloading ProFTPD" - kill -HUP `cat /var/run/proftpd/proftpd.pid` &>/dev/null + start-stop-daemon --stop --quiet --signal HUP --oknodo \ + --pidfile /var/run/proftpd/proftpd.pid eend $? } |