summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-08-22 17:43:56 +1000
committerAndrew Tridgell <tridge@samba.org>2011-08-25 07:39:39 +1000
commit4f421d04064c7f1a3a4052a37c2908a8e5dbeb89 (patch)
tree6cb424bbea8e5d7d2ddac98f99c029332388b1b9 /source4
parent68100e5a21adab26dee367b0742a76b485edc16e (diff)
downloadsamba-4f421d04064c7f1a3a4052a37c2908a8e5dbeb89.tar.gz
samba-4f421d04064c7f1a3a4052a37c2908a8e5dbeb89.tar.bz2
samba-4f421d04064c7f1a3a4052a37c2908a8e5dbeb89.zip
s4-acl: use dnsforest not dnsdomain for GC names
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/dsdb/tests/python/acl.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index 0714178209..22080a3ebe 100755
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -1682,7 +1682,7 @@ class AclSPNTests(AclTests):
self.replace_spn(self.ldb_user1, ctx.acct_dn, "HOST/%s.%s/%s" %
(ctx.myname, ctx.dnsdomain, ctx.dnsdomain))
self.replace_spn(self.ldb_user1, ctx.acct_dn, "GC/%s.%s/%s" %
- (ctx.myname, ctx.dnsdomain, ctx.dnsdomain))
+ (ctx.myname, ctx.dnsdomain, ctx.dnsforest))
self.replace_spn(self.ldb_user1, ctx.acct_dn, "ldap/%s/%s" % (ctx.myname, netbiosdomain))
self.replace_spn(self.ldb_user1, ctx.acct_dn, "ldap/%s.%s/%s" %
(ctx.myname, ctx.dnsdomain, netbiosdomain))
@@ -1741,7 +1741,7 @@ class AclSPNTests(AclTests):
self.replace_spn(self.ldb_admin, self.computerdn, "HOST/%s.%s/%s" %
(self.computername, self.dcctx.dnsdomain, self.dcctx.dnsdomain))
self.replace_spn(self.ldb_admin, self.computerdn, "GC/%s.%s/%s" %
- (self.computername, self.dcctx.dnsdomain, self.dcctx.dnsdomain))
+ (self.computername, self.dcctx.dnsdomain, self.dcctx.dnsforest))
self.replace_spn(self.ldb_admin, self.computerdn, "ldap/%s/%s" % (self.computername, netbiosdomain))
self.replace_spn(self.ldb_admin, self.computerdn, "ldap/%s.%s/ForestDnsZones.%s" %
(self.computername, self.dcctx.dnsdomain, self.dcctx.dnsdomain))
@@ -1805,7 +1805,7 @@ class AclSPNTests(AclTests):
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
try:
self.replace_spn(self.ldb_user1, self.computerdn, "GC/%s.%s/%s" %
- (self.computername, self.dcctx.dnsdomain, self.dcctx.dnsdomain))
+ (self.computername, self.dcctx.dnsdomain, self.dcctx.dnsforest))
except LdbError, (num, _):
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
try: