summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-12-01 10:07:38 +1100
committerAndrew Tridgell <tridge@samba.org>2010-12-01 16:09:59 +1100
commit4072455c00f183fd50291f1447343e56766793f9 (patch)
tree83991b3dc7b5f7f3866549702c47244987eeab79
parentd48b66e1e8228918ff8a6330da93caeea8bdc762 (diff)
downloadsamba-4072455c00f183fd50291f1447343e56766793f9.tar.gz
samba-4072455c00f183fd50291f1447343e56766793f9.tar.bz2
samba-4072455c00f183fd50291f1447343e56766793f9.zip
wintest Wipe the BIND data directory just before we restart bind
This will hopefully mean we don't end up with stale zone info in the new server. Andrew Bartlett
-rwxr-xr-xwintest/test-s4-howto.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 588fcbe93f..99e11d779c 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -141,8 +141,6 @@ def restart_bind(t):
t.putenv('KEYTAB_FILE', '${PREFIX}/private/dns.keytab')
t.putenv('KRB5_KTNAME', '${PREFIX}/private/dns.keytab')
t.chdir('${PREFIX}')
- t.run_cmd("mkdir -p var/named/data")
- t.run_cmd("chown -R ${BIND_USER} var/named")
nameserver = t.get_nameserver()
if nameserver == t.getvar('INTERFACE_IP'):
@@ -225,6 +223,11 @@ options {
rndc_cmd(t, "stop", checkfail=False)
t.port_wait("${INTERFACE_IP}", 53, wait_for_fail=True)
+
+ t.run_cmd("rm -rf var/named")
+ t.run_cmd("mkdir -p var/named/data")
+ t.run_cmd("chown -R ${BIND_USER} var/named")
+
t.bind_child = t.run_child("${BIND9} -u ${BIND_USER} -n 1 -c ${PREFIX}/etc/named.conf -g")
t.port_wait("${INTERFACE_IP}", 53)