From avatar@www.mmlab.cse.yzu.edu.tw  Wed Mar 22 02:13:19 2006
Return-Path: <avatar@www.mmlab.cse.yzu.edu.tw>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BBA1C16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 22 Mar 2006 02:13:19 +0000 (UTC)
	(envelope-from avatar@www.mmlab.cse.yzu.edu.tw)
Received: from www.mmlab.cse.yzu.edu.tw (www.mmlab.cse.yzu.edu.tw [140.138.150.166])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4256E43D66
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 22 Mar 2006 02:13:15 +0000 (GMT)
	(envelope-from avatar@www.mmlab.cse.yzu.edu.tw)
Received: by www.mmlab.cse.yzu.edu.tw (qmail, from userid 1000)
	id 5B9608C9CF1; Wed, 22 Mar 2006 10:13:14 +0800 (CST)
Message-Id: <20060322021314.5B9608C9CF1@www.mmlab.cse.yzu.edu.tw>
Date: Wed, 22 Mar 2006 10:13:14 +0800 (CST)
From: Tai-hwa Liang <avatar@mmlab.cse.yzu.edu.tw>
Reply-To: Tai-hwa Liang <avatar@mmlab.cse.yzu.edu.tw>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: /etc/rc.subr:1.43 breaks /usr/local/etc/rc.d/samba.sh restart
X-Send-Pr-Version: 3.113
X-GNATS-Notify: timur@gnu.org

>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:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 22 02:20:06 GMT 2006
>Closed-Date:    Wed Apr 05 02:01:12 GMT 2006
>Last-Modified:  Wed Apr 05 02:01:12 GMT 2006
>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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Mar 22 02:24:55 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=94818 

From: "Timur I. Bakeyev" <timur@gnu.org>
To: bug-followup@FreeBSD.org,  avatar@mmlab.cse.yzu.edu.tw
Cc:  
Subject: Re: ports/94818: /etc/rc.subr:1.43 breaks /usr/local/etc/rc.d/samba.sh
 restart
Date: Wed, 05 Apr 2006 03:23:31 +0200

 Hi Tai-hwa!
 
 Thanks a lot for the supplied fix!
 
 It looks a bit hackish, as we are using internal variables, but at least 
 'restart' works now. Added to the port update:
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=95325
 
 With best regards,
 Timur.
State-Changed-From-To: feedback->closed 
State-Changed-By: mnag 
State-Changed-When: Wed Apr 5 02:01:10 UTC 2006 
State-Changed-Why:  
This fix are included in 95325. Thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=94818 
>Unformatted:
