diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-26 11:33:49 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-26 03:08:21 +0100 |
| commit | 23bffff98c7d1bd700509bb3fa6eaca3e1524096 (patch) | |
| tree | 243dff0d483fd5f519e53dbd6e30bf832d1d8778 | |
| parent | 9409b73290bdbfc82b75c4af8a22ca1ed6165e2a (diff) | |
| download | samba-23bffff98c7d1bd700509bb3fa6eaca3e1524096.tar.gz samba-23bffff98c7d1bd700509bb3fa6eaca3e1524096.tar.bz2 samba-23bffff98c7d1bd700509bb3fa6eaca3e1524096.zip | |
wintest: fixed "rndc command" option in provision
we need to point at the generated rndc.conf
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rwxr-xr-x | wintest/test-s4-howto.py | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py index a1a211f8ae..0b239f9bc3 100755 --- 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') |