ports/94818: /etc/rc.subr:1.43 breaks /usr/local/etc/rc.d/samba.sh restart

[Tai-hwa Liang]

>Number:         94818
>Category:       ports
>Synopsis:       /etc/rc.subr:1.43 breaks /usr/local/etc/rc.d/samba.sh restart
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 22 02:20:06 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Tai-hwa Liang
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD 6.1-PRERELEASE
System: FreeBSD 7.0-CURRENT
	
>Description:
	
  Since /etc/rc.subr:1.43, /usr/local/etc/rc.d/samba.sh no longer can
restart all daemons properly.
>How-To-Repeat:
	
  Vanilla samba.sh from ports with latest /etc/rc.subr:

	# /usr/local/etc/rc.d/samba.sh restart
	Stopping /usr/local/sbin/nmbd.
	Starting SAMBA: removing stale tdbs :
	/var/db/samba/messages.tdb
	Starting nmbd.

  With patched samba.sh:

	# /usr/local/etc/rc.d/samba.sh restart
	Stopping /usr/local/sbin/nmbd.
	Starting SAMBA: removing stale tdbs :
	/var/db/samba/connections.tdb
	/var/db/samba/locking.tdb
	/var/db/samba/messages.tdb
	/var/db/samba/sessionid.tdb
	/var/db/samba/brlock.tdb
	Starting nmbd.
	Stopping /usr/local/sbin/smbd.
	Starting smbd.
>Fix:
  Following workaround has been tested on RELENG_6 and HEAD.
Please check and commit it, thanks.

Index: samba.sh.sample
===================================================================
RCS file: /home/ncvs/ports/net/samba3/files/samba.sh.sample,v
retrieving revision 1.12
diff -u -p -r1.12 samba.sh.sample
--- samba.sh.sample	9 Jan 2006 16:45:33 -0000	1.12
+++ samba.sh.sample	22 Mar 2006 01:51:58 -0000
@@ -88,6 +88,7 @@ command_args="-s ${samba_config}"
 
 load_rc_config $name
 run_rc_command "$1"
+_rc_restart_done=false
 
 # smbd
 name=smbd
@@ -103,6 +104,7 @@ command_args="-s ${samba_config}"
 
 load_rc_config $name
 run_rc_command "$1"
+_rc_restart_done=false
 %%WINBIND%%
 %%WINBIND%%# winbindd
 %%WINBIND%%name=winbindd
>Release-Note:
>Audit-Trail:
>Unformatted: