]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Fix config realm change logic in FILE remove_cred 915/head
authorGreg Hudson <ghudson@mit.edu>
Tue, 16 Apr 2019 14:47:35 +0000 (10:47 -0400)
committerGreg Hudson <ghudson@mit.edu>
Wed, 17 Apr 2019 15:17:05 +0000 (11:17 -0400)
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

index 91a77bf8d03fa70544b09ff96aa22feb9a037d5c..f0f1409f35f1b7a28b60966f4bb8968561d5dae9 100644 (file)
@@ -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);