diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-04-07 12:11:12 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-04-07 17:40:00 +0200 |
| commit | c76bd65b608bed0810013b3a447a4a30fbed98bd (patch) | |
| tree | cc8f3fc061366c90d411b9eb0d4e4883f4944658 | |
| parent | feeedf49cfc2edbfdfd0e5512904ea67f2daff11 (diff) | |
| download | samba-c76bd65b608bed0810013b3a447a4a30fbed98bd.tar.gz samba-c76bd65b608bed0810013b3a447a4a30fbed98bd.tar.bz2 samba-c76bd65b608bed0810013b3a447a4a30fbed98bd.zip | |
s4-samdb: Allow skipping global schema.
| -rw-r--r-- | source4/scripting/python/samba/__init__.py | 10 | ||||
| -rw-r--r-- | source4/scripting/python/samba/netcmd/setpassword.py | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/samdb.py | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index 9d0d71101b..fc369290f9 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -266,13 +266,13 @@ class Ldb(_Ldb): :param sid: The new domain sid to use. """ - glue.samdb_set_domain_sid(self, sid) + dsdb.samdb_set_domain_sid(self, sid) def domain_sid(self): """Read the domain SID used by this LDB. """ - glue.samdb_get_domain_sid(self) + dsdb.samdb_get_domain_sid(self) def set_schema_from_ldif(self, pf, df): glue.dsdb_set_schema_from_ldif(self, pf, df) @@ -291,15 +291,15 @@ class Ldb(_Ldb): :param invocation_id: GUID of the invocation id. """ - glue.dsdb_set_ntds_invocation_id(self, invocation_id) + dsdb.dsdb_set_ntds_invocation_id(self, invocation_id) def get_invocation_id(self): "Get the invocation_id id" - return glue.samdb_ntds_invocation_id(self) + return dsdb.samdb_ntds_invocation_id(self) def get_ntds_GUID(self): "Get the NTDS objectGUID" - return glue.samdb_ntds_objectGUID(self) + return dsdb.samdb_ntds_objectGUID(self) def server_site_name(self): "Get the server site name" diff --git a/source4/scripting/python/samba/netcmd/setpassword.py b/source4/scripting/python/samba/netcmd/setpassword.py index 6393e47414..e86711d9ce 100644 --- a/source4/scripting/python/samba/netcmd/setpassword.py +++ b/source4/scripting/python/samba/netcmd/setpassword.py @@ -74,4 +74,4 @@ class cmd_setpassword(Command): credentials=creds, lp=lp) samdb.setpassword(filter, password, - force_password_change_at_next_login_req=must_change_at_next_login) + force_change_at_next_login=must_change_at_next_login) diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py index f584adb515..8d4c3deecd 100644 --- a/source4/scripting/python/samba/samdb.py +++ b/source4/scripting/python/samba/samdb.py @@ -38,7 +38,7 @@ class SamDB(samba.Ldb): """The SAM database.""" def __init__(self, url=None, lp=None, modules_dir=None, session_info=None, - credentials=None, flags=0, options=None): + credentials=None, flags=0, options=None, global_schema=False): self.lp = lp if url is None: url = lp.get("sam database") @@ -47,7 +47,8 @@ class SamDB(samba.Ldb): session_info=session_info, credentials=credentials, flags=flags, options=options) - glue.dsdb_set_global_schema(self) + if global_schema: + glue.dsdb_set_global_schema(self) def connect(self, url=None, flags=0, options=None): super(SamDB, self).connect(url=self.lp.private_path(url), flags=flags, |