From 03babea1e30a58ca2709c07470ca1054a6444e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Tue, 14 Oct 2008 02:55:39 +0000 Subject: [PATCH] switch to krb5_clear_error_message git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23911 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/acache.c | 12 ++++++------ lib/krb5/context.c | 2 +- lib/krb5/crypto.c | 30 +++++++++++++++--------------- lib/krb5/data.c | 2 +- lib/krb5/digest.c | 12 ++++++------ lib/krb5/fcache.c | 10 +++++----- lib/krb5/get_cred.c | 6 +++--- lib/krb5/get_default_realm.c | 2 +- lib/krb5/get_for_creds.c | 2 +- lib/krb5/get_in_tkt.c | 12 ++++++------ lib/krb5/get_in_tkt_pw.c | 2 +- lib/krb5/init_creds.c | 2 +- lib/krb5/init_creds_pw.c | 10 +++++----- lib/krb5/kcm.c | 4 ++-- lib/krb5/keytab.c | 6 +++--- lib/krb5/keytab_any.c | 4 ++-- lib/krb5/keytab_file.c | 8 ++++---- lib/krb5/keytab_keyfile.c | 2 +- lib/krb5/keytab_memory.c | 4 ++-- lib/krb5/misc.c | 4 ++-- lib/krb5/pac.c | 2 +- lib/krb5/pkinit.c | 20 ++++++++++---------- lib/krb5/plugin.c | 2 +- lib/krb5/principal.c | 8 ++++---- lib/krb5/rd_cred.c | 8 ++++---- lib/krb5/rd_error.c | 4 ++-- lib/krb5/rd_priv.c | 18 +++++++++--------- lib/krb5/rd_rep.c | 6 +++--- lib/krb5/rd_req.c | 20 ++++++++++---------- lib/krb5/rd_safe.c | 14 +++++++------- lib/krb5/read_message.c | 8 ++++---- lib/krb5/recvauth.c | 4 ++-- lib/krb5/replay.c | 4 ++-- lib/krb5/scache.c | 8 ++++---- lib/krb5/send_to_kdc.c | 2 +- lib/krb5/sendauth.c | 6 +++--- lib/krb5/ticket.c | 4 ++-- lib/krb5/transited.c | 4 ++-- lib/krb5/v4_glue.c | 4 ++-- 39 files changed, 141 insertions(+), 141 deletions(-) diff --git a/lib/krb5/acache.c b/lib/krb5/acache.c index cdffe271d..3a44ee9e4 100644 --- a/lib/krb5/acache.c +++ b/lib/krb5/acache.c @@ -76,7 +76,7 @@ static krb5_error_code translate_cc_error(krb5_context context, cc_int32 error) { int i; - krb5_clear_error_string(context); + krb5_clear_error_message(context); for(i = 0; i < sizeof(cc_errors)/sizeof(cc_errors[0]); i++) if (cc_errors[i].error == error) return cc_errors[i].ret; @@ -91,7 +91,7 @@ init_ccapi(krb5_context context) HEIMDAL_MUTEX_lock(&acc_mutex); if (init_func) { HEIMDAL_MUTEX_unlock(&acc_mutex); - krb5_clear_error_string(context); + krb5_clear_error_message(context); return 0; } @@ -386,7 +386,7 @@ make_ccred_from_cred(krb5_context context, fail: free_ccred(cred); - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } @@ -458,7 +458,7 @@ acc_alloc(krb5_context context, krb5_ccache *id) ret = krb5_data_alloc(&(*id)->data, sizeof(*a)); if (ret) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } @@ -695,7 +695,7 @@ acc_get_first (krb5_context context, error = (*a->ccache->func->new_credentials_iterator)(a->ccache, &iter); if (error) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ENOENT; } *cursor = iter; @@ -863,7 +863,7 @@ acc_get_cache_first(krb5_context context, krb5_cc_cursor *cursor) &iter->iter); if (error) { free(iter); - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ENOENT; } *cursor = iter; diff --git a/lib/krb5/context.c b/lib/krb5/context.c index 3dbe0a88e..bebfbec05 100644 --- a/lib/krb5/context.c +++ b/lib/krb5/context.c @@ -433,7 +433,7 @@ krb5_free_context(krb5_context context) free_error_table (context->et_list); free(context->cc_ops); free(context->kt_types); - krb5_clear_error_string(context); + krb5_clear_error_message(context); if(context->warn_dest != NULL) krb5_closelog(context, context->warn_dest); krb5_set_extra_addresses(context, NULL); diff --git a/lib/krb5/crypto.c b/lib/krb5/crypto.c index b2ee59c3b..1a0075950 100644 --- a/lib/krb5/crypto.c +++ b/lib/krb5/crypto.c @@ -1314,7 +1314,7 @@ des_verify(krb5_context context, EVP_DigestFinal_ex (m, res, NULL); EVP_MD_CTX_destroy(m); if(memcmp(res, tmp + 8, sizeof(res)) != 0) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5KRB_AP_ERR_BAD_INTEGRITY; } memset(tmp, 0, sizeof(tmp)); @@ -1768,7 +1768,7 @@ create_checksum (krb5_context context, int keyed_checksum; if (ct->flags & F_DISABLED) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_PROG_SUMTYPE_NOSUPP; } keyed_checksum = (ct->flags & F_KEYED) != 0; @@ -1859,7 +1859,7 @@ verify_checksum(krb5_context context, return KRB5_PROG_SUMTYPE_NOSUPP; } if(ct->checksumsize != cksum->checksum.length) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5KRB_AP_ERR_BAD_INTEGRITY; /* XXX */ } keyed_checksum = (ct->flags & F_KEYED) != 0; @@ -1891,7 +1891,7 @@ verify_checksum(krb5_context context, if(c.checksum.length != cksum->checksum.length || memcmp(c.checksum.data, cksum->checksum.data, c.checksum.length)) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5KRB_AP_ERR_BAD_INTEGRITY; } else { ret = 0; @@ -2049,7 +2049,7 @@ evp_encrypt(krb5_context context, size_t len = EVP_CIPHER_CTX_iv_length(c); void *loiv = malloc(len); if (loiv == NULL) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ENOMEM; } memset(loiv, 0, len); @@ -2269,7 +2269,7 @@ ARCFOUR_subdecrypt(krb5_context context, memset (k3_c_data, 0, sizeof(k3_c_data)); if (memcmp (cksum.checksum.data, data, 16) != 0) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5KRB_AP_ERR_BAD_INTEGRITY; } else { return 0; @@ -2828,7 +2828,7 @@ encrypt_internal_derived(krb5_context context, &cksum); if(ret == 0 && cksum.checksum.length != checksum_sz) { free_Checksum (&cksum); - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5_CRYPTO_INTERNAL; } if(ret) @@ -2893,7 +2893,7 @@ encrypt_internal(krb5_context context, block_sz, &cksum); if(ret == 0 && cksum.checksum.length != checksum_sz) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); free_Checksum(&cksum); ret = KRB5_CRYPTO_INTERNAL; } @@ -2982,7 +2982,7 @@ decrypt_internal_derived(krb5_context context, } if (((len - checksum_sz) % et->padsize) != 0) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_BAD_MSIZE; } @@ -3052,7 +3052,7 @@ decrypt_internal(krb5_context context, struct encryption_type *et = crypto->et; if ((len % et->padsize) != 0) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_BAD_MSIZE; } @@ -3115,7 +3115,7 @@ decrypt_internal_special(krb5_context context, krb5_error_code ret; if ((len % et->padsize) != 0) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_BAD_MSIZE; } @@ -3195,7 +3195,7 @@ krb5_encrypt_iov_ivec(krb5_context context, krb5_crypto_iov *tiv, *piv, *hiv; if(!derived_crypto(context, crypto)) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_CRYPTO_INTERNAL; } @@ -3279,7 +3279,7 @@ krb5_encrypt_iov_ivec(krb5_context context, free(p); if(ret == 0 && cksum.checksum.length != trailersz) { free_Checksum (&cksum); - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5_CRYPTO_INTERNAL; } if(ret) @@ -3395,7 +3395,7 @@ krb5_decrypt_iov_ivec(krb5_context context, krb5_crypto_iov *tiv, *hiv; if(!derived_crypto(context, crypto)) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_CRYPTO_INTERNAL; } @@ -3550,7 +3550,7 @@ krb5_create_checksum_iov(krb5_context context, char *p, *q; if(!derived_crypto(context, crypto)) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_CRYPTO_INTERNAL; } diff --git a/lib/krb5/data.c b/lib/krb5/data.c index 7ebf467da..d6099c3c6 100644 --- a/lib/krb5/data.c +++ b/lib/krb5/data.c @@ -197,7 +197,7 @@ krb5_copy_data(krb5_context context, } ret = der_copy_octet_string(indata, *outdata); if(ret) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); free(*outdata); *outdata = NULL; } diff --git a/lib/krb5/digest.c b/lib/krb5/digest.c index 7433f7f72..ffe3c58ff 100644 --- a/lib/krb5/digest.c +++ b/lib/krb5/digest.c @@ -824,7 +824,7 @@ krb5_digest_get_session_key(krb5_context context, return 0; ret = der_copy_octet_string(digest->response.session_key, data); if (ret) - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } @@ -940,7 +940,7 @@ krb5_ntlm_init_get_challange(krb5_context context, ret = der_copy_octet_string(&ntlm->initReply.challange, challange); if (ret) - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } @@ -954,7 +954,7 @@ krb5_ntlm_init_get_opaque(krb5_context context, ret = der_copy_octet_string(&ntlm->initReply.opaque, opaque); if (ret) - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } @@ -966,7 +966,7 @@ krb5_ntlm_init_get_targetname(krb5_context context, { *name = strdup(ntlm->initReply.targetname); if (*name == NULL) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ENOMEM; } return 0; @@ -988,7 +988,7 @@ krb5_ntlm_init_get_targetinfo(krb5_context context, ntlm->initReply.targetinfo->data, ntlm->initReply.targetinfo->length); if (ret) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } return 0; @@ -1161,7 +1161,7 @@ krb5_ntlm_rep_get_sessionkey(krb5_context context, N_("no ntlm session key", "")); return EINVAL; } - krb5_clear_error_string(context); + krb5_clear_error_message(context); return krb5_data_copy(data, ntlm->response.sessionkey->data, ntlm->response.sessionkey->length); diff --git a/lib/krb5/fcache.c b/lib/krb5/fcache.c index 43e436880..e495f4c46 100644 --- a/lib/krb5/fcache.c +++ b/lib/krb5/fcache.c @@ -512,7 +512,7 @@ init_fcc (krb5_context context, sp = krb5_storage_from_fd(fd); if(sp == NULL) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); ret = ENOMEM; goto out; } @@ -657,7 +657,7 @@ fcc_get_principal(krb5_context context, return ret; ret = krb5_ret_principal(sp, principal); if (ret) - krb5_clear_error_string(context); + krb5_clear_error_message(context); krb5_storage_free(sp); fcc_unlock(context, fd); close(fd); @@ -693,7 +693,7 @@ fcc_get_first (krb5_context context, } ret = krb5_ret_principal (FCC_CURSOR(*cursor)->sp, &principal); if(ret) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); fcc_end_get(context, id, cursor); return ret; } @@ -714,7 +714,7 @@ fcc_get_next (krb5_context context, ret = krb5_ret_creds(FCC_CURSOR(*cursor)->sp, creds); if (ret) - krb5_clear_error_string(context); + krb5_clear_error_message(context); fcc_unlock(context, FCC_CURSOR(*cursor)->fd); return ret; @@ -816,7 +816,7 @@ fcc_get_cache_next(krb5_context context, krb5_cc_cursor cursor, krb5_ccache *id) char *expandedfn = NULL; if (!iter->first) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_CC_END; } iter->first = 0; diff --git a/lib/krb5/get_cred.c b/lib/krb5/get_cred.c index 92aa12c62..97e0022ee 100644 --- a/lib/krb5/get_cred.c +++ b/lib/krb5/get_cred.c @@ -563,10 +563,10 @@ get_cred_kdc(krb5_context context, krb5_free_error_contents(context, &error); } else if(resp.data && ((char*)resp.data)[0] == 4) { ret = KRB5KRB_AP_ERR_V4_REPLY; - krb5_clear_error_string(context); + krb5_clear_error_message(context); } else { ret = KRB5KRB_AP_ERR_MSG_TYPE; - krb5_clear_error_string(context); + krb5_clear_error_message(context); } out: @@ -671,7 +671,7 @@ not_found(krb5_context context, krb5_const_principal p, krb5_error_code code) ret = krb5_unparse_name(context, p, &str); if(ret) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return code; } krb5_set_error_message(context, code, diff --git a/lib/krb5/get_default_realm.c b/lib/krb5/get_default_realm.c index ef8b06439..a2518bbab 100644 --- a/lib/krb5/get_default_realm.c +++ b/lib/krb5/get_default_realm.c @@ -68,7 +68,7 @@ krb5_get_default_realm(krb5_context context, if (context->default_realms == NULL || context->default_realms[0] == NULL) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); ret = krb5_set_default_realm (context, NULL); if (ret) return ret; diff --git a/lib/krb5/get_for_creds.c b/lib/krb5/get_for_creds.c index f70439020..a7072a013 100644 --- a/lib/krb5/get_for_creds.c +++ b/lib/krb5/get_for_creds.c @@ -72,7 +72,7 @@ add_addrs(krb5_context context, addr->val[i++] = ad; } else if (ret == KRB5_PROG_ATYPE_NOSUPP) - krb5_clear_error_string (context); + krb5_clear_error_message (context); else goto fail; addr->len = i; diff --git a/lib/krb5/get_in_tkt.c b/lib/krb5/get_in_tkt.c index bb53901f4..398a6ad4a 100644 --- a/lib/krb5/get_in_tkt.c +++ b/lib/krb5/get_in_tkt.c @@ -380,7 +380,7 @@ _krb5_extract_ticket(krb5_context context, rep->enc_part.key.keyvalue.data, rep->enc_part.key.keyvalue.length); if (ret) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); goto out; } @@ -438,7 +438,7 @@ _krb5_extract_ticket(krb5_context context, strcmp(rep->enc_part.srealm, crealm) != 0) { ret = KRB5KRB_AP_ERR_MODIFIED; - krb5_clear_error_string(context); + krb5_clear_error_message(context); goto out; } } @@ -483,7 +483,7 @@ _krb5_extract_ticket(krb5_context context, if (creds->times.starttime != 0 && tmp_time != creds->times.starttime) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5KRB_AP_ERR_MODIFIED; goto out; } @@ -497,7 +497,7 @@ _krb5_extract_ticket(krb5_context context, if (creds->times.renew_till != 0 && tmp_time > creds->times.renew_till) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5KRB_AP_ERR_MODIFIED; goto out; } @@ -508,7 +508,7 @@ _krb5_extract_ticket(krb5_context context, if (creds->times.endtime != 0 && rep->enc_part.endtime > creds->times.endtime) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5KRB_AP_ERR_MODIFIED; goto out; } @@ -960,7 +960,7 @@ krb5_get_in_cred(krb5_context context, done = 0; preauth = my_preauth; krb5_free_error_contents(context, &error); - krb5_clear_error_string(context); + krb5_clear_error_message(context); continue; } if(ret_as_reply) diff --git a/lib/krb5/get_in_tkt_pw.c b/lib/krb5/get_in_tkt_pw.c index 747083ffa..34b59c4c7 100644 --- a/lib/krb5/get_in_tkt_pw.c +++ b/lib/krb5/get_in_tkt_pw.c @@ -54,7 +54,7 @@ krb5_password_key_proc (krb5_context context, if (password == NULL) { if(UI_UTIL_read_pw_string (buf, sizeof(buf), "Password: ", 0)) { free (*key); - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_LIBOS_PWDINTR; } password = buf; diff --git a/lib/krb5/init_creds.c b/lib/krb5/init_creds.c index b81de0aac..ba62fb9c1 100644 --- a/lib/krb5/init_creds.c +++ b/lib/krb5/init_creds.c @@ -388,7 +388,7 @@ krb5_get_init_creds_opt_get_error(krb5_context context, ret = copy_KRB_ERROR(opt->opt_private->error, *error); if (ret) - krb5_clear_error_string(context); + krb5_clear_error_message(context); return 0; } diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c index e6f350004..0b75522e9 100644 --- a/lib/krb5/init_creds_pw.c +++ b/lib/krb5/init_creds_pw.c @@ -673,7 +673,7 @@ set_paid(struct pa_info_data *paid, krb5_context context, paid->salt.salttype = salttype; paid->salt.saltvalue.data = malloc(salt_len + 1); if (paid->salt.saltvalue.data == NULL) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ENOMEM; } memcpy(paid->salt.saltvalue.data, salt_string, salt_len); @@ -684,7 +684,7 @@ set_paid(struct pa_info_data *paid, krb5_context context, ret = krb5_copy_data(context, s2kparams, &paid->s2kparams); if (ret) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); krb5_free_salt(context, paid->salt); return ret; } @@ -1294,7 +1294,7 @@ init_cred_loop(krb5_context context, ret = decode_AS_REP(resp.data, resp.length, &rep.kdc_rep, &size); if (ret == 0) { krb5_data_free(&resp); - krb5_clear_error_string(context); + krb5_clear_error_message(context); break; } else { /* let's try to parse it as a KRB-ERROR */ @@ -1436,7 +1436,7 @@ krb5_get_init_creds(krb5_context context, if (prompter == NULL || ctx.password == NULL) goto out; - krb5_clear_error_string (context); + krb5_clear_error_message (context); if (ctx.in_tkt_service != NULL && strcmp (ctx.in_tkt_service, "kadmin/changepw") == 0) @@ -1530,7 +1530,7 @@ krb5_get_init_creds_password(krb5_context context, memset (buf, 0, sizeof(buf)); krb5_get_init_creds_opt_free(context, options); ret = KRB5_LIBOS_PWDINTR; - krb5_clear_error_string (context); + krb5_clear_error_message (context); return ret; } password = password_data.data; diff --git a/lib/krb5/kcm.c b/lib/krb5/kcm.c index df9d85311..35011da23 100644 --- a/lib/krb5/kcm.c +++ b/lib/krb5/kcm.c @@ -136,7 +136,7 @@ kcm_send_request(krb5_context context, ret = krb5_storage_to_data(request, &request_data); if (ret) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_CC_NOMEM; } @@ -154,7 +154,7 @@ kcm_send_request(krb5_context context, krb5_data_free(&request_data); if (ret) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); ret = KRB5_CC_NOSUPP; } diff --git a/lib/krb5/keytab.c b/lib/krb5/keytab.c index 9f5b4e0b4..aa7c77ce4 100644 --- a/lib/krb5/keytab.c +++ b/lib/krb5/keytab.c @@ -129,7 +129,7 @@ krb5_error_code KRB5_LIB_FUNCTION krb5_kt_default_name(krb5_context context, char *name, size_t namesize) { if (strlcpy (name, context->default_keytab, namesize) >= namesize) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_CONFIG_NOTENUFSPACE; } return 0; @@ -150,7 +150,7 @@ krb5_kt_default_modify_name(krb5_context context, char *name, size_t namesize) else { size_t len = strcspn(context->default_keytab + 4, ","); if(len >= namesize) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_CONFIG_NOTENUFSPACE; } strlcpy(name, context->default_keytab + 4, namesize); @@ -160,7 +160,7 @@ krb5_kt_default_modify_name(krb5_context context, char *name, size_t namesize) } else kt = context->default_keytab_modify; if (strlcpy (name, kt, namesize) >= namesize) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_CONFIG_NOTENUFSPACE; } return 0; diff --git a/lib/krb5/keytab_any.c b/lib/krb5/keytab_any.c index 22f9c2fed..7a2d9b9f7 100644 --- a/lib/krb5/keytab_any.c +++ b/lib/krb5/keytab_any.c @@ -146,7 +146,7 @@ any_start_seq_get(krb5_context context, if (ed->a == NULL) { free (c->data); c->data = NULL; - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_KT_END; } return 0; @@ -178,7 +178,7 @@ any_next_entry (krb5_context context, break; } if (ed->a == NULL) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_KT_END; } } while (1); diff --git a/lib/krb5/keytab_file.c b/lib/krb5/keytab_file.c index da920fb3c..f494cac25 100644 --- a/lib/krb5/keytab_file.c +++ b/lib/krb5/keytab_file.c @@ -401,14 +401,14 @@ fkt_start_seq_get_int(krb5_context context, krb5_storage_free(c->sp); _krb5_xunlock(context, c->fd); close(c->fd); - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } if(pvno != 5) { krb5_storage_free(c->sp); _krb5_xunlock(context, c->fd); close(c->fd); - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_KEYTAB_BADVNO; } ret = krb5_ret_int8(c->sp, &tag); @@ -416,7 +416,7 @@ fkt_start_seq_get_int(krb5_context context, krb5_storage_free(c->sp); _krb5_xunlock(context, c->fd); close(c->fd); - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } id->version = tag; @@ -733,7 +733,7 @@ fkt_remove_entry(krb5_context context, krb5_kt_end_seq_get(context, id, &cursor); out: if (!found) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_KT_NOTFOUND; } return 0; diff --git a/lib/krb5/keytab_keyfile.c b/lib/krb5/keytab_keyfile.c index ccd359e14..e13de86fd 100644 --- a/lib/krb5/keytab_keyfile.c +++ b/lib/krb5/keytab_keyfile.c @@ -217,7 +217,7 @@ akf_start_seq_get(krb5_context context, if(ret) { krb5_storage_free(c->sp); close(c->fd); - krb5_clear_error_string (context); + krb5_clear_error_message (context); if(ret == KRB5_KT_END) return KRB5_KT_NOTFOUND; return ret; diff --git a/lib/krb5/keytab_memory.c b/lib/krb5/keytab_memory.c index 505b3aad2..defd10d67 100644 --- a/lib/krb5/keytab_memory.c +++ b/lib/krb5/keytab_memory.c @@ -197,7 +197,7 @@ mkt_remove_entry(krb5_context context, int found = 0; if (d->num_entries == 0) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_KT_NOTFOUND; } @@ -214,7 +214,7 @@ mkt_remove_entry(krb5_context context, } } if (!found) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_KT_NOTFOUND; } e = realloc(d->entries, d->num_entries * sizeof(*d->entries)); diff --git a/lib/krb5/misc.c b/lib/krb5/misc.c index 36d180984..4cee5e22e 100644 --- a/lib/krb5/misc.c +++ b/lib/krb5/misc.c @@ -48,7 +48,7 @@ _krb5_s4u2self_to_checksumdata(krb5_context context, sp = krb5_storage_emem(); if (sp == NULL) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ENOMEM; } krb5_storage_set_flags(sp, KRB5_STORAGE_BYTEORDER_LE); @@ -81,6 +81,6 @@ _krb5_s4u2self_to_checksumdata(krb5_context context, return ret; out: - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } diff --git a/lib/krb5/pac.c b/lib/krb5/pac.c index 66a4c4e30..3c55eb3dc 100644 --- a/lib/krb5/pac.c +++ b/lib/krb5/pac.c @@ -70,7 +70,7 @@ struct krb5_pac_data { #define CHECK(r,f,l) \ do { \ if (((r) = f ) != 0) { \ - krb5_clear_error_string(context); \ + krb5_clear_error_message(context); \ goto l; \ } \ } while(0) diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c index 1bc0ac069..13d0b815c 100644 --- a/lib/krb5/pkinit.c +++ b/lib/krb5/pkinit.c @@ -99,7 +99,7 @@ BN_to_integer(krb5_context context, BIGNUM *bn, heim_integer *integer) integer->length = BN_num_bytes(bn); integer->data = malloc(integer->length); if (integer->data == NULL) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ENOMEM; } BN_bn2bin(bn, integer->data); @@ -330,7 +330,7 @@ build_auth_pack(krb5_context context, int32_t usec; Checksum checksum; - krb5_clear_error_string(context); + krb5_clear_error_message(context); memset(&checksum, 0, sizeof(checksum)); @@ -377,12 +377,12 @@ build_auth_pack(krb5_context context, if (1 /* support_cached_dh */) { ALLOC(a->clientDHNonce, 1); if (a->clientDHNonce == NULL) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ENOMEM; } ret = krb5_data_alloc(a->clientDHNonce, 40); if (a->clientDHNonce == NULL) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } memset(a->clientDHNonce->data, 0, a->clientDHNonce->length); @@ -519,13 +519,13 @@ pk_mk_padata(krb5_context context, ret = copy_PrincipalName(req_body->sname, &ap.pkAuthenticator.kdcName); if (ret) { free_AuthPack_Win2k(&ap); - krb5_clear_error_string(context); + krb5_clear_error_message(context); goto out; } ret = copy_Realm(&req_body->realm, &ap.pkAuthenticator.kdcRealm); if (ret) { free_AuthPack_Win2k(&ap); - krb5_clear_error_string(context); + krb5_clear_error_message(context); goto out; } @@ -752,7 +752,7 @@ _krb5_pk_verify_sign(krb5_context context, *signer = calloc(1, sizeof(**signer)); if (*signer == NULL) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); ret = ENOMEM; goto out; } @@ -1403,7 +1403,7 @@ _krb5_pk_rd_pa_reply(krb5_context context, return ret; } - krb5_clear_error_string(context); + krb5_clear_error_message(context); switch (w2krep.element) { case choice_PA_PK_AS_REP_Win2k_encKeyPack: { @@ -1690,13 +1690,13 @@ pk_copy_error(krb5_context context, vasprintf(&f, fmt, va); va_end(va); if (f == NULL) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return; } s = hx509_get_error_string(hx509ctx, hxret); if (s == NULL) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); free(f); return; } diff --git a/lib/krb5/plugin.c b/lib/krb5/plugin.c index f07c620fd..a71dd8b6f 100644 --- a/lib/krb5/plugin.c +++ b/lib/krb5/plugin.c @@ -109,7 +109,7 @@ loadlib(krb5_context context, if ((*e)->symbol == NULL) { dlclose((*e)->dsohandle); free(*e); - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ENOMEM; } diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c index 628e81579..f27355f2d 100644 --- a/lib/krb5/principal.c +++ b/lib/krb5/principal.c @@ -931,7 +931,7 @@ krb5_425_conv_principal_ext2(krb5_context context, } krb5_free_principal(context, pr); *princ = NULL; - krb5_clear_error_string (context); + krb5_clear_error_message (context); return HEIM_ERR_V4_PRINC_NO_CONV; } if(resolve){ @@ -1040,7 +1040,7 @@ krb5_425_conv_principal_ext2(krb5_context context, "default_domain", NULL); if(p == NULL){ /* this should be an error, just faking a name is not good */ - krb5_clear_error_string (context); + krb5_clear_error_message (context); return HEIM_ERR_V4_PRINC_NO_CONV; } @@ -1054,7 +1054,7 @@ local_host: return 0; } krb5_free_principal(context, pr); - krb5_clear_error_string (context); + krb5_clear_error_message (context); return HEIM_ERR_V4_PRINC_NO_CONV; no_host: p = krb5_config_get_string(context, NULL, @@ -1080,7 +1080,7 @@ no_host: return 0; } krb5_free_principal(context, pr); - krb5_clear_error_string (context); + krb5_clear_error_message (context); return HEIM_ERR_V4_PRINC_NO_CONV; } diff --git a/lib/krb5/rd_cred.c b/lib/krb5/rd_cred.c index 103693521..dc5103301 100644 --- a/lib/krb5/rd_cred.c +++ b/lib/krb5/rd_cred.c @@ -81,19 +81,19 @@ krb5_rd_cred(krb5_context context, ret = decode_KRB_CRED(in_data->data, in_data->length, &cred, &len); if(ret) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } if (cred.pvno != 5) { ret = KRB5KRB_AP_ERR_BADVERSION; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto out; } if (cred.msg_type != krb_cred) { ret = KRB5KRB_AP_ERR_MSG_TYPE; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto out; } @@ -222,7 +222,7 @@ krb5_rd_cred(krb5_context context, enc_krb_cred_part.usec == NULL || abs(*enc_krb_cred_part.timestamp - sec) > context->max_skew) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5KRB_AP_ERR_SKEW; goto out; } diff --git a/lib/krb5/rd_error.c b/lib/krb5/rd_error.c index 8d38a90c7..75ae8b1e8 100644 --- a/lib/krb5/rd_error.c +++ b/lib/krb5/rd_error.c @@ -46,7 +46,7 @@ krb5_rd_error(krb5_context context, ret = decode_KRB_ERROR(msg->data, msg->length, result, &len); if(ret) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } result->error_code += KRB5KDC_ERR_NONE; @@ -119,7 +119,7 @@ krb5_error_from_rd_error(krb5_context context, creds ? ")" : ""); break; default : - krb5_clear_error_string(context); + krb5_clear_error_message(context); break; } } diff --git a/lib/krb5/rd_priv.c b/lib/krb5/rd_priv.c index 35432e479..6778ccad8 100644 --- a/lib/krb5/rd_priv.c +++ b/lib/krb5/rd_priv.c @@ -56,7 +56,7 @@ krb5_rd_priv(krb5_context context, (KRB5_AUTH_CONTEXT_RET_TIME | KRB5_AUTH_CONTEXT_RET_SEQUENCE))) { if (outdata == NULL) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_RC_REQUIRED; /* XXX better error, MIT returns this */ } /* if these fields are not present in the priv-part, silently @@ -67,16 +67,16 @@ krb5_rd_priv(krb5_context context, memset(&priv, 0, sizeof(priv)); ret = decode_KRB_PRIV (inbuf->data, inbuf->length, &priv, &len); if (ret) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto failure; } if (priv.pvno != 5) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5KRB_AP_ERR_BADVERSION; goto failure; } if (priv.msg_type != krb_priv) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5KRB_AP_ERR_MSG_TYPE; goto failure; } @@ -103,7 +103,7 @@ krb5_rd_priv(krb5_context context, ret = decode_EncKrbPrivPart (plain.data, plain.length, &part, &len); krb5_data_free (&plain); if (ret) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto failure; } @@ -114,7 +114,7 @@ krb5_rd_priv(krb5_context context, && !krb5_address_compare (context, auth_context->remote_address, part.s_address)) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5KRB_AP_ERR_BADADDR; goto failure_part; } @@ -126,7 +126,7 @@ krb5_rd_priv(krb5_context context, && !krb5_address_compare (context, auth_context->local_address, part.r_address)) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5KRB_AP_ERR_BADADDR; goto failure_part; } @@ -139,7 +139,7 @@ krb5_rd_priv(krb5_context context, if (part.timestamp == NULL || part.usec == NULL || abs(*part.timestamp - sec) > context->max_skew) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5KRB_AP_ERR_SKEW; goto failure_part; } @@ -156,7 +156,7 @@ krb5_rd_priv(krb5_context context, && auth_context->remote_seqnumber != 0) || (part.seq_number != NULL && *part.seq_number != auth_context->remote_seqnumber)) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5KRB_AP_ERR_BADORDER; goto failure_part; } diff --git a/lib/krb5/rd_rep.c b/lib/krb5/rd_rep.c index 23aa69653..010726b18 100644 --- a/lib/krb5/rd_rep.c +++ b/lib/krb5/rd_rep.c @@ -55,12 +55,12 @@ krb5_rd_rep(krb5_context context, return ret; if (ap_rep.pvno != 5) { ret = KRB5KRB_AP_ERR_BADVERSION; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto out; } if (ap_rep.msg_type != krb_ap_rep) { ret = KRB5KRB_AP_ERR_MSG_TYPE; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto out; } @@ -97,7 +97,7 @@ krb5_rd_rep(krb5_context context, krb5_free_ap_rep_enc_part(context, *repl); *repl = NULL; ret = KRB5KRB_AP_ERR_MUT_FAIL; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto out; } } diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c index 8591d13b8..a416f90c1 100644 --- a/lib/krb5/rd_req.c +++ b/lib/krb5/rd_req.c @@ -113,17 +113,17 @@ krb5_decode_ap_req(krb5_context context, return ret; if (ap_req->pvno != 5){ free_AP_REQ(ap_req); - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5KRB_AP_ERR_BADVERSION; } if (ap_req->msg_type != krb_ap_req){ free_AP_REQ(ap_req); - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5KRB_AP_ERR_MSG_TYPE; } if (ap_req->ticket.tkt_vno != 5){ free_AP_REQ(ap_req); - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5KRB_AP_ERR_BADVERSION; } return 0; @@ -209,7 +209,7 @@ find_etypelist(krb5_context context, etypes, NULL); if (ret) - krb5_clear_error_string(context); + krb5_clear_error_message(context); free_AD_IF_RELEVANT(&adIfRelevant); @@ -240,12 +240,12 @@ krb5_decrypt_ticket(krb5_context context, || (t.flags.invalid && !(flags & KRB5_VERIFY_AP_REQ_IGNORE_INVALID))) { free_EncTicketPart(&t); - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5KRB_AP_ERR_TKT_NYV; } if(now - t.endtime > context->max_skew) { free_EncTicketPart(&t); - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5KRB_AP_ERR_TKT_EXPIRED; } @@ -358,7 +358,7 @@ krb5_verify_ap_req2(krb5_context context, t = calloc(1, sizeof(*t)); if (t == NULL) { ret = ENOMEM; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto out; } @@ -414,7 +414,7 @@ krb5_verify_ap_req2(krb5_context context, krb5_free_principal (context, p2); if (!res) { ret = KRB5KRB_AP_ERR_BADMATCH; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto out; } } @@ -427,7 +427,7 @@ krb5_verify_ap_req2(krb5_context context, ac->remote_address, t->ticket.caddr)) { ret = KRB5KRB_AP_ERR_BADADDR; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto out; } @@ -439,7 +439,7 @@ krb5_verify_ap_req2(krb5_context context, if (abs(ac->authenticator->ctime - now) > context->max_skew) { ret = KRB5KRB_AP_ERR_SKEW; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto out; } } diff --git a/lib/krb5/rd_safe.c b/lib/krb5/rd_safe.c index ae86c156d..03df0cb85 100644 --- a/lib/krb5/rd_safe.c +++ b/lib/krb5/rd_safe.c @@ -114,18 +114,18 @@ krb5_rd_safe(krb5_context context, return ret; if (safe.pvno != 5) { ret = KRB5KRB_AP_ERR_BADVERSION; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto failure; } if (safe.msg_type != krb_safe) { ret = KRB5KRB_AP_ERR_MSG_TYPE; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto failure; } if (!krb5_checksum_is_keyed(context, safe.cksum.cksumtype) || !krb5_checksum_is_collision_proof(context, safe.cksum.cksumtype)) { ret = KRB5KRB_AP_ERR_INAPP_CKSUM; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto failure; } @@ -137,7 +137,7 @@ krb5_rd_safe(krb5_context context, auth_context->remote_address, safe.safe_body.s_address)) { ret = KRB5KRB_AP_ERR_BADADDR; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto failure; } @@ -149,7 +149,7 @@ krb5_rd_safe(krb5_context context, auth_context->local_address, safe.safe_body.r_address)) { ret = KRB5KRB_AP_ERR_BADADDR; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto failure; } @@ -163,7 +163,7 @@ krb5_rd_safe(krb5_context context, safe.safe_body.usec == NULL || abs(*safe.safe_body.timestamp - sec) > context->max_skew) { ret = KRB5KRB_AP_ERR_SKEW; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto failure; } } @@ -180,7 +180,7 @@ krb5_rd_safe(krb5_context context, && *safe.safe_body.seq_number != auth_context->remote_seqnumber)) { ret = KRB5KRB_AP_ERR_BADORDER; - krb5_clear_error_string (context); + krb5_clear_error_message (context); goto failure; } auth_context->remote_seqnumber++; diff --git a/lib/krb5/read_message.c b/lib/krb5/read_message.c index f23f70f29..df6511b9e 100644 --- a/lib/krb5/read_message.c +++ b/lib/krb5/read_message.c @@ -49,23 +49,23 @@ krb5_read_message (krb5_context context, ret = krb5_net_read (context, p_fd, buf, 4); if(ret == -1) { ret = errno; - krb5_clear_error_string (context); + krb5_clear_error_message (context); return ret; } if(ret < 4) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return HEIM_ERR_EOF; } len = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; ret = krb5_data_alloc (data, len); if (ret) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } if (krb5_net_read (context, p_fd, data->data, len) != len) { ret = errno; krb5_data_free (data); - krb5_clear_error_string (context); + krb5_clear_error_message (context); return ret; } return 0; diff --git a/lib/krb5/recvauth.c b/lib/krb5/recvauth.c index 0bd866182..cdcb5c064 100644 --- a/lib/krb5/recvauth.c +++ b/lib/krb5/recvauth.c @@ -117,7 +117,7 @@ krb5_recvauth_match_version(krb5_context context, || strncmp (version, her_version, len)) { repl = 1; krb5_net_write (context, p_fd, &repl, 1); - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_SENDAUTH_BADAUTHVERS; } } @@ -129,7 +129,7 @@ krb5_recvauth_match_version(krb5_context context, return ret; } if (n == 0) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_SENDAUTH_BADAPPLVERS; } len = ntohl(len); diff --git a/lib/krb5/replay.c b/lib/krb5/replay.c index 8b05443e3..25a6da026 100644 --- a/lib/krb5/replay.c +++ b/lib/krb5/replay.c @@ -220,7 +220,7 @@ krb5_rc_store(krb5_context context, continue; if(memcmp(tmp.data, ent.data, sizeof(ent.data)) == 0){ fclose(f); - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_RC_REPLAY; } } @@ -265,7 +265,7 @@ krb5_rc_get_lifespan(krb5_context context, *auth_lifespan = ent.stamp; return 0; } - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_RC_IO_UNKNOWN; } diff --git a/lib/krb5/scache.c b/lib/krb5/scache.c index b9dee0bc4..a72a70370 100644 --- a/lib/krb5/scache.c +++ b/lib/krb5/scache.c @@ -232,7 +232,7 @@ default_db(krb5_context context, sqlite3 **db) ret = sqlite3_open_v2(name, db, SQLITE_OPEN_READWRITE, NULL); free(name); if (ret != SQLITE_OK) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ENOENT; } @@ -282,7 +282,7 @@ get_def_name(krb5_context context, char **str) out: sqlite3_finalize(stmt); sqlite3_close(db); - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ENOENT; } @@ -973,7 +973,7 @@ scc_get_next (krb5_context context, next: ret = sqlite3_step(ctx->stmt); if (ret == SQLITE_DONE) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_CC_END; } else if (ret != SQLITE_ROW) { krb5_set_error_message(context, KRB5_CC_IO, @@ -1235,7 +1235,7 @@ scc_get_cache_next(krb5_context context, again: ret = sqlite3_step(ctx->stmt); if (ret == SQLITE_DONE) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return KRB5_CC_END; } else if (ret != SQLITE_ROW) { krb5_set_error_message(context, KRB5_CC_IO, diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c index b3427d9e6..44cb556ef 100644 --- a/lib/krb5/send_to_kdc.c +++ b/lib/krb5/send_to_kdc.c @@ -440,7 +440,7 @@ krb5_sendto (krb5_context context, } krb5_krbhst_reset(context, handle); } - krb5_clear_error_string (context); + krb5_clear_error_message (context); ret = KRB5_KDC_UNREACH; out: return ret; diff --git a/lib/krb5/sendauth.c b/lib/krb5/sendauth.c index 2308850d4..f2cd0819a 100644 --- a/lib/krb5/sendauth.c +++ b/lib/krb5/sendauth.c @@ -112,12 +112,12 @@ krb5_sendauth(krb5_context context, krb5_set_error_message (context, ret, "read: %s", strerror(ret)); return ret; } else if (sret != sizeof(repl)) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_SENDAUTH_BADRESPONSE; } if (repl != 0) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5_SENDAUTH_REJECTED; } @@ -205,7 +205,7 @@ krb5_sendauth(krb5_context context, } return ret; } else { - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; } } diff --git a/lib/krb5/ticket.c b/lib/krb5/ticket.c index 8398496ba..db7862657 100644 --- a/lib/krb5/ticket.c +++ b/lib/krb5/ticket.c @@ -205,7 +205,7 @@ find_type_in_ad(krb5_context context, &child.elements, &len, ret); if (ret) { free_AD_KDCIssued(&child); - krb5_clear_error_string(context); + krb5_clear_error_message(context); goto out; } if(buf.length != len) @@ -219,7 +219,7 @@ find_type_in_ad(krb5_context context, goto out; } if (!valid) { - krb5_clear_error_string(context); + krb5_clear_error_message(context); ret = ENOENT; free_AD_KDCIssued(&child); goto out; diff --git a/lib/krb5/transited.c b/lib/krb5/transited.c index dc6cdc52f..7e11d5579 100644 --- a/lib/krb5/transited.c +++ b/lib/krb5/transited.c @@ -80,7 +80,7 @@ make_path(krb5_context context, struct tr_realm *r, while(1){ p = strchr(p, '.'); if(p == NULL) { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5KDC_ERR_POLICY; } p++; @@ -132,7 +132,7 @@ make_path(krb5_context context, struct tr_realm *r, p--; } } else { - krb5_clear_error_string (context); + krb5_clear_error_message (context); return KRB5KDC_ERR_POLICY; } r->next = path; diff --git a/lib/krb5/v4_glue.c b/lib/krb5/v4_glue.c index 4bcbac662..768619829 100644 --- a/lib/krb5/v4_glue.c +++ b/lib/krb5/v4_glue.c @@ -245,7 +245,7 @@ _krb5_krb_tf_setup(krb5_context context, krb5_storage_set_byteorder(sp, KRB5_STORAGE_BYTEORDER_HOST); krb5_storage_set_eof_code(sp, KRB5_CC_IO); - krb5_clear_error_string(context); + krb5_clear_error_message(context); if (!append) { RCHECK(ret, krb5_store_stringz(sp, v4creds->pname), error); @@ -926,7 +926,7 @@ _krb5_krb_rd_req(krb5_context context, krb5_storage_free(sp); if (ret) - krb5_clear_error_string(context); + krb5_clear_error_message(context); return ret; }