BUG 891 & 949: Fedora Packaging Fixes

(This used to be commit a7d0aec2b7ef132b5c631cb26d0a93dd66d0fff3)

diff --git a/packaging/Fedora/samba.spec.tmpl b/packaging/Fedora/samba.spec.tmpl
index ec50cc705b4894b254fb9a86b4bb7771b6c2d751..90abadce5870afb947e8634e0e9b349188a584d2 100644 (file)
--- a/packaging/Fedora/samba.spec.tmpl
+++ b/packaging/Fedora/samba.spec.tmpl
@@ -214,6 +214,13 @@ if [ "$1" -ge "1" ]; then
        %{initdir}/smb condrestart >/dev/null 2>&1
 fi     
 
+
+%post swat
+# Add swat entry to /etc/services if not already there.
+if [ ! "`grep ^\s**swat /etc/services`" ]; then
+        echo 'swat        901/tcp     # Add swat service used via inetd' >> /etc/services
+fi
+
 %post common
 /sbin/chkconfig --add winbind
 /sbin/ldconfig

diff --git a/packaging/Fedora/smb.init b/packaging/Fedora/smb.init
index fca823a06424c60c1754a133166c698ba798e19a..4182c134085e61508a5616f81fa3b085b483dd58 100644 (file)
--- a/packaging/Fedora/smb.init
+++ b/packaging/Fedora/smb.init
@@ -60,14 +60,16 @@ start() {
 stop() {
         KIND="SMB"
        echo -n $"Shutting down $KIND services: "
-       killproc smbd
+       killproc smbd -TERM
        RETVAL=$?
+       [ $RETVAL -eq 0 ] && rm -f /var/run/smbd.pid
        echo
        KIND="NMB"
        echo -n $"Shutting down $KIND services: "
-       killproc nmbd
+       killproc nmbd -TERM
        RETVAL2=$?
-       [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb
+       [ $RETVAL -eq 0 ] && rm -f /var/run/nmbd.pid
+       [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb 
        echo ""
        return $RETVAL
 }      

diff --git a/packaging/Fedora/winbind.init b/packaging/Fedora/winbind.init
index ced81135b27fe8619eede8479c5077ab3fbcca12..05e0eb4d006feda12eed409e060b4af89c5621f6 100644 (file)
--- a/packaging/Fedora/winbind.init
+++ b/packaging/Fedora/winbind.init
@@ -49,9 +49,11 @@ stop() {
         echo
        KIND="Winbind"
        echo -n $"Shutting down $KIND services: "
-       killproc winbindd
+       killproc winbindd -TERM
        RETVAL=$?
-       [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/winbindd
+       [ $RETVAL -eq 0 ] \
+               && && rm -f /var/run/nmbd.pid \ 
+               && rm -f /var/lock/subsys/winbindd
        echo ""
        return $RETVAL
 }