From 8dd3013208ae02ee4365cd36f0c4688bdc6b46a2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 8 Dec 2010 16:27:38 +1100 Subject: s4-param Allow +foo syntax in smb.conf list parsing The idea here is to allow an smb.conf file to work from the defaults, rather than override them. For example, 'server services = +openchange'. Pair-Programmed-With: Andrew Tridgell Autobuild-User: Andrew Bartlett Autobuild-Date: Wed Dec 8 09:39:06 CET 2010 on sn-devel-104 --- source4/scripting/bin/samba_dnsupdate | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source4/scripting/bin') diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate index faba124336..cacdc36194 100755 --- a/source4/scripting/bin/samba_dnsupdate +++ b/source4/scripting/bin/samba_dnsupdate @@ -261,8 +261,9 @@ def call_nsupdate(d): os.putenv("KRB5CCNAME", ccachename) try: - cmd = "%s %s" % (nsupdate_cmd, tmpfile) - subprocess.check_call(cmd, shell=True) + cmd = nsupdate_cmd[:] + cmd.append(tmpfile) + subprocess.check_call(cmd, shell=False) except Exception, estr: global error_count if opts.fail_immediately: -- cgit