svn commit: samba r26617 - in branches/SAMBA_4_0: . source/lib/ldb/tests/python

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-27 23:32:05 +0000 (Thu, 27 Dec 2007)
New Revision: 26617

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26617

Log:
Load smb.conf.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/ldb/tests/python/ldap.py


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/ldb/tests/python/ldap.py
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tests/python/ldap.py	2007-12-27 23:31:59 UTC (rev 26616)
+++ branches/SAMBA_4_0/source/lib/ldb/tests/python/ldap.py	2007-12-27 23:32:05 UTC (rev 26617)
@@ -12,6 +12,7 @@
 
 from auth import system_session
 from samba import Ldb
+import param
 
 parser = optparse.OptionParser("ldap [options] <host>")
 parser.add_option_group(options.SambaOptions(parser))
@@ -28,6 +29,10 @@
 
 host = args[0]
 
+lp = param.LoadParm()
+if opts.configfile:
+    lp.load(opts.configfile)
+
 def assertEquals(a1, a2):
     assert a1 == a2
 
@@ -951,7 +956,8 @@
     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)
 
 configuration_dn = find_configurationdn(ldb)
@@ -960,7 +966,7 @@
 print "baseDN: %s\n" % base_dn
 
 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)
 basedn_tests(ldb, gc_ldb)