mirror of
https://github.com/samba-team/samba.git
synced 2025-12-14 20:23:54 +03:00
r26617: Load smb.conf.
This commit is contained in:
committed by
Stefan Metzmacher
parent
2f33e0451d
commit
3f7bfef195
@@ -12,6 +12,7 @@ import samba.getopt as options
|
|||||||
|
|
||||||
from auth import system_session
|
from auth import system_session
|
||||||
from samba import Ldb
|
from samba import Ldb
|
||||||
|
import param
|
||||||
|
|
||||||
parser = optparse.OptionParser("ldap [options] <host>")
|
parser = optparse.OptionParser("ldap [options] <host>")
|
||||||
parser.add_option_group(options.SambaOptions(parser))
|
parser.add_option_group(options.SambaOptions(parser))
|
||||||
@@ -28,6 +29,10 @@ if len(args) < 1:
|
|||||||
|
|
||||||
host = args[0]
|
host = args[0]
|
||||||
|
|
||||||
|
lp = param.LoadParm()
|
||||||
|
if opts.configfile:
|
||||||
|
lp.load(opts.configfile)
|
||||||
|
|
||||||
def assertEquals(a1, a2):
|
def assertEquals(a1, a2):
|
||||||
assert a1 == a2
|
assert a1 == a2
|
||||||
|
|
||||||
@@ -951,7 +956,8 @@ def find_schemadn(ldb):
|
|||||||
return res[0].schemaNamingContext
|
return res[0].schemaNamingContext
|
||||||
|
|
||||||
|
|
||||||
ldb = Ldb("ldap://%s" % host, credentials=creds, session_info=system_session())
|
ldb = Ldb("ldap://%s" % host, credentials=creds, session_info=system_session(),
|
||||||
|
lp=lp)
|
||||||
base_dn = find_basedn(ldb)
|
base_dn = find_basedn(ldb)
|
||||||
|
|
||||||
configuration_dn = find_configurationdn(ldb)
|
configuration_dn = find_configurationdn(ldb)
|
||||||
@@ -960,7 +966,7 @@ schema_dn = find_schemadn(ldb)
|
|||||||
print "baseDN: %s\n" % base_dn
|
print "baseDN: %s\n" % base_dn
|
||||||
|
|
||||||
gc_ldb = Ldb("ldap://%s:3268" % host, credentials=creds,
|
gc_ldb = Ldb("ldap://%s:3268" % host, credentials=creds,
|
||||||
session_info=system_session())
|
session_info=system_session(), lp=lp)
|
||||||
|
|
||||||
basic_tests(ldb, gc_ldb, base_dn, configuration_dn, schema_dn)
|
basic_tests(ldb, gc_ldb, base_dn, configuration_dn, schema_dn)
|
||||||
basedn_tests(ldb, gc_ldb)
|
basedn_tests(ldb, gc_ldb)
|
||||||
|
|||||||
Reference in New Issue
Block a user