s4-provision Use correct tkey-gssapi-credential

We changed to ${DNSNAME} (the fully qualified domain name) a while
back, and while it's usually functionally idential to the previous
setting, this breaks down if there is more than one DNS server.

Andrew Bartlett

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 8433f231217bd1b9f18d89df9bbdba4ae01d4bb8..f987fb8ef37a570ac9691a67cd3f4fe2ae8feb9b 100644 (file)
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1749,6 +1749,7 @@ def provision(logger, session_info, credentials, smbconf=None,
 
                 create_named_txt(paths.namedtxt,
                     realm=names.realm, dnsdomain=names.dnsdomain,
+                    dnsname = "%s.%s" % (names.hostname, names.dnsdomain),
                     private_dir=paths.private_dir,
                     keytab_name=paths.dns_keytab)
                 logger.info("See %s for an example configuration include file for BIND", paths.namedconf)
@@ -1985,7 +1986,7 @@ def create_named_conf(paths, realm, dnsdomain,
     setup_file(setup_path("named.conf.update"), paths.namedconf_update)
 
 
-def create_named_txt(path, realm, dnsdomain, private_dir,
+def create_named_txt(path, realm, dnsdomain, dnsname, private_dir,
     keytab_name):
     """Write out a file containing zone statements suitable for inclusion in a
     named.conf file (including GSS-TSIG configuration).
@@ -1998,6 +1999,7 @@ def create_named_txt(path, realm, dnsdomain, private_dir,
     """
     setup_file(setup_path("named.txt"), path, {
             "DNSDOMAIN": dnsdomain,
+            "DNSNAME" : dnsname, 
             "REALM": realm,
             "DNS_KEYTAB": keytab_name,
             "DNS_KEYTAB_ABS": os.path.join(private_dir, keytab_name),

diff --git a/source4/setup/named.txt b/source4/setup/named.txt
index c1e6b3a9ee58f0443be582a039c1e9cb0db44b87..97de69d8ebb49ce56dbbd2356d8f00612bd31eed 100644 (file)
--- a/source4/setup/named.txt
+++ b/source4/setup/named.txt
@@ -5,7 +5,7 @@
 
 # - Insert the following lines into the options {} section of your named.conf
 # file:
-tkey-gssapi-credential "DNS/${DNSDOMAIN}";
+tkey-gssapi-credential "DNS/${DNSNAME}";
 tkey-domain "${REALM}";
 
 # - Modify BIND init scripts to pass the location of the generated keytab file.