[30482] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix config realm change logic in FILE remove_cred
daemon@ATHENA.MIT.EDU (Greg Hudson)
Wed Apr 17 11:36:08 2019
Date: Wed, 17 Apr 2019 11:35:57 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-ID: <201904171535.x3HFZvfk006678@drugstore.mit.edu>
To: <cvs-krb5@mit.edu>
MIME-Version: 1.0
Reply-To: krbdev@mit.edu
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/e5367fcddd53dc4db0c1fd2279e91eda3791960a
commit e5367fcddd53dc4db0c1fd2279e91eda3791960a
Author: Greg Hudson <ghudson@mit.edu>
Date: Tue Apr 16 10:47:35 2019 -0400
Fix config realm change logic in FILE remove_cred
Use data_eq_string() to check the server realm, and do not check if
cred->server is NULL since it is not expected to be (and
k5_marshal_cred() would have already crashed if it were).
ticket: 8792
src/lib/krb5/ccache/cc_file.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c
index 91a77bf..f0f1409 100644
--- a/src/lib/krb5/ccache/cc_file.c
+++ b/src/lib/krb5/ccache/cc_file.c
@@ -1058,8 +1058,7 @@ delete_cred(krb5_context context, krb5_ccache cache, krb5_cc_cursor *cursor,
/* For config entries, also change the realm so that other implementations
* won't match them. */
- if (cred->server != NULL && cred->server->realm.length > 0 &&
- strcmp(cred->server->realm.data, "X-CACHECONF:") == 0)
+ if (data_eq_string(cred->server->realm, "X-CACHECONF:"))
memcpy(cred->server->realm.data, "X-RMED-CONF:", 12);
k5_marshal_cred(&overwrite, fcursor->version, cred);
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
