From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 10 Nov 2020 00:47:30 +0000 (+1300)
Subject: selftest: Make as_canonicalization_tests.py auto-detect the NT4 domain name
X-Git-Tag: samba-4.14.0rc1~643
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2693f12fbe321e0f4932b1f74d7006dbac140e8e;p=thirdparty%2Fsamba.git

selftest: Make as_canonicalization_tests.py auto-detect the NT4 domain name

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
---

diff --git a/python/samba/tests/krb5/as_canonicalization_tests.py b/python/samba/tests/krb5/as_canonicalization_tests.py
index c0c3208d216..221ff486fd8 100755
--- a/python/samba/tests/krb5/as_canonicalization_tests.py
+++ b/python/samba/tests/krb5/as_canonicalization_tests.py
@@ -184,18 +184,21 @@ class KerberosASCanonicalizationTests(RawKerberosTest):
         cls.lp       = cls.get_loadparm(cls)
         cls.username = os.environ["USERNAME"]
         cls.password = os.environ["PASSWORD"]
-        cls.domain   = os.environ["DOMAIN"]
         cls.host     = os.environ["SERVER"]
 
         c = Credentials()
         c.set_username(cls.username)
         c.set_password(cls.password)
-        c.set_domain(cls.domain)
         try:
             realm    = os.environ["REALM"]
             c.set_realm(realm)
         except KeyError:
             pass
+        try:
+            domain    = os.environ["DOMAIN"]
+            c.set_domain(domain)
+        except KeyError:
+            pass
 
         c.guess()
 
@@ -243,6 +246,7 @@ class KerberosASCanonicalizationTests(RawKerberosTest):
         cls.user_creds = Credentials()
         cls.user_creds.guess(cls.lp)
         cls.user_creds.set_realm(cls.ldb.domain_dns_name().upper())
+        cls.user_creds.set_domain(cls.ldb.domain_netbios_name().upper())
         cls.user_creds.set_password(cls.user_pass)
         cls.user_creds.set_username(cls.user_name)
         cls.user_creds.set_workstation(cls.machine_name)
@@ -271,6 +275,7 @@ class KerberosASCanonicalizationTests(RawKerberosTest):
         cls.machine_creds = Credentials()
         cls.machine_creds.guess(cls.lp)
         cls.machine_creds.set_realm(cls.ldb.domain_dns_name().upper())
+        cls.machine_creds.set_domain(cls.ldb.domain_netbios_name().upper())
         cls.machine_creds.set_secure_channel_type(SEC_CHAN_WKSTA)
         cls.machine_creds.set_kerberos_state(DONT_USE_KERBEROS)
         cls.machine_creds.set_password(cls.machine_pass)