From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Tue, 28 Sep 2021 23:06:03 +0000 (+1300)
Subject: tests/krb5: Fix handling authdata with missing PAC
X-Git-Tag: ldb-2.5.0~445
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4bc712ee02f32c2d04dfc2d99d58931344e5ceb;p=thirdparty%2Fsamba.git

tests/krb5: Fix handling authdata with missing PAC

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

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index 4c1aedbca0f..b9895e547c4 100644
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -3200,11 +3200,11 @@ class RawKerberosTest(TestCaseInTempDir):
                 # Get a copy of the authdata with an empty PAC, and the
                 # existing PAC (if present).
                 empty_pac = self.get_empty_pac()
-                empty_pac_auth_data, pac_data = self.replace_pac(auth_data,
-                                                                 empty_pac)
+                empty_pac_auth_data, pac_data = self.replace_pac(
+                    auth_data,
+                    empty_pac,
+                    expect_pac=expect_pac)
 
-                if expect_pac:
-                    self.assertIsNotNone(pac_data)
                 if pac_data is not None:
                     pac = ndr_unpack(krb5pac.PAC_DATA, pac_data)
 
@@ -3234,7 +3234,8 @@ class RawKerberosTest(TestCaseInTempDir):
 
             # Replace the PAC in the authorization data and re-add it to the
             # ticket enc-part.
-            auth_data, _ = self.replace_pac(auth_data, new_pac)
+            auth_data, _ = self.replace_pac(auth_data, new_pac,
+                                            expect_pac=expect_pac)
             enc_part['authorization-data'] = auth_data
 
         # Re-encrypt the ticket enc-part with the new key.