wintest: fixed "rndc command" option in provision

we need to point at the generated rndc.conf

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index a1a211f8ae02d3e638efae56ea20b3b8856ebd66..0b239f9bc305938c239d648f54c6d4adeb805b2e 100755 (executable)
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -35,11 +35,20 @@ def provision_s4(t, func_level="2008"):
     t.chdir('${PREFIX}')
     t.del_files(["var", "private"])
     t.run_cmd("rm -f etc/smb.conf")
-    options=' --function-level=%s -d${DEBUGLEVEL}' % func_level
-    options += ' --option=interfaces="${INTERFACE} ${INTERFACE_IPV6}"'
-    options += ' --host-ip=${INTERFACE_IP} --host-ip6=${INTERFACE_IPV6}'
-    options += ' --option=bindinterfacesonly=yes'
-    t.run_cmd('sbin/provision --realm=${LCREALM} --domain=${DOMAIN} --adminpass=${PASSWORD1} --server-role="domain controller"' + options)
+    provision=['sbin/provision',
+               '--realm=${LCREALM}',
+               '--domain=${DOMAIN}',
+               '--adminpass=${PASSWORD1}',
+               '--server-role=domain controller',
+               '--function-level=%s' % func_level,
+               '-d${DEBUGLEVEL}',
+               '--option=interfaces=${INTERFACE}',
+               '--host-ip=${INTERFACE_IP}',
+               '--option=bind interfaces only=yes',
+               '--option=rndc command=${RNDC} -c${PREFIX}/etc/rndc.conf']
+    if t.getvar('INTERFACE_IPV6'):
+        provision.append('--host-ip6=${INTERFACE_IPV6}')
+    t.run_cmd(provision)
     t.run_cmd('bin/samba-tool newuser testallowed ${PASSWORD1}')
     t.run_cmd('bin/samba-tool newuser testdenied ${PASSWORD1}')
     t.run_cmd('bin/samba-tool group addmembers "Allowed RODC Password Replication Group" testallowed')