s4-acl: use dnsforest not dnsdomain for GC names

[kai/samba.git] / source4 / dsdb / tests / python / acl.py

diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index 0714178209f3691abbbdd0887215457f3098eabf..22080a3ebe2ee589b2a168a4ce9d3c0537503cc4 100755 (executable)
--- 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: