svn commit: samba r26058 - in branches/4.0-python: . source source/scripting/python/samba

[jelmer at samba.org]

Author: jelmer
Date: 2007-11-20 11:40:37 +0000 (Tue, 20 Nov 2007)
New Revision: 26058

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26058

Log:
Reenable kludge-acl, pass credentials/system_session on to ldb.
Modified:
   branches/4.0-python/
   branches/4.0-python/source/BRANCH.TODO
   branches/4.0-python/source/scripting/python/samba/__init__.py
   branches/4.0-python/source/scripting/python/samba/provision.py


Changeset:

Property changes on: branches/4.0-python
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/4.0-python/source/BRANCH.TODO
===================================================================
--- branches/4.0-python/source/BRANCH.TODO	2007-11-20 11:40:34 UTC (rev 26057)
+++ branches/4.0-python/source/BRANCH.TODO	2007-11-20 11:40:37 UTC (rev 26058)
@@ -3,4 +3,4 @@
  - Use NtStatusError, WinError rather than RuntimeError
 - fix web server
 - allow non-top-level modules in build system
-- don't crash when trying to commit a transaction when there is no transaction open
+- ldb: don't crash when trying to commit a transaction when there is no transaction open

Modified: branches/4.0-python/source/scripting/python/samba/__init__.py
===================================================================
--- branches/4.0-python/source/scripting/python/samba/__init__.py	2007-11-20 11:40:34 UTC (rev 26057)
+++ branches/4.0-python/source/scripting/python/samba/__init__.py	2007-11-20 11:40:37 UTC (rev 26058)
@@ -34,6 +34,8 @@
     ret.set_modules_dir(modules_dir)
     def samba_debug(level,text):
         print "%d %s" % (level, text)
+    ret.set_opaque("credentials", credentials)
+    ret.set_opaque("sessionInfo", session_info)
     #ret.set_debug(samba_debug)
     ret.connect(url)
     return ret

Modified: branches/4.0-python/source/scripting/python/samba/provision.py
===================================================================
--- branches/4.0-python/source/scripting/python/samba/provision.py	2007-11-20 11:40:34 UTC (rev 26057)
+++ branches/4.0-python/source/scripting/python/samba/provision.py	2007-11-20 11:40:37 UTC (rev 26058)
@@ -58,17 +58,17 @@
     def subst_vars(self):
         return {"SCHEMADN": self.schemadn,
                 "SCHEMADN_LDB": self.schemadn_ldb,
-                "SCHEMADN_MOD": self.schemadn_mod,
+                "SCHEMADN_MOD": "schema_fsmo",
                 "SCHEMADN_MOD2": ",objectguid",
                 "CONFIGDN": self.configdn,
                 "CONFIGDN_LDB": self.configdn_ldb,
                 "DOMAINDN": self.domaindn,
                 "DOMAINDN_LDB": self.domaindn_ldb,
-                "DOMAINDN_MOD": self.domaindn_mod,
+                "DOMAINDN_MOD": "pdc_fsmo,password_hash",
                 "DOMAINDN_MOD2": ",objectguid",
                 "DOMAINSID": self.domainsid,
                 "MODULES_LIST": ",".join(self.modules_list),
-                "CONFIGDN_MOD": self.configdn_mod,
+                "CONFIGDN_MOD": "naming_fsmo",
                 "CONFIGDN_MOD2": ",objectguid",
                 "NETBIOSNAME": self.netbiosname,
                 "DNSNAME": self.dnsname,
@@ -308,7 +308,6 @@
         ldb.transaction_cancel()
         raise
     ldb.transaction_commit()
-    return ldb
 
 
 def setup_ldb_modify(setup_dir, ldif, subobj, ldb):
@@ -483,7 +482,6 @@
     setup_ldb(setup_dir, "provision_templates.ldif", session_info, credentials, subobj, paths.templates)
 
     message("Setting up sam.ldb partitions")
-    # Also wipes the database
     setup_ldb(setup_dir, "provision_partitions.ldif", session_info, 
               credentials, subobj, paths.samdb)
 
@@ -700,16 +698,13 @@
                     "samldb",
                     "rdn_name",
                     "objectclass",
-                    #FIXME "kludge_acl",
+                    "kludge_acl",
                     "operational",
                     "subtree_rename",
                     "subtree_delete",
                     "linked_attributes",
                     "show_deleted",
                     "partition"]
-    subobj.domaindn_mod = "objectguid"
-    subobj.configdn_mod = "objectguid"
-    subobj.schemadn_mod = "objectguid"
 
     subobj.extensibleobject = "# no objectClass: extensibleObject for local ldb"
     subobj.aci        = "# no aci for local ldb"