DEMONSTRATE S4U2Proxy authtime SERVER=172.31.9.118 DC_SERVER=172.31.9.118 DOMAIN...

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index 1f671f7b6a9bb46b609f2d0374a2fe9a0151d03b..1ce28c0d94b9913cc4a1dded860941c486892db3 100644 (file)
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -2817,6 +2817,7 @@ class RawKerberosTest(TestCase):
                               EncAuthorizationData_key=None,  # optional
                               EncAuthorizationData_usage=None):  # optional
 
+        time.sleep(2)
         check_error_fn = kdc_exchange_dict['check_error_fn']
         check_rep_fn = kdc_exchange_dict['check_rep_fn']
         generate_fast_fn = kdc_exchange_dict['generate_fast_fn']
@@ -2841,7 +2842,12 @@ class RawKerberosTest(TestCase):
         outer_req = kdc_exchange_dict['outer_req']
 
         if till_time is None:
+            till_time = self.get_KerberosTime(offset=3600)
             till_time = self.get_KerberosTime(offset=36000)
+            if req_msg_type == KRB_AS_REQ:
+                till_time = self.get_KerberosTime(offset=3600)
+        if req_msg_type == KRB_AS_REQ:
+            till_time = self.get_KerberosTime(offset=7200)
 
         if 'nonce' in kdc_exchange_dict:
             nonce = kdc_exchange_dict['nonce']

diff --git a/python/samba/tests/krb5/s4u_tests.py b/python/samba/tests/krb5/s4u_tests.py
index 98503a41abe4adf3569cce609e9b5bb787275fec..7c5028107454651751f07cf7ac31d56bf71fdd8a 100755 (executable)
--- a/python/samba/tests/krb5/s4u_tests.py
+++ b/python/samba/tests/krb5/s4u_tests.py
@@ -807,6 +807,7 @@ class S4UKerberosTests(KDCBaseTest):
                                    realm=service2_realm,
                                    sname=service2_sname,
                                    etypes=etypes,
+                                   till_time=self.get_KerberosTime(offset=72000),
                                    additional_tickets=additional_tickets,
                                    EncAuthorizationData=EncAuthorizationData,
                                    EncAuthorizationData_key=EncAuthorizationData_key,