summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/ccache/ccfns.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/krb5/ccache/ccfns.c b/src/lib/krb5/ccache/ccfns.c
index 70c607dfb4..b5a878fc6e 100644
--- a/src/lib/krb5/ccache/ccfns.c
+++ b/src/lib/krb5/ccache/ccfns.c
@@ -281,16 +281,14 @@ krb5_cc_set_config(krb5_context context, krb5_ccache id,
if (ret)
goto out;
- /* Remove old configuration */
- ret = krb5_cc_remove_cred(context, id, 0, &cred);
- if (ret && ret != KRB5_CC_NOTFOUND)
- goto out;
-
- if (data) {
+ if (data == NULL) {
+ ret = krb5_cc_remove_cred(context, id, 0, &cred);
+ } else {
cred.ticket.data = malloc(data->length);
if (cred.ticket.data == NULL) {
- krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
- return ENOMEM;
+ ret = ENOMEM;
+ krb5_set_error_message(context, ret, "malloc: out of memory");
+ goto out;
}
cred.ticket.length = data->length;
memcpy(cred.ticket.data, data->data, data->length);