[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  a40dcd1 s4-dns: use the generated krb5.conf in samba_dnsupdate
       via  93be0d6 s4-provision: fixed the generation of the krb5.conf for vampire
      from  1622ad4 s3-waf: move SERVICES into a subsystem.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a40dcd161c417897c35b46417ea5d103ccd661b9
Author: Andrew Tridgell <tridge at samba.org>
Date:   Sun Sep 26 17:40:05 2010 -0700

    s4-dns: use the generated krb5.conf in samba_dnsupdate
    
    this gives one less thing that an admin can get wrong
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Mon Sep 27 02:35:29 UTC 2010 on sn-devel-104

commit 93be0d6178f4339f7cc4e004c2abbffef1efdc59
Author: Andrew Tridgell <tridge at samba.org>
Date:   Sun Sep 26 17:39:33 2010 -0700

    s4-provision: fixed the generation of the krb5.conf for vampire
    
    we need a correct krb5.conf for nsupdate from bind9

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/bin/samba_dnsupdate       |    5 +++++
 source4/scripting/python/samba/provision.py |   12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index d3abcb1..e2e303c 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -320,6 +320,11 @@ def call_rodc_update(d):
 # get the list of DNS entries we should have
 dns_update_list = lp.private_path('dns_update_list')
 
+# use our private krb5.conf to avoid problems with the wrong domain
+# bind9 nsupdate wants the default domain set
+krb5conf = lp.private_path('krb5.conf')
+os.putenv('KRB5_CONFIG', krb5conf)
+
 file = open(dns_update_list, "r")
 
 # get the substitution dictionary
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 4b74300..9e22d58 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)
 


-- 
Samba Shared Repository