From owner-cvs-ports@FreeBSD.ORG  Fri Apr 13 09:16:00 2012
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6E9EF106566B;
	Fri, 13 Apr 2012 09:16:00 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E46B8FC12;
	Fri, 13 Apr 2012 09:16:00 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q3D9G0OT068976;
	Fri, 13 Apr 2012 09:16:00 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q3D9G0an068975;
	Fri, 13 Apr 2012 09:16:00 GMT (envelope-from dougb)
Message-Id: <201204130916.q3D9G0an068975@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 13 Apr 2012 09:16:00 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/net/samba34 Makefile ports/net/samba34/files
 samba.in ports/net/samba35 Makefile ports/net/samba35/files
 samba.in ports/net/samba36 Makefile ports/net/samba36/files samba.in
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2012 09:16:00 -0000

dougb       2012-04-13 09:16:00 UTC

  FreeBSD ports repository

  Modified files:
    net/samba34          Makefile 
    net/samba34/files    samba.in 
    net/samba35          Makefile 
    net/samba35/files    samba.in 
    net/samba36          Makefile 
    net/samba36/files    samba.in 
  Log:
  The samba rc.d script uses some clever tricks to start (up to) 3 different
  services using the same script. As a result it resets rcvar several times
  in order to process the options for each service.
  
  The changes I made on 2012/01/14 to facilitate the removal of set_rc_var()
  from HEAD were effective in the case where the WINBIND option was off (the
  case that I tested) because that causes the related portions of the rc.d
  script to be removed completely on install. However, if installed from a
  package, or installed using the the default OPTIONS, WINBIND is on, which
  caused the last known rcvar to be winbind_enable.
  
  Since the common case seems to be for users to use samba_enable (which
  only enables smb_and nmb_ by default) the fact that rcvar=winbind_enable,
  but that knob is off, caused the startup script to trip on a totally
  unrelated portion of rc.subr.
  
  So the fix is to move processing of the winbind_ stuff first, which leaves
  the last known rcvar as smb_enable. Since running nmb without smb is a
  very unlikely scenario, this should be safe for the common case, as well
  as safe if the user enables winbind_.
  
  Apologies all around for not catching this sooner, and thanks to the users
  who reported the problem and stuck with me while I debugged it.
  
  Bump PORTREVISION since this fix is needed for the common case, as
  configured for the package.
  
  Revision  Changes    Path
  1.14      +1 -1      ports/net/samba34/Makefile
  1.6       +5 -5      ports/net/samba34/files/samba.in
  1.11      +1 -1      ports/net/samba35/Makefile
  1.3       +5 -5      ports/net/samba35/files/samba.in
  1.6       +1 -1      ports/net/samba36/Makefile
  1.3       +5 -5      ports/net/samba36/files/samba.in