From be0f417bc212b211dca9d33de3642008ca566c5e Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Wed, 9 Nov 2011 18:25:44 -0500 Subject: [PATCH] we shouldn't need this any more, per RT#6893 --- krb5-trunk-chpw-err.patch | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 krb5-trunk-chpw-err.patch diff --git a/krb5-trunk-chpw-err.patch b/krb5-trunk-chpw-err.patch deleted file mode 100644 index 5810f29..0000000 --- a/krb5-trunk-chpw-err.patch +++ /dev/null @@ -1,24 +0,0 @@ -Don't suppress the error code from an error message when the error message -contains e-data. RT#6893 -Index: src/lib/krb5/krb/chpw.c -=================================================================== ---- src/lib/krb5/krb/chpw.c (revision 24838) -+++ src/lib/krb5/krb/chpw.c (working copy) -@@ -111,15 +111,11 @@ - if ((ret = krb5_rd_error(context, packet, &krberror))) - return(ret); - -- if (krberror->e_data.data == NULL) -- ret = ERROR_TABLE_BASE_krb5 + (krb5_error_code) krberror->error; -- else -- ret = KRB5KRB_AP_ERR_MODIFIED; -+ ret = ERROR_TABLE_BASE_krb5 + (krb5_error_code) krberror->error; - krb5_free_error(context, krberror); - return(ret); -- } else { -- return(KRB5KRB_AP_ERR_MODIFIED); - } -+ return(KRB5KRB_AP_ERR_MODIFIED); - } - -