diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2011-01-06 14:39:46 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2011-01-06 16:07:49 +0100 |
| commit | 4e0d0af9e89e23a5daea8048deff5c9057f08bb9 (patch) | |
| tree | 9739f234a7535b8a1ce6cd6ba60c3df292670ddb /source4/dsdb | |
| parent | b44fe4e3bbf89943041f4d70d75151e582c46600 (diff) | |
| download | samba-4e0d0af9e89e23a5daea8048deff5c9057f08bb9.tar.gz samba-4e0d0af9e89e23a5daea8048deff5c9057f08bb9.tar.xz samba-4e0d0af9e89e23a5daea8048deff5c9057f08bb9.zip | |
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
Diffstat (limited to 'source4/dsdb')
| -rwxr-xr-x | source4/dsdb/tests/python/acl.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py index 7e7d8d42bcf..d2c411643f9 100755 --- 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)) |