diff options
Diffstat (limited to 'Make-timestamp-manipulations-y2038-safe.patch')
| -rw-r--r-- | Make-timestamp-manipulations-y2038-safe.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Make-timestamp-manipulations-y2038-safe.patch b/Make-timestamp-manipulations-y2038-safe.patch index 7c899ad..26bff26 100644 --- a/Make-timestamp-manipulations-y2038-safe.patch +++ b/Make-timestamp-manipulations-y2038-safe.patch @@ -1,4 +1,4 @@ -From 0c0fe06500401d694a4720544c7ed661275d819e Mon Sep 17 00:00:00 2001 +From ac30f4753f157dafe93df2941a216fde591fcb69 Mon Sep 17 00:00:00 2001 From: Greg Hudson <ghudson@mit.edu> Date: Sat, 22 Apr 2017 12:52:17 -0400 Subject: [PATCH] Make timestamp manipulations y2038-safe @@ -766,7 +766,7 @@ index 2dc4d0c1a..bb1072fe4 100644 /* Make an AS request if we have no creds or it's time to refresh them. */ diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c -index 70f7955ae..8e5cc37fb 100644 +index 2a7467f54..1be1b5878 100644 --- a/src/lib/gssapi/krb5/init_sec_context.c +++ b/src/lib/gssapi/krb5/init_sec_context.c @@ -214,7 +214,8 @@ static krb5_error_code get_credentials(context, cred, server, now, @@ -779,7 +779,7 @@ index 70f7955ae..8e5cc37fb 100644 code = KRB5KRB_AP_ERR_TKT_EXPIRED; goto cleanup; } -@@ -575,7 +576,7 @@ kg_new_connection( +@@ -573,7 +574,7 @@ kg_new_connection( if (time_req == 0 || time_req == GSS_C_INDEFINITE) { ctx->krb_times.endtime = 0; } else { @@ -788,7 +788,7 @@ index 70f7955ae..8e5cc37fb 100644 } if ((code = kg_duplicate_name(context, cred->name, &ctx->here))) -@@ -659,7 +660,7 @@ kg_new_connection( +@@ -657,7 +658,7 @@ kg_new_connection( if (time_rec) { if ((code = krb5_timeofday(context, &now))) goto cleanup; @@ -797,7 +797,7 @@ index 70f7955ae..8e5cc37fb 100644 } /* set the other returns */ -@@ -873,7 +874,7 @@ mutual_auth( +@@ -871,7 +872,7 @@ mutual_auth( if (time_rec) { if ((code = krb5_timeofday(context, &now))) goto fail; @@ -879,7 +879,7 @@ index 408b0eb31..1680a5504 100644 time_string = ctime(&until); if (*(ptr = &time_string[strlen(time_string)-1]) == '\n') diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c -index 59ed0b975..656dddff5 100644 +index 3c2844d14..c4bb16dc7 100644 --- a/src/lib/kadm5/srv/server_acl.c +++ b/src/lib/kadm5/srv/server_acl.c @@ -408,13 +408,14 @@ kadm5int_acl_impose_restrictions(kcontext, recp, maskp, rp) @@ -900,7 +900,7 @@ index 59ed0b975..656dddff5 100644 *maskp |= KADM5_PW_EXPIRATION; } diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c -index 0640b47c4..f4a9a2ad2 100644 +index 8f4da0e52..137e1fb64 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -400,7 +400,7 @@ kadm5_create_principal_3(void *server_handle, @@ -948,7 +948,7 @@ index 0640b47c4..f4a9a2ad2 100644 else kdb->pw_expiration = 0; } else { -@@ -2024,7 +2024,7 @@ kadm5_setkey_principal_4(void *server_handle, krb5_principal principal, +@@ -2027,7 +2027,7 @@ kadm5_setkey_principal_4(void *server_handle, krb5_principal principal, } if (have_pol) { if (pol.pw_max_life) @@ -958,10 +958,10 @@ index 0640b47c4..f4a9a2ad2 100644 kdb->pw_expiration = 0; } else { diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c -index 4adf0fcbb..7f33c7e68 100644 +index 690725765..07392572e 100644 --- a/src/lib/kdb/kdb5.c +++ b/src/lib/kdb/kdb5.c -@@ -1296,7 +1296,7 @@ find_actkvno(krb5_actkvno_node *list, krb5_timestamp now) +@@ -1297,7 +1297,7 @@ find_actkvno(krb5_actkvno_node *list, krb5_timestamp now) * are in the future, we will return the first node; if all are in the * past, we will return the last node. */ |