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

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-28 16:25:20 +0000 (Fri, 28 Dec 2007)
New Revision: 26623

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

Log:
python: Allow specifying URL rather than host name on the command-line.

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-28 16:25:17 UTC (rev 26622)
+++ branches/SAMBA_4_0/source/lib/ldb/tests/python/ldap.py	2007-12-28 16:25:20 UTC (rev 26623)
@@ -955,8 +955,10 @@
     assertEquals(len(res), 1)
     return res[0].schemaNamingContext
 
+if not "://" in host:
+    host = "ldap://%s" % host
 
-ldb = Ldb("ldap://%s" % host, credentials=creds, session_info=system_session(), 
+ldb = Ldb(host, credentials=creds, session_info=system_session(), 
           lp=lp)
 base_dn = find_basedn(ldb)
 
@@ -965,7 +967,7 @@
 
 print "baseDN: %s\n" % base_dn
 
-gc_ldb = Ldb("ldap://%s:3268" % host, credentials=creds, 
+gc_ldb = Ldb("%s:3268" % host, credentials=creds, 
              session_info=system_session(), lp=lp)
 
 basic_tests(ldb, gc_ldb, base_dn, configuration_dn, schema_dn)