mirror of
https://github.com/samba-team/samba.git
synced 2025-08-03 04:22:09 +03:00
Move a few more samdb-specific methods to SamDB, away from Ldb.
This commit is contained in:
@ -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,
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user