diff options
author | Gerald Carter <jerry@samba.org> | 2006-06-29 15:52:19 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2006-06-29 15:52:19 +0000 |
commit | c01cc085bfae23a916b2282f3a1d41008af1f87c (patch) | |
tree | 3eb8ab8af8efbbbc1c7daca9d7b2364b1a5fbf9e /packaging | |
parent | 9c1fcd54881669cbe08f12f0216d8df1fec8879b (diff) | |
download | samba-c01cc085bfae23a916b2282f3a1d41008af1f87c.tar.gz samba-c01cc085bfae23a916b2282f3a1d41008af1f87c.tar.xz samba-c01cc085bfae23a916b2282f3a1d41008af1f87c.zip |
r16674: After removing each individual post-3.0.23rc3 change:
This pulls is what I considered safe fixes from SAMBA_3_0.
This boiled down to either Klocwork fixes or obvious compiler
warning fixes. I did not include any changes to fnuction
signatures not the version change to the passdb API.
Also pulled in the 3 nmbd fixes requested by Jeremy
and the wildcard delete fix.
This code will sit for a few days in the cooker and then
become 3.0.23 if nothing blows up. I don't care how many
more compile warning fixes people throw into SAMBA_3_0.
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/RHEL/setup/smb.init | 4 | ||||
-rw-r--r-- | packaging/RHEL/setup/winbind.init | 2 | ||||
-rwxr-xr-x | packaging/RedHat-9/smb.init | 11 |
3 files changed, 5 insertions, 12 deletions
diff --git a/packaging/RHEL/setup/smb.init b/packaging/RHEL/setup/smb.init index 30d7d403dd9..af85b2c079a 100644 --- a/packaging/RHEL/setup/smb.init +++ b/packaging/RHEL/setup/smb.init @@ -71,14 +71,14 @@ start() { stop() { KIND="SMB" echo -n $"Shutting down $KIND services: " - killproc smbd -TERM + killproc smbd RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/run/smbd.pid echo KIND="NMB" if [ x"$ISNETBIOSDISABLED" != x"Yes" ]; then echo -n $"Shutting down $KIND services: " - killproc nmbd -TERM + killproc nmbd RETVAL2=$? [ $RETVAL2 -eq 0 ] && rm -f /var/run/nmbd.pid [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb diff --git a/packaging/RHEL/setup/winbind.init b/packaging/RHEL/setup/winbind.init index e778e61e9cf..a99038f9c71 100644 --- a/packaging/RHEL/setup/winbind.init +++ b/packaging/RHEL/setup/winbind.init @@ -49,7 +49,7 @@ stop() { echo KIND="Winbind" echo -n $"Shutting down $KIND services: " - killproc winbindd -TERM + killproc winbindd RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/run/winbindd.pid && rm -f /var/lock/subsys/winbindd echo "" diff --git a/packaging/RedHat-9/smb.init b/packaging/RedHat-9/smb.init index 79f4f322d03..9b45ebabb34 100755 --- a/packaging/RedHat-9/smb.init +++ b/packaging/RedHat-9/smb.init @@ -30,15 +30,8 @@ case "$1" in stop) echo -n "Shutting down SMB services: " - ## we have to get all the smbd process here instead of just the - ## main parent (i.e. killproc) because it can take a long time - ## for an individual process to process a TERM signal - smbdpids=`ps guax | grep smbd | grep -v grep | awk '{print $2}'` - for pid in $smbdpids; do - kill -TERM $pid - done - ## nmbd is ok to kill using killproc() - killproc nmbd -TERM + killproc smbd + killproc nmbd rm -f /var/lock/subsys/smb echo "" ;; |