ports/190166: samba41 rc script doesn't follow custom smb.conf

[Harald Schmalzbauer]

>Number:         190166
>Category:       ports
>Synopsis:       samba41 rc script doesn't follow custom smb.conf
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 24 09:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Harald Schmalzbauer
>Release:        FreeBSD 9.2-RELEASE-p4+FP2 amd64
>Organization:
OmniLAN
>Environment:
System: FreeBSD preed.egn.mo1.omnilan.net 9.2-RELEASE-p4+FP2 FreeBSD 9.2-RELEASE-p4+FP2 #1: Wed Apr 23 14:25:13 CEST 2014 admin at preed.egn.mo1.omnilan.net:/usr/local/share/deploy-tools/obj-amd64/UNSPEC/usr/local/share/deploy-tools/RELENG_9_2/src/sys/UNSPEC.preed amd64


	
>Description:
	When you define a custo smb.conf, the testparm_command silently
ignores that file since the parameters are passed wrong, so compile time
default will be used.
>How-To-Repeat:
	Define 'samba_server_config="/usr/local/etc/smb_instance1.conf"'
in /etc/rc.conf and intentionally include a mistake in custom conf file
before starting samba. Samba will start even testparm fisrt should look for
mistakes, but it doesn't check the same config file that will be used by the
daemons (that part is perfectly working in samba_server.in).

>Fix:

--- net/samba41/files/samba_server.in   2014-05-09 12:23:44.635424517 +0200
+++ net/samba41/files/samba_server.in   2014-05-19 10:48:54.257114321 +0200
@@ -33,7 +33,7 @@
 samba_server_config=${samba_server_config=${samba_server_config_default}}
 samba_server_configfile_arg=${samba_server_config:+--configfile="${samba_server_config}"}                      #"
 #testparm_command="%%PREFIX%%/bin/samba-tool testparm --suppress-prompt --verbose ${samba_server_configfile_arg}"
-testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_configfile_arg}"
+testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}"
 smbcontrol_command="%%PREFIX%%/bin/smbcontrol"
 
 # Custom commands
>Release-Note:
>Audit-Trail:
>Unformatted: