summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-12-08 16:27:38 +1100
committerAndrew Bartlett <abartlet@samba.org>2010-12-08 09:39:06 +0100
commit8dd3013208ae02ee4365cd36f0c4688bdc6b46a2 (patch)
tree8bd801c9cb1e845ed6afea7cc74830bb8b4b7b28 /source4/scripting
parent94f4929e04ce4357e3c74b6a14a4b8fccde30fda (diff)
downloadsamba-8dd3013208ae02ee4365cd36f0c4688bdc6b46a2.tar.gz
samba-8dd3013208ae02ee4365cd36f0c4688bdc6b46a2.tar.bz2
samba-8dd3013208ae02ee4365cd36f0c4688bdc6b46a2.zip
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 <tridge@samba.org> Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Wed Dec 8 09:39:06 CET 2010 on sn-devel-104
Diffstat (limited to 'source4/scripting')
-rwxr-xr-xsource4/scripting/bin/samba_dnsupdate5
1 files changed, 3 insertions, 2 deletions
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: