diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-21 03:08:14 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-21 03:08:14 +0100 |
| commit | 2e7a6cb6bf32a49682ccadc07244d3a6ae4058d3 (patch) | |
| tree | 1025e2107efd63e6468b3c81c291aaf7d5c11251 /source4/scripting/python/samba/samdb.py | |
| parent | bd41b4579c26f40f55811b332874ddeca3478e24 (diff) | |
| download | samba-2e7a6cb6bf32a49682ccadc07244d3a6ae4058d3.tar.gz samba-2e7a6cb6bf32a49682ccadc07244d3a6ae4058d3.tar.xz samba-2e7a6cb6bf32a49682ccadc07244d3a6ae4058d3.zip | |
py: Fix initialisation of subtypes, fix segfaults.
Diffstat (limited to 'source4/scripting/python/samba/samdb.py')
| -rw-r--r-- | source4/scripting/python/samba/samdb.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py index 4a64c2f76d..92b0bd7b89 100644 --- a/source4/scripting/python/samba/samdb.py +++ b/source4/scripting/python/samba/samdb.py @@ -23,7 +23,7 @@ """Convenience functions for using the SAM.""" import samba -import misc +import glue import ldb from samba.idmap import IDmapDB import pwd @@ -43,14 +43,14 @@ class SamDB(samba.Ldb): self.lp = lp super(SamDB, self).__init__(session_info=session_info, credentials=credentials, modules_dir=modules_dir, lp=lp) - assert misc.dsdb_set_global_schema(self) == 0 + glue.dsdb_set_global_schema(self) if url: self.connect(url) else: self.connect(lp.get("sam database")) def connect(self, url): - super(SamDB, self).connect(misc.private_path(self.lp, url)) + super(SamDB, self).connect(self.lp.private_path(url)) def add_foreign(self, domaindn, sid, desc): """Add a foreign security principle.""" @@ -182,17 +182,17 @@ userPassword: %s :param sid: The new domain sid to use. """ - misc.samdb_set_domain_sid(self, sid) + glue.samdb_set_domain_sid(self, sid) def attach_schema_from_ldif(self, pf, df): - misc.dsdb_attach_schema_from_ldif_file(self, pf, df) + glue.dsdb_attach_schema_from_ldif_file(self, pf, df) def set_invocation_id(self, invocation_id): """Set the invocation id for this SamDB handle. :param invocation_id: GUID of the invocation id. """ - misc.dsdb_set_ntds_invocation_id(self, invocation_id) + glue.dsdb_set_ntds_invocation_id(self, invocation_id) def setexpiry(self, user, expiry_seconds, noexpiry): """Set the password expiry for a user @@ -212,7 +212,7 @@ userPassword: %s accountExpires = 0 else: userAccountControl = userAccountControl & ~0x10000 - accountExpires = misc.unix2nttime(expiry_seconds + int(time.time())) + accountExpires = glue.unix2nttime(expiry_seconds + int(time.time())) mod = """ dn: %s |