diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-06-20 02:32:23 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-20 02:46:57 +0200 |
| commit | 94e06fe2032b0143939abd85044b5c3ccddefe70 (patch) | |
| tree | 887f6600128d3e32de674e60e75ee74bd0262766 /source4/scripting/python/samba/upgradehelpers.py | |
| parent | d3d7ff66d4a7952a50e7d9175528985358cb3522 (diff) | |
| download | samba-94e06fe2032b0143939abd85044b5c3ccddefe70.tar.gz samba-94e06fe2032b0143939abd85044b5c3ccddefe70.tar.xz samba-94e06fe2032b0143939abd85044b5c3ccddefe70.zip | |
Some more formatting fixes, move schema related functions from Ldb to Schema.
Diffstat (limited to 'source4/scripting/python/samba/upgradehelpers.py')
| -rwxr-xr-x | source4/scripting/python/samba/upgradehelpers.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/upgradehelpers.py b/source4/scripting/python/samba/upgradehelpers.py index 5a37dab1088..428d43450f9 100755 --- a/source4/scripting/python/samba/upgradehelpers.py +++ b/source4/scripting/python/samba/upgradehelpers.py @@ -38,6 +38,7 @@ from samba.provision import (ProvisionNames, provision_paths_from_lp, setsysvolacl) from samba.dcerpc import misc, security, xattr from samba.ndr import ndr_unpack +from samba.samdb import SamDB # All the ldb related to registry are commented because the path for them is relative # in the provisionPath object @@ -66,6 +67,7 @@ hashAttrNotCopied = { "dn": 1, "whenCreated": 1, "whenChanged": 1, "sAMAccountType":1 } class ProvisionLDB(object): + def __init__(self): self.sam = None self.secrets = None @@ -155,7 +157,7 @@ def get_ldbs(paths, creds, session, lp): ldbs = ProvisionLDB() - ldbs.sam = Ldb(paths.samdb, session_info=session, credentials=creds, lp=lp, options=["modules:samba_dsdb"]) + ldbs.sam = SamDB(paths.samdb, session_info=session, credentials=creds, lp=lp, options=["modules:samba_dsdb"]) ldbs.secrets = Ldb(paths.secrets, session_info=session, credentials=creds, lp=lp) ldbs.idmap = Ldb(paths.idmapdb, session_info=session, credentials=creds, lp=lp) ldbs.privilege = Ldb(paths.privilege, session_info=session, credentials=creds, lp=lp) |