summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-09-26 17:39:33 -0700
committerAndrew Tridgell <tridge@samba.org>2010-09-27 01:53:45 +0000
commit93be0d6178f4339f7cc4e004c2abbffef1efdc59 (patch)
treece2f383c39aea6924e636fd2a351ff2359a65d01 /source4
parent1622ad414fa13ab373064935a4cedbb75af870e6 (diff)
downloadsamba-93be0d6178f4339f7cc4e004c2abbffef1efdc59.tar.gz
samba-93be0d6178f4339f7cc4e004c2abbffef1efdc59.tar.bz2
samba-93be0d6178f4339f7cc4e004c2abbffef1efdc59.zip
s4-provision: fixed the generation of the krb5.conf for vampire
we need a correct krb5.conf for nsupdate from bind9
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/provision.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 4b74300f41..9e22d5829b 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1625,12 +1625,6 @@ def provision(setup_dir, logger, session_info,
logger.info("and %s for further documentation required for secure DNS "
"updates", paths.namedtxt)
- create_krb5_conf(paths.krb5conf, setup_path,
- dnsdomain=names.dnsdomain, hostname=names.hostname,
- realm=names.realm)
- logger.info("A Kerberos configuration suitable for Samba 4 has been "
- "generated at %s", paths.krb5conf)
-
lastProvisionUSNs = get_last_provision_usn(samdb)
maxUSN = get_max_usn(samdb, str(names.rootdn))
if lastProvisionUSNs is not None:
@@ -1638,6 +1632,12 @@ def provision(setup_dir, logger, session_info,
else:
set_provision_usn(samdb, 0, maxUSN)
+ create_krb5_conf(paths.krb5conf, setup_path,
+ dnsdomain=names.dnsdomain, hostname=names.hostname,
+ realm=names.realm)
+ logger.info("A Kerberos configuration suitable for Samba 4 has been "
+ "generated at %s", paths.krb5conf)
+
if serverrole == "domain controller":
create_dns_update_list(lp, logger, paths, setup_path)