summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-06-20 01:37:06 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-06-20 01:37:06 +0200
commita5e8ef884b847c5db50431956db0ef5ecc5f77e2 (patch)
tree3cff11fde74c95fd01c1b5bfd976047a9836db79
parent1d86414eb022bd8c4d86bdab094a06f43e4eb10c (diff)
downloadsamba-a5e8ef884b847c5db50431956db0ef5ecc5f77e2.tar.gz
samba-a5e8ef884b847c5db50431956db0ef5ecc5f77e2.tar.bz2
samba-a5e8ef884b847c5db50431956db0ef5ecc5f77e2.zip
Move a few more samdb-specific methods to SamDB, away from Ldb.
-rwxr-xr-xsource4/lib/ldb/tests/python/dsdb_schema_info.py4
-rw-r--r--source4/scripting/python/samba/__init__.py14
2 files changed, 3 insertions, 15 deletions
diff --git a/source4/lib/ldb/tests/python/dsdb_schema_info.py b/source4/lib/ldb/tests/python/dsdb_schema_info.py
index f6e0024b7b..56d9b117ab 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 8f5ff83614..25b8ff9c3d 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