summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2020-11-10 11:12:13 +1300
committerGary Lockyer <gary@samba.org>2020-11-11 01:15:39 +0000
commitd85e71f449037fa035fa2fae6b64caf695c53cb3 (patch)
treeff17efb95769db8709db10caeac9580cb9f7a991 /python
parent579a3c641c72b65f6ba39141a55c765b517bd7f8 (diff)
downloadsamba-d85e71f449037fa035fa2fae6b64caf695c53cb3.tar.gz
selftest: Make as_canonicalization_tests.py easier to run outside "make test"
This takes the realm from the LDAP base DN and so avoids one easy mistake to make. So far the NT4 domain name is not auto-detected, so much be read from the smb.conf. By using .guess() the smb.conf is read for the unspecified parts (eg workstation for an NTLM login to the LDAP server if the target server is an IP address). Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Diffstat (limited to 'python')
-rwxr-xr-xpython/samba/tests/krb5/as_canonicalization_tests.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/python/samba/tests/krb5/as_canonicalization_tests.py b/python/samba/tests/krb5/as_canonicalization_tests.py
index 7cdf614482e..c0c3208d216 100755
--- a/python/samba/tests/krb5/as_canonicalization_tests.py
+++ b/python/samba/tests/krb5/as_canonicalization_tests.py
@@ -185,14 +185,20 @@ class KerberosASCanonicalizationTests(RawKerberosTest):
cls.username = os.environ["USERNAME"]
cls.password = os.environ["PASSWORD"]
cls.domain = os.environ["DOMAIN"]
- cls.realm = os.environ["REALM"]
cls.host = os.environ["SERVER"]
c = Credentials()
c.set_username(cls.username)
c.set_password(cls.password)
c.set_domain(cls.domain)
- c.set_realm(cls.realm)
+ try:
+ realm = os.environ["REALM"]
+ c.set_realm(realm)
+ except KeyError:
+ pass
+
+ c.guess()
+
cls.credentials = c
cls.session = system_session()
@@ -236,6 +242,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_password(cls.user_pass)
cls.user_creds.set_username(cls.user_name)
cls.user_creds.set_workstation(cls.machine_name)
@@ -263,6 +270,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_secure_channel_type(SEC_CHAN_WKSTA)
cls.machine_creds.set_kerberos_state(DONT_USE_KERBEROS)
cls.machine_creds.set_password(cls.machine_pass)