[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-585-g079200b

Jelmer Vernooij jelmer at samba.org
Sat Jan 26 03:24:57 GMT 2008


The branch, v4-0-test has been updated
       via  079200b824de6dd8c7de3e5b76ed1805fde02965 (commit)
      from  41571bbb933c763a9608f4ba56f1a5a97af133ab (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 079200b824de6dd8c7de3e5b76ed1805fde02965
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Jan 26 04:22:42 2008 +0100

    python: Use relative paths for registry.

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

Summary of changes:
 source/scripting/python/samba/provision.py |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py
index f244679..d2a4f28 100644
--- a/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@ -203,7 +203,13 @@ def provision_paths_from_lp(lp, dnsdomain, private_dir=None):
     paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")
     paths.phpldapadminconfig = os.path.join(private_dir, 
                                             "phpldapadmin-config.php")
-    paths.hklm = os.path.join(private_dir, "hklm.ldb")
+    paths.hklm = "hklm.ldb"
+    paths.hkcr = "hkcr.ldb"
+    paths.hkcu = "hkcu.ldb"
+    paths.hku = "hku.ldb"
+    paths.hkpd = "hkpd.ldb"
+    paths.hkpt = "hkpt.ldb"
+
     paths.sysvol = lp.get("sysvol", "path")
     if paths.sysvol is None:
         paths.sysvol = os.path.join(lp.get("lock dir"), "sysvol")
@@ -442,6 +448,7 @@ def setup_registry(path, setup_path, session_info, credentials, lp):
     :param lp: Loadparm context
     """
     reg = registry.Registry()
+    print path
     hive = registry.open_ldb(path, session_info=session_info, 
                          credentials=credentials, lp_ctx=lp)
     reg.mount_hive(hive, "HKEY_LOCAL_MACHINE")


-- 
Samba Shared Repository


More information about the samba-cvs mailing list