[SCM] Samba Shared Repository - branch master updated

[Joseph Sutton]

The branch, master has been updated
       via  36325f1ee90 python:tests: Don't require an emtpy 'authorization-data' to be present
      from  5fa7f73b147 s3: smbd: In setup_close_full_information(), remove unneeded vfs_stat().

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 36325f1ee907d38c978229da67de3844f969cd33
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Dec 16 07:24:58 2021 +0100

    python:tests: Don't require an emtpy 'authorization-data' to be present
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    
    Autobuild-User(master): Joseph Sutton <jsutton at samba.org>
    Autobuild-Date(master): Mon Dec 20 08:26:45 UTC 2021 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 python/samba/tests/krb5/raw_testcase.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index d11f628d7b6..8b6eec3c40d 100644
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -2490,8 +2490,19 @@ class RawKerberosTest(TestCaseInTempDir):
             if self.strict_checking:
                 self.assertElementEqual(ticket_private, 'caddr', [])
             if expect_pac is not None:
-                self.assertElementPresent(ticket_private, 'authorization-data',
-                                          expect_empty=not expect_pac)
+                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))
 
         encpart_session_key = None
         if encpart_private is not None:


-- 
Samba Shared Repository