From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Tue, 19 Oct 2021 23:45:47 +0000 (+1300)
Subject: tests/krb5: Fix account salt calculation to match Windows
X-Git-Tag: ldb-2.5.0~365
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25bdf4c994e4fdb74abbacb1e22237f3f2cc37fe;p=thirdparty%2Fsamba.git

tests/krb5: Fix account salt calculation to match Windows

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14874

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index 619a8d006b2..f352615db1f 100644
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -454,13 +454,22 @@ class KerberosCredentials(Credentials):
         if self.forced_salt is not None:
             return self.forced_salt
 
+        upn = self.get_upn()
+        if upn is not None:
+            salt_name = upn.rsplit('@', 1)[0].replace('/', '')
+        else:
+            salt_name = self.get_username()
+
         if self.get_workstation():
+            salt_name = self.get_username().lower()
+            if salt_name[-1] == '$':
+                salt_name = salt_name[:-1]
             salt_string = '%shost%s.%s' % (
                 self.get_realm().upper(),
-                self.get_username().lower().rsplit('$', 1)[0],
+                salt_name,
                 self.get_realm().lower())
         else:
-            salt_string = self.get_realm().upper() + self.get_username()
+            salt_string = self.get_realm().upper() + salt_name
 
         return salt_string.encode('utf-8')