acl tests: Fix import.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Thu Jan  6 16:07:49 CET 2011 on sn-devel-104

diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index 7e7d8d42bcfb5792c79f852869f4b39d75bfbbfd..d2c411643f9f7155e3c73e9d73bc52599a215d0b 100755 (executable)
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -12,6 +12,7 @@ samba.ensure_external_module("testtools", "testtools")
 samba.ensure_external_module("subunit", "subunit/python")
 
 import samba.getopt as options
+from samba.join import dc_join
 
 from ldb import (
     SCOPE_BASE, SCOPE_SUBTREE, LdbError, ERR_NO_SUCH_OBJECT,
@@ -1561,6 +1562,7 @@ class AclExtendedTests(AclTests):
         self.assertEqual(len(res),1)
         self.assertTrue("nTSecurityDescriptor" in res[0].keys())
 
+
 class AclSPNTests(AclTests):
 
     def setUp(self):
@@ -1572,10 +1574,11 @@ class AclSPNTests(AclTests):
         self.computerdn = "CN=%s,CN=computers,%s" % (self.computername, self.base_dn)
         self.dc_dn = "CN=%s,OU=Domain Controllers,%s" % (self.dcname, self.base_dn)
         self.site = "Default-First-Site-Name"
-        self.rodcctx = samba.join.dc_join(server=host, creds=creds, lp=lp, site=self.site, netbios_name=self.rodcname,
-                                          targetdir=None, domain=None)
-        self.dcctx = samba.join.dc_join(server=host, creds=creds, lp=lp, site=self.site, netbios_name=self.dcname,
-                                        targetdir=None, domain=None)
+        self.rodcctx = dc_join(server=host, creds=creds, lp=lp,
+            site=self.site, netbios_name=self.rodcname, targetdir=None,
+            domain=None)
+        self.dcctx = dc_join(server=host, creds=creds, lp=lp, site=self.site,
+                netbios_name=self.dcname, targetdir=None, domain=None)
         self.ldb_admin.newuser(self.test_user, self.user_pass)
         self.ldb_user1 = self.get_ldb_connection(self.test_user, self.user_pass)
         self.user_sid1 = self.sd_utils.get_object_sid(self.get_user_dn(self.test_user))