The branch, master has been updated via a5e8ef8... Move a few more samdb-specific methods to SamDB, away from Ldb. from 1d86414... samdb: Fix formatting, move get_oid_from_attid from Ldb to SamDB.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a5e8ef884b847c5db50431956db0ef5ecc5f77e2 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Jun 20 01:37:06 2010 +0200 Move a few more samdb-specific methods to SamDB, away from Ldb. ----------------------------------------------------------------------- Summary of changes: source4/lib/ldb/tests/python/dsdb_schema_info.py | 4 ++-- source4/scripting/python/samba/__init__.py | 14 +------------- 2 files changed, 3 insertions(+), 15 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/lib/ldb/tests/python/dsdb_schema_info.py b/source4/lib/ldb/tests/python/dsdb_schema_info.py index f6e0024..56d9b11 100755 --- a/source4/lib/ldb/tests/python/dsdb_schema_info.py +++ b/source4/lib/ldb/tests/python/dsdb_schema_info.py @@ -34,7 +34,7 @@ sys.path.append("bin/python") from samba.auth import system_session from ldb import SCOPE_BASE, LdbError -from samba import Ldb +from samba.samdb import SamDB import samba.tests import samba.dcerpc.drsuapi @@ -203,7 +203,7 @@ if not "://" in ldb_url: # user 'paged_search' module when connecting remotely ldb_options = ["modules:paged_searches"] -ldb = Ldb(url=ldb_url, +ldb = SamDB(url=ldb_url, lp=samba.tests.env_loadparm(), session_info=system_session(), credentials=samba.tests.cmdline_credentials, diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index 8f5ff83..25b8ff9 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -105,7 +105,7 @@ class Ldb(_Ldb): if nosync_p is not None and nosync_p == True: flags |= ldb.FLG_NOSYNC - self.set_create_perms() + self.set_create_perms(0600) if url is not None: self.connect(url, flags, options) @@ -289,18 +289,6 @@ class Ldb(_Ldb): def convert_schema_to_openldap(self, target, mapping): return dsdb.dsdb_convert_schema_to_openldap(self, target, mapping) - def get_invocation_id(self): - """Get the invocation_id id""" - return dsdb.samdb_ntds_invocation_id(self) - - def get_ntds_GUID(self): - """Get the NTDS objectGUID""" - return dsdb.samdb_ntds_objectGUID(self) - - def server_site_name(self): - """Get the server site name""" - return dsdb.samdb_server_site_name(self) - def substitute_var(text, values): """Substitute strings of the form ${NAME} in str, replacing -- Samba Shared Repository