From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Thu, 16 Sep 2021 01:14:06 +0000 (+1200)
Subject: tests/krb5: Allow get_tgt() to specify different kdc-options
X-Git-Tag: ldb-2.5.0~584
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ecfa82e71b0dd5b71aa97973033c5c72257a0c3;p=thirdparty%2Fsamba.git

tests/krb5: Allow get_tgt() to specify different kdc-options

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

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

diff --git a/python/samba/tests/krb5/fast_tests.py b/python/samba/tests/krb5/fast_tests.py
index e5f67ef6c31..02ec7b1beed 100755
--- a/python/samba/tests/krb5/fast_tests.py
+++ b/python/samba/tests/krb5/fast_tests.py
@@ -1573,7 +1573,7 @@ class FAST_Tests(KDCBaseTest):
 
         return service_ticket_creds
 
-    def get_tgt(self, creds, to_rodc=False):
+    def get_tgt(self, creds, to_rodc=False, kdc_options=None):
         user_name = creds.get_username()
         realm = creds.get_realm()
 
@@ -1594,10 +1594,12 @@ class FAST_Tests(KDCBaseTest):
         ticket_decryption_key = (
             self.TicketDecryptionKey_from_creds(krbtgt_creds))
 
-        kdc_options = str(krb5_asn1.KDCOptions('forwardable,'
+        if kdc_options is None:
+            kdc_options = krb5_asn1.KDCOptions('forwardable,'
                                                'renewable,'
                                                'canonicalize,'
-                                               'renewable-ok'))
+                                               'renewable-ok')
+        kdc_options = str(kdc_options)
 
         pac_options = '1'  # supports claims