[patch] proftpd.initd patch (against proftpd.initd)

proftpd.initd.patch (text/plain), 1.28 KB, created by Bernd Lommerzheim on 2010-11-03 21:03:44 UTC

--- /usr/portage/net-ftp/proftpd/files/proftpd.initd
+++ /usr/local/overlay/net-ftp/proftpd/files/proftpd.initd
@@ -16,13 +16,13 @@
 		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 @@
 }
 
 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 $?
 }