selftest: Allow sites test to run against a remote ldap:// host
authorAndrew Bartlett <abartlet@samba.org>
Wed, 28 Oct 2015 02:26:12 +0000 (15:26 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 24 Dec 2015 03:09:29 +0000 (04:09 +0100)
The previous code was just broken

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
source4/dsdb/tests/python/sites.py

index 912dfc43c26f0615fdedb99c5d9e7309fb777ab9..71725bffa450b68b8a01b956fef3569ef48e8eb6 100755 (executable)
@@ -52,11 +52,8 @@ if len(args) < 1:
 host = args[0]
 if not "://" in host:
     ldaphost = "ldap://%s" % host
-    ldapshost = "ldaps://%s" % host
 else:
     ldaphost = host
-    start = host.rindex("://")
-    host = host.lstrip(start+3)
 
 lp = sambaopts.get_loadparm()
 creds = credopts.get_credentials(lp)
@@ -69,7 +66,7 @@ class SitesBaseTests(samba.tests.TestCase):
 
     def setUp(self):
         super(SitesBaseTests, self).setUp()
-        self.ldb = SamDB(ldapshost, credentials=creds,
+        self.ldb = SamDB(ldaphost, credentials=creds,
                          session_info=system_session(lp), lp=lp)
         self.base_dn = self.ldb.domain_dn()
         self.domain_sid = security.dom_sid(self.ldb.get_domain_sid())