]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Revert "python:tests: Don't require an emtpy 'authorization-data' to be present"
authorStefan Metzmacher <metze@samba.org>
Mon, 20 Dec 2021 16:02:12 +0000 (17:02 +0100)
committerStefan Metzmacher <metze@samba.org>
Mon, 20 Dec 2021 16:10:31 +0000 (16:10 +0000)
This reverts commit 36325f1ee907d38c978229da67de3844f969cd33.

This was not the latest version from:
https://gitlab.com/samba-team/samba/-/merge_requests/2304

The correct version follows...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
python/samba/tests/krb5/raw_testcase.py

index 8b6eec3c40d064ece7631172156ac59541519400..d11f628d7b67c6cb922ec815c6acf5f88f8d10dd 100644 (file)
@@ -2490,19 +2490,8 @@ class RawKerberosTest(TestCaseInTempDir):
             if self.strict_checking:
                 self.assertElementEqual(ticket_private, 'caddr', [])
             if expect_pac is not None:
-                if expect_pac:
-                    self.assertElementPresent(ticket_private,
-                                              'authorization-data',
-                                              expect_empty=not expect_pac)
-                else:
-                    # It is more correct to not have an authorization-data
-                    # present than an empty one.
-                    #
-                    # https://github.com/krb5/krb5/pull/1225#issuecomment-995104193
-                    v = self.getElementValue(ticket_private,
-                                             'authorization-data')
-                    if v is not None:
-                        self.assertEqual(0, len(v))
+                self.assertElementPresent(ticket_private, 'authorization-data',
+                                          expect_empty=not expect_pac)
 
         encpart_session_key = None
         if encpart_private is not None: