Update

git-svn-id: file:///svnroot/mailfromd/trunk@798 7a8a7f39-df28-0410-adc6-e0d955640f24

2 files changed, 18 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 921e1427..6714adad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2006-11-06  Sergey Poznyakoff  <gray@gnu.org.ua>
 
+	Release 3.0
+	
 	* doc/mailfromd.texi: Update
+	* etc/rc.in: Update
 
 2006-11-05  Sergey Poznyakoff  <gray@gnu.org.ua>
 
diff --git a/etc/rc.in b/etc/rc.in
index 7aab0332..38aa37fd 100755
--- a/etc/rc.in
+++ b/etc/rc.in
@@ -23,6 +23,13 @@ ARGS=""
 PS="ps axwwww"
 
 mailfromd_start() {
+    if mailfromd_status -q; then
+	cat >&2 <<-EOT
+	Mailfromd seems to be running.
+	Try \`$0 status' to examine, or \`$0 restart' to force restart.
+	EOT
+	exit 1
+    fi
     echo "Starting mailfromd..."
     rm -f $PIDFILE
     if eval $DAEMON $ARGS ; then
@@ -61,13 +68,19 @@ mailfromd_stop() {
     
 mailfromd_status() {
     if [ -r $PIDFILE ]; then
-        echo "mailformd appears to be running at `head -n 1 $PIDFILE`"
+        PID=`head -n 1 $PIDFILE`
+	if [ "$1" != "-q" ]; then
+            echo "mailformd appears to be running at $PID"
+	fi
+    else
+        PID='[0-9][0-9]*'
     fi
     $PS | grep "[0-9]:[0-9][0-9] $DAEMON " |
                 while read pid tt stat time command
                 do
                         echo $pid $command
-                done
+                done |
+		grep $1 "$PID $command"
 }
 
 mailfromd_configtest() {