[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-131-g22c4ffa

[Andrew Bartlett]

The branch, master has been updated
       via  22c4ffa398a4c4855f79c36e75fdf467cdd47184 (commit)
      from  a11bb148f7cdef7ec58ca79393938e7085f5b540 (commit)

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


- Log -----------------------------------------------------------------
commit 22c4ffa398a4c4855f79c36e75fdf467cdd47184
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Sep 10 12:25:25 2009 +1000

    s4:provision Don't reference provision_backend when using LDB
    
    This broke in Endi's patch for Fedora DS support
    
    Andrew Bartlett

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

Summary of changes:
 source4/scripting/python/samba/provision.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index e12d639..dafccb3 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1093,6 +1093,7 @@ def provision(setup_dir, message, session_info,
     schema = Schema(setup_path, schemadn=names.schemadn, serverdn=names.serverdn,
         sambadn=names.sambadn, ldap_backend_type=ldap_backend_type)
     
+    secrets_credentials = credentials
     provision_backend = None
     if ldap_backend_type:
         # We only support an LDAP backend over ldapi://
@@ -1112,6 +1113,7 @@ def provision(setup_dir, message, session_info,
 
         # Now use the backend credentials to access the databases
         credentials = provision_backend.credentials
+        secrets_credentials = provision_backend.adminCredentials
 
     # only install a new shares config db if there is none
     if not os.path.exists(paths.shareconf):
@@ -1124,7 +1126,7 @@ def provision(setup_dir, message, session_info,
     message("Setting up secrets.ldb")
     secrets_ldb = setup_secretsdb(paths.secrets, setup_path, 
                                   session_info=session_info, 
-                                  credentials=provision_backend.adminCredentials, lp=lp)
+                                  credentials=secrets_credentials, lp=lp)
 
     message("Setting up the registry")
     setup_registry(paths.hklm, setup_path, session_info, 


-- 
Samba Shared Repository