From 0c6ad14521926ba1e9705d3c67b8510de4470c2d Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Tue, 12 Nov 2013 16:20:49 -0500 Subject: [PATCH] Drop patch for RT#7650, included in 1.11.4 --- krb5-master-init_referral.patch | 47 --------------------------------- krb5.spec | 3 +-- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 krb5-master-init_referral.patch diff --git a/krb5-master-init_referral.patch b/krb5-master-init_referral.patch deleted file mode 100644 index ae3d3b8..0000000 --- a/krb5-master-init_referral.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit a12a5ddb9b932061bad7b83df058c7c6e2e4b044 -Author: Greg Hudson -Date: Thu May 30 11:39:54 2013 -0400 - - Properly handle use_master in k5_init_creds_get - - If we make multiple requests in an initial creds exchange, the - krb5_sendto_kdc call in k5_init_creds_get may flip the use_master - value from 0 to 1 if it detects that the response was from a master - KDC. Don't turn this into a requirement for future requests during - the same exchange, or we may have trouble following AS referrals. - Reported by Sumit Bose. - - ticket: 7650 - -diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c -index 20bc689..ff455d3 100644 ---- a/src/lib/krb5/krb/get_in_tkt.c -+++ b/src/lib/krb5/krb/get_in_tkt.c -@@ -521,7 +521,7 @@ k5_init_creds_get(krb5_context context, krb5_init_creds_context ctx, - krb5_data reply; - krb5_data realm; - unsigned int flags = 0; -- int tcp_only = 0; -+ int tcp_only = 0, master = *use_master; - - request.length = 0; - request.data = NULL; -@@ -545,8 +545,9 @@ k5_init_creds_get(krb5_context context, krb5_init_creds_context ctx, - - krb5_free_data_contents(context, &reply); - -+ master = *use_master; - code = krb5_sendto_kdc(context, &request, &realm, -- &reply, use_master, tcp_only); -+ &reply, &master, tcp_only); - if (code != 0) - break; - -@@ -558,6 +559,7 @@ k5_init_creds_get(krb5_context context, krb5_init_creds_context ctx, - krb5_free_data_contents(context, &reply); - krb5_free_data_contents(context, &realm); - -+ *use_master = master; - return code; - } - diff --git a/krb5.spec b/krb5.spec index 5dfc7ca..3e34b66 100644 --- a/krb5.spec +++ b/krb5.spec @@ -99,7 +99,6 @@ Patch126: krb5-1.11.2-skew2.patch Patch127: krb5-master-test_gss_no_udp.patch Patch128: krb5-master-test_no_pmap.patch Patch129: krb5-1.11-run_user_0.patch -Patch130: krb5-master-init_referral.patch Patch131: krb5-1.11.3-skew3.patch Patch132: krb5-1.11-gss-methods1.patch Patch133: krb5-1.11-gss-methods2.patch @@ -347,7 +346,6 @@ ln -s NOTICE LICENSE # DIR:/run/user/%%{uid}/krb5cc. %patch129 -p1 -b .run_user_0 -%patch130 -p1 -b .init_referral %patch131 -p1 -b .skew3 %patch132 -p1 -b .gss-methods1 %patch133 -p1 -b .gss-methods2 @@ -1010,6 +1008,7 @@ exit 0 %changelog * Tue Nov 12 2013 Nalin Dahyabhai - 1.11.4-0 - update to 1.11.4 + - drop patch for RT#7650, obsoleted * Tue Nov 12 2013 Nalin Dahyabhai - 1.11.3-31 - switch to the simplified version of the patch for #1029110 (RT#7764)