diff options
author | Greg Hudson <ghudson@mit.edu> | 2014-05-24 12:15:32 -0400 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2014-06-05 11:22:50 -0400 |
commit | a7b5808b5df9e54ef8a8a7ac24e5faad458ddbce (patch) | |
tree | b98160b39c648d8b1d967fa3b1b885b9232f74d1 /src/lib/krb5 | |
parent | 06b91d1e2341601e5bdc70a15737187545d68196 (diff) | |
download | krb5-a7b5808b5df9e54ef8a8a7ac24e5faad458ddbce.tar.gz krb5-a7b5808b5df9e54ef8a8a7ac24e5faad458ddbce.tar.xz krb5-a7b5808b5df9e54ef8a8a7ac24e5faad458ddbce.zip |
Use k5_setmsg
Replace most calls to krb5_set_error_message with k5_setmsg for
brevity. Leave alone plugin sources where we don't include k5-int.h
(mostly PKINIT).
Diffstat (limited to 'src/lib/krb5')
-rw-r--r-- | src/lib/krb5/ccache/cc_dir.c | 35 | ||||
-rw-r--r-- | src/lib/krb5/ccache/cc_file.c | 11 | ||||
-rw-r--r-- | src/lib/krb5/ccache/cc_keyring.c | 11 | ||||
-rw-r--r-- | src/lib/krb5/ccache/cccursor.c | 10 | ||||
-rw-r--r-- | src/lib/krb5/keytab/kt_file.c | 23 | ||||
-rw-r--r-- | src/lib/krb5/keytab/ktfns.c | 4 | ||||
-rw-r--r-- | src/lib/krb5/krb/authdata_dec.c | 4 | ||||
-rw-r--r-- | src/lib/krb5/krb/fast.c | 27 | ||||
-rw-r--r-- | src/lib/krb5/krb/gc_via_tkt.c | 13 | ||||
-rw-r--r-- | src/lib/krb5/krb/get_in_tkt.c | 13 | ||||
-rw-r--r-- | src/lib/krb5/krb/gic_keytab.c | 5 | ||||
-rw-r--r-- | src/lib/krb5/krb/parse.c | 8 | ||||
-rw-r--r-- | src/lib/krb5/krb/plugin.c | 10 | ||||
-rw-r--r-- | src/lib/krb5/krb/preauth2.c | 8 | ||||
-rw-r--r-- | src/lib/krb5/krb/preauth_otp.c | 8 | ||||
-rw-r--r-- | src/lib/krb5/krb/rd_req_dec.c | 82 | ||||
-rw-r--r-- | src/lib/krb5/krb/t_copy_context.c | 2 | ||||
-rw-r--r-- | src/lib/krb5/os/expand_path.c | 44 | ||||
-rw-r--r-- | src/lib/krb5/os/locate_kdc.c | 10 | ||||
-rw-r--r-- | src/lib/krb5/os/sendto_kdc.c | 6 | ||||
-rw-r--r-- | src/lib/krb5/rcache/rc_io.c | 76 |
21 files changed, 184 insertions, 226 deletions
diff --git a/src/lib/krb5/ccache/cc_dir.c b/src/lib/krb5/ccache/cc_dir.c index b8231ed7c..d82f33550 100644 --- a/src/lib/krb5/ccache/cc_dir.c +++ b/src/lib/krb5/ccache/cc_dir.c @@ -118,16 +118,15 @@ split_path(krb5_context context, const char *path, char **dirname_out, if (*dirname == '\0') { ret = KRB5_CC_BADNAME; - krb5_set_error_message(context, ret, - _("Subsidiary cache path %s has no parent " - "directory"), path); + k5_setmsg(context, ret, + _("Subsidiary cache path %s has no parent directory"), path); goto error; } if (!filename_is_cache(filename)) { ret = KRB5_CC_BADNAME; - krb5_set_error_message(context, ret, - _("Subsidiary cache path %s filename does not " - "begin with \"tkt\""), path); + k5_setmsg(context, ret, + _("Subsidiary cache path %s filename does not begin with " + "\"tkt\""), path); goto error; } @@ -167,9 +166,8 @@ read_primary_file(krb5_context context, const char *primary_path, * filename, or isn't a single-component filename. */ if (buf[len - 1] != '\n' || !filename_is_cache(buf) || strchr(buf, '/') || strchr(buf, '\\')) { - krb5_set_error_message(context, KRB5_CC_FORMAT, - _("%s contains invalid filename"), - primary_path); + k5_setmsg(context, KRB5_CC_FORMAT, _("%s contains invalid filename"), + primary_path); return KRB5_CC_FORMAT; } buf[len - 1] = '\0'; @@ -227,15 +225,15 @@ verify_dir(krb5_context context, const char *dirname) if (stat(dirname, &st) < 0) { if (errno == ENOENT && mkdir(dirname, S_IRWXU) == 0) return 0; - krb5_set_error_message(context, KRB5_FCC_NOFILE, - _("Credential cache directory %s does not " - "exist"), dirname); + k5_setmsg(context, KRB5_FCC_NOFILE, + _("Credential cache directory %s does not exist"), + dirname); return KRB5_FCC_NOFILE; } if (!S_ISDIR(st.st_mode)) { - krb5_set_error_message(context, KRB5_CC_FORMAT, - _("Credential cache directory %s exists but is" - "not a directory"), dirname); + k5_setmsg(context, KRB5_CC_FORMAT, + _("Credential cache directory %s exists but is not a " + "directory"), dirname); return KRB5_CC_FORMAT; } return 0; @@ -398,10 +396,9 @@ dcc_gen_new(krb5_context context, krb5_ccache *cache_out) if (ret) return ret; if (dirname == NULL) { - krb5_set_error_message(context, KRB5_DCC_CANNOT_CREATE, - _("Can't create new subsidiary cache because " - "default cache is not a directory " - "collection")); + k5_setmsg(context, KRB5_DCC_CANNOT_CREATE, + _("Can't create new subsidiary cache because default cache " + "is not a directory collection")); return KRB5_DCC_CANNOT_CREATE; } ret = k5_path_join(dirname, "tktXXXXXX", &template); diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c index 7b6279d87..3f6443f68 100644 --- a/src/lib/krb5/ccache/cc_file.c +++ b/src/lib/krb5/ccache/cc_file.c @@ -569,9 +569,8 @@ open_cache_file(krb5_context context, krb5_ccache id, int mode) if (f == NO_FILE) { if (errno == ENOENT) { ret = KRB5_FCC_NOFILE; - krb5_set_error_message(context, ret, - _("Credentials cache file '%s' not found"), - data->filename); + k5_setmsg(context, ret, _("Credentials cache file '%s' not found"), + data->filename); return ret; } else { return interpret_errno(context, errno); @@ -1577,9 +1576,9 @@ interpret_errno(krb5_context context, int errnum) case ENXIO: default: ret = KRB5_CC_IO; - krb5_set_error_message(context, ret, - _("Credentials cache I/O operation failed " - "(%s)"), strerror(errnum)); + k5_setmsg(context, ret, + _("Credentials cache I/O operation failed (%s)"), + strerror(errnum)); } return ret; } diff --git a/src/lib/krb5/ccache/cc_keyring.c b/src/lib/krb5/ccache/cc_keyring.c index 43f33ee50..31be293db 100644 --- a/src/lib/krb5/ccache/cc_keyring.c +++ b/src/lib/krb5/ccache/cc_keyring.c @@ -1147,9 +1147,9 @@ krcc_generate_new(krb5_context context, krb5_ccache *id_out) return ret; } if (subsidiary_name != NULL) { - krb5_set_error_message(context, KRB5_DCC_CANNOT_CREATE, - _("Can't create new subsidiary cache because " - "default cache is already a subsdiary")); + k5_setmsg(context, KRB5_DCC_CANNOT_CREATE, + _("Can't create new subsidiary cache because default cache " + "is already a subsidiary")); ret = KRB5_DCC_CANNOT_CREATE; goto cleanup; } @@ -1216,9 +1216,8 @@ krcc_get_principal(krb5_context context, krb5_ccache id, if (!data->cache_id || !data->princ_id) { ret = KRB5_FCC_NOFILE; - krb5_set_error_message(context, ret, - _("Credentials cache keyring '%s' not found"), - data->name); + k5_setmsg(context, ret, _("Credentials cache keyring '%s' not found"), + data->name); goto errout; } diff --git a/src/lib/krb5/ccache/cccursor.c b/src/lib/krb5/ccache/cccursor.c index e15611248..021a49ffb 100644 --- a/src/lib/krb5/ccache/cccursor.c +++ b/src/lib/krb5/ccache/cccursor.c @@ -208,9 +208,9 @@ krb5_cc_cache_match(krb5_context context, krb5_principal client, if (cache == NULL) { ret = krb5_unparse_name(context, client, &name); if (ret == 0) { - krb5_set_error_message(context, KRB5_CC_NOTFOUND, - _("Can't find client principal %s in " - "cache collection"), name); + k5_setmsg(context, KRB5_CC_NOTFOUND, + _("Can't find client principal %s in cache collection"), + name); krb5_free_unparsed_name(context, name); } ret = KRB5_CC_NOTFOUND; @@ -249,7 +249,7 @@ krb5_cccol_have_content(krb5_context context) return 0; no_entries: - krb5_set_error_message(context, KRB5_CC_NOTFOUND, - _("No Kerberos credentials available")); + k5_setmsg(context, KRB5_CC_NOTFOUND, + _("No Kerberos credentials available")); return KRB5_CC_NOTFOUND; } diff --git a/src/lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c index 44864b5a6..722ebe6fb 100644 --- a/src/lib/krb5/keytab/kt_file.c +++ b/src/lib/krb5/keytab/kt_file.c @@ -394,9 +394,8 @@ krb5_ktfile_get_entry(krb5_context context, krb5_keytab id, else { kerror = KRB5_KT_NOTFOUND; if (krb5_unparse_name(context, principal, &princname) == 0) { - krb5_set_error_message(context, kerror, - _("No key table entry found for %s"), - princname); + k5_setmsg(context, kerror, + _("No key table entry found for %s"), princname); free(princname); } } @@ -472,8 +471,7 @@ krb5_ktfile_start_seq_get(krb5_context context, krb5_keytab id, krb5_kt_cursor * /* Wrapped?! */ KTITERS(id)--; KTUNLOCK(id); - krb5_set_error_message(context, KRB5_KT_IOERR, - "Too many keytab iterators active"); + k5_setmsg(context, KRB5_KT_IOERR, "Too many keytab iterators active"); return KRB5_KT_IOERR; /* XXX */ } KTUNLOCK(id); @@ -813,9 +811,8 @@ krb5_ktfile_add(krb5_context context, krb5_keytab id, krb5_keytab_entry *entry) if (KTFILEP(id)) { /* Iterator(s) active -- no changes. */ KTUNLOCK(id); - krb5_set_error_message(context, KRB5_KT_IOERR, - _("Cannot change keytab with keytab iterators " - "active")); + k5_setmsg(context, KRB5_KT_IOERR, + _("Cannot change keytab with keytab iterators active")); return KRB5_KT_IOERR; /* XXX */ } if ((retval = krb5_ktfileint_openw(context, id))) { @@ -847,9 +844,8 @@ krb5_ktfile_remove(krb5_context context, krb5_keytab id, krb5_keytab_entry *entr if (KTFILEP(id)) { /* Iterator(s) active -- no changes. */ KTUNLOCK(id); - krb5_set_error_message(context, KRB5_KT_IOERR, - _("Cannot change keytab with keytab iterators " - "active")); + k5_setmsg(context, KRB5_KT_IOERR, + _("Cannot change keytab with keytab iterators active")); return KRB5_KT_IOERR; /* XXX */ } @@ -1047,9 +1043,8 @@ krb5_ktfileint_open(krb5_context context, krb5_keytab id, int mode) /* XXX */ return EMFILE; case ENOENT: - krb5_set_error_message(context, ENOENT, - _("Key table file '%s' not found"), - KTFILENAME(id)); + k5_setmsg(context, ENOENT, + _("Key table file '%s' not found"), KTFILENAME(id)); return ENOENT; default: return errno; diff --git a/src/lib/krb5/keytab/ktfns.c b/src/lib/krb5/keytab/ktfns.c index 56343ad0a..794525367 100644 --- a/src/lib/krb5/keytab/ktfns.c +++ b/src/lib/krb5/keytab/ktfns.c @@ -123,8 +123,8 @@ krb5_kt_have_content(krb5_context context, krb5_keytab keytab) no_entries: if (krb5_kt_get_name(context, keytab, name, sizeof(name)) == 0) { - krb5_set_error_message(context, KRB5_KT_NOTFOUND, - _("Keytab %s is nonexistent or empty"), name); + k5_setmsg(context, KRB5_KT_NOTFOUND, + _("Keytab %s is nonexistent or empty"), name); } return KRB5_KT_NOTFOUND; } diff --git a/src/lib/krb5/krb/authdata_dec.c b/src/lib/krb5/krb/authdata_dec.c index 8e95b2a91..0a3dc14a9 100644 --- a/src/lib/krb5/krb/authdata_dec.c +++ b/src/lib/krb5/krb/authdata_dec.c @@ -92,8 +92,8 @@ grow_find_authdata(krb5_context context, struct find_authdata_context *fctx, if (fctx->length == fctx->space) { krb5_authdata **new; if (fctx->space >= 256) { - krb5_set_error_message(context, ERANGE, - "More than 256 authdata matched a query"); + k5_setmsg(context, ERANGE, + "More than 256 authdata matched a query"); return ERANGE; } new = realloc(fctx->out, diff --git a/src/lib/krb5/krb/fast.c b/src/lib/krb5/krb/fast.c index 8d622681e..02d580ffa 100644 --- a/src/lib/krb5/krb/fast.c +++ b/src/lib/krb5/krb/fast.c @@ -214,8 +214,8 @@ krb5int_fast_as_armor(krb5_context context, if (retval != 0) { const char * errmsg; errmsg = krb5_get_error_message(context, retval); - krb5_set_error_message(context, retval, - _("%s constructing AP-REQ armor"), errmsg); + k5_setmsg(context, retval, _("%s constructing AP-REQ armor"), + errmsg); krb5_free_error_message(context, errmsg); } } @@ -396,8 +396,8 @@ decrypt_fast_reply(krb5_context context, if (retval != 0) { const char * errmsg; errmsg = krb5_get_error_message(context, retval); - krb5_set_error_message(context, retval, - _("%s while decrypting FAST reply"), errmsg); + k5_setmsg(context, retval, _("%s while decrypting FAST reply"), + errmsg); krb5_free_error_message(context, errmsg); } if (retval == 0) @@ -405,9 +405,8 @@ decrypt_fast_reply(krb5_context context, if (retval == 0) { if (local_resp->nonce != state->nonce) { retval = KRB5_KDCREP_MODIFIED; - krb5_set_error_message(context, retval, - _("nonce modified in FAST response: " - "KDC response modified")); + k5_setmsg(context, retval, _("nonce modified in FAST response: " + "KDC response modified")); } } if (retval == 0) { @@ -471,9 +470,9 @@ krb5int_fast_process_error(krb5_context context, fx_error_pa = krb5int_find_pa_data(context, fast_response->padata, KRB5_PADATA_FX_ERROR); if (fx_error_pa == NULL) { - krb5_set_error_message(context, KRB5KDC_ERR_PREAUTH_FAILED, - _("Expecting FX_ERROR pa-data inside " - "FAST container")); + k5_setmsg(context, KRB5KDC_ERR_PREAUTH_FAILED, + _("Expecting FX_ERROR pa-data inside FAST " + "container")); retval = KRB5KDC_ERR_PREAUTH_FAILED; } } @@ -542,9 +541,8 @@ krb5int_fast_process_response(krb5_context context, if (retval == 0) { if (fast_response->finished == 0) { retval = KRB5_KDCREP_MODIFIED; - krb5_set_error_message(context, retval, - _("FAST response missing finish message " - "in KDC reply")); + k5_setmsg(context, retval, + _("FAST response missing finish message in KDC reply")); } } if (retval == 0) @@ -557,8 +555,7 @@ krb5int_fast_process_response(krb5_context context, &cksum_valid); if (retval == 0 && cksum_valid == 0) { retval = KRB5_KDCREP_MODIFIED; - krb5_set_error_message(context, retval, - _("Ticket modified in KDC reply")); + k5_setmsg(context, retval, _("Ticket modified in KDC reply")); } if (retval == 0) { krb5_free_principal(context, resp->client); diff --git a/src/lib/krb5/krb/gc_via_tkt.c b/src/lib/krb5/krb/gc_via_tkt.c index 92b53ecd0..4c0a1a461 100644 --- a/src/lib/krb5/krb/gc_via_tkt.c +++ b/src/lib/krb5/krb/gc_via_tkt.c @@ -204,19 +204,18 @@ krb5int_process_tgs_reply(krb5_context context, if (err_reply->text.length > 0) { switch (err_reply->error) { case KRB_ERR_GENERIC: - krb5_set_error_message(context, retval, - _("KDC returned error string: %.*s"), - err_reply->text.length, - err_reply->text.data); + k5_setmsg(context, retval, + _("KDC returned error string: %.*s"), + err_reply->text.length, err_reply->text.data); break; case KDC_ERR_S_PRINCIPAL_UNKNOWN: { char *s_name; if (err_reply->server && krb5_unparse_name(context, err_reply->server, &s_name) == 0) { - krb5_set_error_message(context, retval, - _("Server %s not found in Kerberos " - "database"), s_name); + k5_setmsg(context, retval, + _("Server %s not found in Kerberos database"), + s_name); krb5_free_unparsed_name(context, s_name); } else /* In case there's a stale S_PRINCIPAL_UNKNOWN diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index ebcb36213..88bad4c09 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -131,8 +131,8 @@ cleanup: return ret; verification_error: ret = KRB5_KDCREP_MODIFIED; - krb5_set_error_message(context, ret, _("Reply has wrong form of session " - "key for anonymous request")); + k5_setmsg(context, ret, + _("Reply has wrong form of session key for anonymous request")); goto cleanup; } @@ -1641,8 +1641,7 @@ init_creds_step_reply(krb5_context context, if (code !=0) { const char *msg; msg = krb5_get_error_message(context, code); - krb5_set_error_message(context, code, - _("%s while storing credentials"), msg); + k5_setmsg(context, code, _("%s while storing credentials"), msg); krb5_free_error_message(context, msg); } } @@ -1729,9 +1728,9 @@ cleanup: /* See if we can produce a more detailed error message */ code2 = krb5_unparse_name(context, ctx->request->client, &client_name); if (code2 == 0) { - krb5_set_error_message(context, code, - _("Client '%s' not found in Kerberos " - "database"), client_name); + k5_setmsg(context, code, + _("Client '%s' not found in Kerberos database"), + client_name); krb5_free_unparsed_name(context, client_name); } } diff --git a/src/lib/krb5/krb/gic_keytab.c b/src/lib/krb5/krb/gic_keytab.c index 4c2942e3f..f20af537f 100644 --- a/src/lib/krb5/krb/gic_keytab.c +++ b/src/lib/krb5/krb/gic_keytab.c @@ -203,9 +203,8 @@ krb5_init_creds_set_keytab(krb5_context context, if (etype_list == NULL) { ret = krb5_unparse_name(context, ctx->request->client, &name); if (ret == 0) { - krb5_set_error_message(context, KRB5_KT_NOTFOUND, - _("Keytab contains no suitable keys for " - "%s"), name); + k5_setmsg(context, KRB5_KT_NOTFOUND, + _("Keytab contains no suitable keys for %s"), name); } krb5_free_unparsed_name(context, name); return KRB5_KT_NOTFOUND; diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c index a696c711e..1edb949f4 100644 --- a/src/lib/krb5/krb/parse.c +++ b/src/lib/krb5/krb/parse.c @@ -199,9 +199,8 @@ krb5_parse_name_flags(krb5_context context, const char *name, if (!has_realm) { if (require_realm) { ret = KRB5_PARSE_MALFORMED; - krb5_set_error_message(context, ret, - _("Principal %s is missing required realm"), - name); + k5_setmsg(context, ret, + _("Principal %s is missing required realm"), name); goto cleanup; } if (!no_realm && !ignore_realm) { @@ -213,8 +212,7 @@ krb5_parse_name_flags(krb5_context context, const char *name, } } else if (no_realm) { ret = KRB5_PARSE_MALFORMED; - krb5_set_error_message(context, ret, - _("Principal %s has realm present"), name); + k5_setmsg(context, ret, _("Principal %s has realm present"), name); goto cleanup; } else if (ignore_realm) { krb5_free_data_contents(context, &princ->realm); diff --git a/src/lib/krb5/krb/plugin.c b/src/lib/krb5/krb/plugin.c index 9bb5d54fa..8b62c7b6e 100644 --- a/src/lib/krb5/krb/plugin.c +++ b/src/lib/krb5/krb/plugin.c @@ -160,8 +160,8 @@ parse_modstr(krb5_context context, const char *modstr, sep = strchr(modstr, ':'); if (sep == NULL) { - krb5_set_error_message(context, KRB5_PLUGIN_BAD_MODULE_SPEC, - _("Invalid module specifier %s"), modstr); + k5_setmsg(context, KRB5_PLUGIN_BAD_MODULE_SPEC, + _("Invalid module specifier %s"), modstr); return KRB5_PLUGIN_BAD_MODULE_SPEC; } @@ -397,9 +397,9 @@ k5_plugin_load(krb5_context context, int interface_id, const char *modname, break; } } - krb5_set_error_message(context, KRB5_PLUGIN_NAME_NOTFOUND, - _("Could not find %s plugin module named '%s'"), - interface_names[interface_id], modname); + k5_setmsg(context, KRB5_PLUGIN_NAME_NOTFOUND, + _("Could not find %s plugin module named '%s'"), + interface_names[interface_id], modname); return KRB5_PLUGIN_NAME_NOTFOUND; } diff --git a/src/lib/krb5/krb/preauth2.c b/src/lib/krb5/krb/preauth2.c index cda91b908..9f34b336c 100644 --- a/src/lib/krb5/krb/preauth2.c +++ b/src/lib/krb5/krb/preauth2.c @@ -1014,8 +1014,8 @@ krb5_preauth_supply_preauth_data(krb5_context context, k5_init_preauth_context(context); pctx = context->preauth_context; if (pctx == NULL) { - krb5_set_error_message(context, EINVAL, - _("Unable to initialize preauth context")); + k5_setmsg(context, EINVAL, + _("Unable to initialize preauth context")); return EINVAL; } } @@ -1029,8 +1029,8 @@ krb5_preauth_supply_preauth_data(krb5_context context, ret = clpreauth_gic_opts(context, h, opt, attr, value); if (ret) { emsg = krb5_get_error_message(context, ret); - krb5_set_error_message(context, ret, _("Preauth module %s: %s"), - h->vt.name, emsg); + k5_setmsg(context, ret, _("Preauth module %s: %s"), h->vt.name, + emsg); krb5_free_error_message(context, emsg); return ret; } diff --git a/src/lib/krb5/krb/preauth_otp.c b/src/lib/krb5/krb/preauth_otp.c index d343683c0..d9ddc8bf3 100644 --- a/src/lib/krb5/krb/preauth_otp.c +++ b/src/lib/krb5/krb/preauth_otp.c @@ -698,9 +698,8 @@ filter_tokeninfos(krb5_context context, const char *otpvalue, /* It is an error if we have no matching tokeninfos. */ if (filtered[0] == NULL) { free(filtered); - krb5_set_error_message(context, KRB5_PREAUTH_FAILED, - _("OTP value doesn't match " - "any token formats")); + k5_setmsg(context, KRB5_PREAUTH_FAILED, + _("OTP value doesn't match any token formats")); return KRB5_PREAUTH_FAILED; /* We have no supported tokeninfos. */ } @@ -912,8 +911,7 @@ filter_supported_tokeninfos(krb5_context context, krb5_otp_tokeninfo **tis) if (tis[0] != NULL) return 0; - krb5_set_error_message(context, KRB5_PREAUTH_FAILED, - _("No supported tokens")); + k5_setmsg(context, KRB5_PREAUTH_FAILED, _("No supported tokens")); return KRB5_PREAUTH_FAILED; /* We have no supported tokeninfos. */ } diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c index 637ff83d5..fbfe36eb0 100644 --- a/src/lib/krb5/krb/rd_req_dec.c +++ b/src/lib/krb5/krb/rd_req_dec.c @@ -142,15 +142,13 @@ keytab_fetch_error(krb5_context context, krb5_error_code code, return ret; if (krb5_principal_compare(context, princ, tkt_server)) { ret = KRB5KRB_AP_ERR_BADKEYVER; - krb5_set_error_message(context, ret, - _("Cannot find key for %s kvno %d in keytab"), - sname, (int)tkt_kvno); + k5_setmsg(context, ret, _("Cannot find key for %s kvno %d in keytab"), + sname, (int)tkt_kvno); } else { ret = KRB5KRB_AP_ERR_NOT_US; - krb5_set_error_message(context, ret, - _("Cannot find key for %s kvno %d in keytab " - "(request ticket server %s)"), - sname, (int)tkt_kvno, tsname); + k5_setmsg(context, ret, + _("Cannot find key for %s kvno %d in keytab (request ticket " + "server %s)"), sname, (int)tkt_kvno, tsname); } krb5_free_unparsed_name(context, sname); krb5_free_unparsed_name(context, tsname); @@ -173,9 +171,9 @@ integrity_error(krb5_context context, krb5_const_principal server, ret = krb5_principal_compare(context, server, tkt_server) ? KRB5KRB_AP_ERR_BAD_INTEGRITY : KRB5KRB_AP_ERR_NOT_US; - krb5_set_error_message(context, ret, - _("Cannot decrypt ticket for %s using keytab " - "key for %s"), tsname, sname); + k5_setmsg(context, ret, + _("Cannot decrypt ticket for %s using keytab key for %s"), + tsname, sname); krb5_free_unparsed_name(context, sname); krb5_free_unparsed_name(context, tsname); return ret; @@ -195,9 +193,9 @@ nomatch_error(krb5_context context, krb5_const_principal server, if (ret) return ret; - krb5_set_error_message(context, KRB5KRB_AP_ERR_NOT_US, - _("Server principal %s does not match request " - "ticket server %s"), sname, tsname); + k5_setmsg(context, KRB5KRB_AP_ERR_NOT_US, + _("Server principal %s does not match request ticket server %s"), + sname, tsname); krb5_free_unparsed_name(context, sname); krb5_free_unparsed_name(context, tsname); return KRB5KRB_AP_ERR_NOT_US; @@ -225,52 +223,49 @@ iteration_error(krb5_context context, krb5_const_principal server, if (!found_server_match) { ret = KRB5KRB_AP_ERR_NOKEY; if (sname == NULL) { - krb5_set_error_message(context, ret, _("No keys in keytab")); + k5_setmsg(context, ret, _("No keys in keytab")); } else { - krb5_set_error_message(context, ret, - _("Server principal %s does not match any " - "keys in keytab"), sname); + k5_setmsg(context, ret, + _("Server principal %s does not match any keys in " + "keytab"), sname); } } else if (tkt_server_mismatch) { assert(sname != NULL); /* Null server princ would match anything. */ ret = KRB5KRB_AP_ERR_NOT_US; - krb5_set_error_message(context, ret, - _("Request ticket server %s found in keytab " - "but does not match server principal %s"), - tsname, sname); + k5_setmsg(context, ret, + _("Request ticket server %s found in keytab but does not " + "match server principal %s"), tsname, sname); } else if (!found_tkt_server) { ret = KRB5KRB_AP_ERR_NOT_US; - krb5_set_error_message(context, ret, - _("Request ticket server %s not found in " - "keytab (ticket kvno %d)"), - tsname, (int)tkt_kvno); + k5_setmsg(context, ret, + _("Request ticket server %s not found in keytab (ticket " + "kvno %d)"), tsname, (int)tkt_kvno); } else if (!found_kvno) { ret = KRB5KRB_AP_ERR_BADKEYVER; if (found_higher_kvno) { - krb5_set_error_message(context, ret, - _("Request ticket server %s kvno %d not " - "found in keytab; ticket is likely out " - "of date"), tsname, (int)tkt_kvno); + k5_setmsg(context, ret, + _("Request ticket server %s kvno %d not found in " + "keytab; ticket is likely out of date"), + tsname, (int)tkt_kvno); } else { - krb5_set_error_message(context, ret, - _("Request ticket server %s kvno %d not " - "found in keytab; keytab is likely out " - "of date"), tsname, (int)tkt_kvno); + k5_setmsg(context, ret, + _("Request ticket server %s kvno %d not found in " + "keytab; keytab is likely out of date"), + tsname, (int)tkt_kvno); } } else if (!found_enctype) { /* There's no defined error for having the key version but not the * enctype. */ ret = KRB5KRB_AP_ERR_BADKEYVER; - krb5_set_error_message(context, ret, - _("Request ticket server %s kvno %d found in " - "keytab but not with enctype %s"), - tsname, (int)tkt_kvno, encname); + k5_setmsg(context, ret, + _("Request ticket server %s kvno %d found in keytab but not " + "with enctype %s"), tsname, (int)tkt_kvno, encname); } else { ret = KRB5KRB_AP_ERR_BAD_INTEGRITY; - krb5_set_error_message(context, ret, - _("Request ticket server %s kvno %d enctype %s " - "found in keytab but cannot decrypt ticket"), - tsname, (int)tkt_kvno, encname); + k5_setmsg(context, ret, + _("Request ticket server %s kvno %d enctype %s found in " + "keytab but cannot decrypt ticket"), + tsname, (int)tkt_kvno, encname); } krb5_free_unparsed_name(context, sname); @@ -905,9 +900,8 @@ negotiate_etype(krb5_context context, if (krb5_enctype_to_string(desired_etypes[i], enctype_name, sizeof(enctype_name)) == 0) - krb5_set_error_message(context, KRB5_NOPERM_ETYPE, - _("Encryption type %s not permitted"), - enctype_name); + k5_setmsg(context, KRB5_NOPERM_ETYPE, + _("Encryption type %s not permitted"), enctype_name); return KRB5_NOPERM_ETYPE; } } diff --git a/src/lib/krb5/krb/t_copy_context.c b/src/lib/krb5/krb/t_copy_context.c index 522fa0cc5..fa810be8a 100644 --- a/src/lib/krb5/krb/t_copy_context.c +++ b/src/lib/krb5/krb/t_copy_context.c @@ -153,7 +153,7 @@ main(int argc, char **argv) ctx->prompt_types = ptypes; check(k5_plugin_load_all(ctx, PLUGIN_INTERFACE_PWQUAL, &mods) == 0); k5_plugin_free_modules(ctx, mods); - krb5_set_error_message(ctx, ENOMEM, "nooooooooo"); + k5_setmsg(ctx, ENOMEM, "nooooooooo"); krb5_set_trace_callback(ctx, trace, ctx); /* Copy the intentionally messy context and verify the result. */ diff --git a/src/lib/krb5/os/expand_path.c b/src/lib/krb5/os/expand_path.c index f14e9acd8..144ccc836 100644 --- a/src/lib/krb5/os/expand_path.c +++ b/src/lib/krb5/os/expand_path.c @@ -58,9 +58,8 @@ expand_temp_folder(krb5_context context, PTYPE param, const char *postfix, size_t len; if (!GetTempPath(sizeof(tpath) / sizeof(tpath[0]), tpath)) { - krb5_set_error_message(context, EINVAL, - "Failed to get temporary path (GLE=%d)", - GetLastError()); + k5_setmsg(context, EINVAL, "Failed to get temporary path (GLE=%d)", + GetLastError()); return EINVAL; } @@ -167,23 +166,22 @@ expand_userid(krb5_context context, PTYPE param, const char *postfix, } if (le != 0) { - krb5_set_error_message(context, rv, - "Can't open thread token (GLE=%d)", le); + k5_setmsg(context, rv, "Can't open thread token (GLE=%d)", le); goto cleanup; } } if (!GetTokenInformation(hToken, TokenOwner, NULL, 0, &len)) { if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - krb5_set_error_message(context, rv, - "Unexpected error reading token " - "information (GLE=%d)", GetLastError()); + k5_setmsg(context, rv, + "Unexpected error reading token information (GLE=%d)", + GetLastError()); goto cleanup; } if (len == 0) { - krb5_set_error_message(context, rv, "GetTokenInformation() " - "returned truncated buffer"); + k5_setmsg(context, rv, + "GetTokenInformation() returned truncated buffer"); goto cleanup; } @@ -193,20 +191,20 @@ expand_userid(krb5_context context, PTYPE param, const char *postfix, goto cleanup; } } else { - krb5_set_error_message(context, rv, "GetTokenInformation() returned " - "truncated buffer"); + k5_setmsg(context, rv, + "GetTokenInformation() returned truncated buffer"); goto cleanup; } if (!GetTokenInformation(hToken, TokenOwner, pOwner, len, &len)) { - krb5_set_error_message(context, rv, "GetTokenInformation() failed. " - "GLE=%d", GetLastError()); + k5_setmsg(context, rv, + "GetTokenInformation() failed. GLE=%d", GetLastError()); goto cleanup; } if (!ConvertSidToStringSid(pOwner->Owner, &strSid)) { - krb5_set_error_message(context, rv, "Can't convert SID to string. " - "GLE=%d", GetLastError()); + k5_setmsg(context, rv, + "Can't convert SID to string. GLE=%d", GetLastError()); goto cleanup; } @@ -243,8 +241,7 @@ expand_csidl(krb5_context context, PTYPE folder, const char *postfix, if (SHGetFolderPath(NULL, folder, NULL, SHGFP_TYPE_CURRENT, path) != S_OK) { - krb5_set_error_message(context, EINVAL, - "Unable to determine folder path"); + k5_setmsg(context, EINVAL, "Unable to determine folder path"); return EINVAL; } @@ -316,9 +313,8 @@ expand_username(krb5_context context, PTYPE param, const char *postfix, char pwbuf[BUFSIZ]; if (k5_getpwuid_r(euid, &pwx, pwbuf, sizeof(pwbuf), &pw) != 0) { - krb5_set_error_message(context, ENOENT, - _("Can't find username for uid %lu"), - (unsigned long)euid); + k5_setmsg(context, ENOENT, _("Can't find username for uid %lu"), + (unsigned long)euid); return ENOENT; } *str = strdup(pw->pw_name); @@ -406,7 +402,7 @@ expand_token(krb5_context context, const char *token, const char *token_end, if (token[0] != '%' || token[1] != '{' || token_end[0] != '}' || token_end - token <= 2) { - krb5_set_error_message(context, EINVAL, _("Invalid token")); + k5_setmsg(context, EINVAL, _("Invalid token")); return EINVAL; } @@ -422,7 +418,7 @@ expand_token(krb5_context context, const char *token, const char *token_end, } } - krb5_set_error_message(context, EINVAL, _("Invalid token")); + k5_setmsg(context, EINVAL, _("Invalid token")); return EINVAL; } @@ -506,7 +502,7 @@ k5_expand_path_tokens_extra(krb5_context context, const char *path_in, tok_end = strchr(tok_begin, '}'); if (tok_end == NULL) { ret = EINVAL; - krb5_set_error_message(context, ret, _("variable missing }")); + k5_setmsg(context, ret, _("variable missing }")); goto cleanup; } diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c index 113680954..2fade13ee 100644 --- a/src/lib/krb5/os/locate_kdc.c +++ b/src/lib/krb5/os/locate_kdc.c @@ -654,8 +654,8 @@ k5_locate_server(krb5_context context, const krb5_data *realm, memset(serverlist, 0, sizeof(*serverlist)); if (realm == NULL || realm->data == NULL || realm->data[0] == 0) { - krb5_set_error_message(context, KRB5_REALM_CANT_RESOLVE, - "Cannot find KDC for invalid realm name \"\""); + k5_setmsg(context, KRB5_REALM_CANT_RESOLVE, + "Cannot find KDC for invalid realm name \"\""); return KRB5_REALM_CANT_RESOLVE; } @@ -665,9 +665,9 @@ k5_locate_server(krb5_context context, const krb5_data *realm, if (serverlist->nservers == 0) { k5_free_serverlist(serverlist); - krb5_set_error_message(context, KRB5_REALM_UNKNOWN, - _("Cannot find KDC for realm \"%.*s\""), - realm->length, realm->data); + k5_setmsg(context, KRB5_REALM_UNKNOWN, + _("Cannot find KDC for realm \"%.*s\""), + realm->length, realm->data); return KRB5_REALM_UNKNOWN; } return 0; diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c index f083c0fba..a7fa4612c 100644 --- a/src/lib/krb5/os/sendto_kdc.c +++ b/src/lib/krb5/os/sendto_kdc.c @@ -488,9 +488,9 @@ krb5_sendto_kdc(krb5_context context, const krb5_data *message, if (err == KDC_ERR_SVC_UNAVAILABLE) { retval = KRB5KDC_ERR_SVC_UNAVAILABLE; } else { - krb5_set_error_message(context, retval, - _("Cannot contact any KDC for realm " - "'%.*s'"), realm->length, realm->data); + k5_setmsg(context, retval, + _("Cannot contact any KDC for realm '%.*s'"), + realm->length, realm->data); } } if (retval) diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c index 1930d7e9d..7e3b7e951 100644 --- a/src/lib/krb5/rcache/rc_io.c +++ b/src/lib/krb5/rcache/rc_io.c @@ -102,16 +102,15 @@ krb5_rc_io_mkstemp(krb5_context context, krb5_rc_iostuff *d, char *dir) */ retval = fstat(d->fd, &stbuf); if (retval) { - krb5_set_error_message(context, retval, - _("Cannot fstat replay cache file %s: %s"), - d->fn, strerror(errno)); + k5_setmsg(context, retval, + _("Cannot fstat replay cache file %s: %s"), + d->fn, strerror(errno)); return KRB5_RC_IO_UNKNOWN; } if (stbuf.st_mode & 077) { - krb5_set_error_message(context, retval, - _("Insecure mkstemp() file mode for replay " - "cache file %s; try running this program " - "with umask 077 "), d->fn); + k5_setmsg(context, retval, + _("Insecure mkstemp() file mode for replay cache file %s; " + "try running this program with umask 077"), d->fn); return KRB5_RC_IO_UNKNOWN; } #endif @@ -141,15 +140,14 @@ rc_map_errno (krb5_context context, int e, const char *fn, case EACCES: case EROFS: case EEXIST: - krb5_set_error_message(context, KRB5_RC_IO_PERM, - _("Cannot %s replay cache file %s: %s"), - operation, fn, strerror(e)); + k5_setmsg(context, KRB5_RC_IO_PERM, + _("Cannot %s replay cache file %s: %s"), + operation, fn, strerror(e)); return KRB5_RC_IO_PERM; default: - krb5_set_error_message(context, KRB5_RC_IO_UNKNOWN, - _("Cannot %s replay cache: %s"), - operation, strerror(e)); + k5_setmsg(context, KRB5_RC_IO_UNKNOWN, _("Cannot %s replay cache: %s"), + operation, strerror(e)); return KRB5_RC_IO_UNKNOWN; } } @@ -261,22 +259,20 @@ krb5_rc_io_open_internal(krb5_context context, krb5_rc_iostuff *d, char *fn, || (sb1.st_mode & S_IFMT) != S_IFREG) { retval = KRB5_RC_IO_PERM; - krb5_set_error_message(context, retval, - "rcache not a file %s", d->fn); + k5_setmsg(context, retval, "rcache not a file %s", d->fn); goto cleanup; } /* check that non other can read/write/execute the file */ if (sb1.st_mode & 077) { - krb5_set_error_message(context, retval, - _("Insecure file mode for replay cache file " - "%s"), d->fn); + k5_setmsg(context, retval, + _("Insecure file mode for replay cache file %s"), d->fn); return KRB5_RC_IO_UNKNOWN; } /* owned by me */ if (sb1.st_uid != geteuid()) { retval = KRB5_RC_IO_PERM; - krb5_set_error_message(context, retval, _("rcache not owned by %d"), - (int)geteuid()); + k5_setmsg(context, retval, _("rcache not owned by %d"), + (int)geteuid()); goto cleanup; } #endif @@ -398,20 +394,17 @@ krb5_rc_io_write(krb5_context context, krb5_rc_iostuff *d, krb5_pointer buf, #endif case EFBIG: case ENOSPC: - krb5_set_error_message (context, KRB5_RC_IO_SPACE, - _("Can't write to replay cache: %s"), - strerror(errno)); + k5_setmsg(context, KRB5_RC_IO_SPACE, + _("Can't write to replay cache: %s"), strerror(errno)); return KRB5_RC_IO_SPACE; case EIO: - krb5_set_error_message (context, KRB5_RC_IO_IO, - _("Can't write to replay cache: %s"), - strerror(errno)); + k5_setmsg(context, KRB5_RC_IO_IO, + _("Can't write to replay cache: %s"), strerror(errno)); return KRB5_RC_IO_IO; case EBADF: default: - krb5_set_error_message (context, KRB5_RC_IO_UNKNOWN, - _("Can't write to replay cache: %s"), - strerror(errno)); + k5_setmsg(context, KRB5_RC_IO_UNKNOWN, + _("Can't write to replay cache: %s"), strerror(errno)); return KRB5_RC_IO_UNKNOWN; } return 0; @@ -431,9 +424,8 @@ krb5_rc_io_sync(krb5_context context, krb5_rc_iostuff *d) case EBADF: return KRB5_RC_IO_UNKNOWN; case EIO: return KRB5_RC_IO_IO; default: - krb5_set_error_message(context, KRB5_RC_IO_UNKNOWN, - _("Cannot sync replay cache file: %s"), - strerror(errno)); + k5_setmsg(context, KRB5_RC_IO_UNKNOWN, + _("Cannot sync replay cache file: %s"), strerror(errno)); return KRB5_RC_IO_UNKNOWN; } } @@ -451,9 +443,8 @@ krb5_rc_io_read(krb5_context context, krb5_rc_iostuff *d, krb5_pointer buf, case EIO: return KRB5_RC_IO_IO; case EBADF: default: - krb5_set_error_message(context, KRB5_RC_IO_UNKNOWN, - _("Can't read from replay cache: %s"), - strerror(errno)); + k5_setmsg(context, KRB5_RC_IO_UNKNOWN, + _("Can't read from replay cache: %s"), strerror(errno)); return KRB5_RC_IO_UNKNOWN; } if (count < 0 || (unsigned int)count != num) @@ -483,22 +474,19 @@ krb5_rc_io_destroy(krb5_context context, krb5_rc_iostuff *d) switch(errno) { case EIO: - krb5_set_error_message(context, KRB5_RC_IO_IO, - _("Can't destroy replay cache: %s"), - strerror(errno)); + k5_setmsg(context, KRB5_RC_IO_IO, + _("Can't destroy replay cache: %s"), strerror(errno)); return KRB5_RC_IO_IO; case EPERM: case EBUSY: case EROFS: - krb5_set_error_message(context, KRB5_RC_IO_PERM, - _("Can't destroy replay cache: %s"), - strerror(errno)); + k5_setmsg(context, KRB5_RC_IO_PERM, + _("Can't destroy replay cache: %s"), strerror(errno)); return KRB5_RC_IO_PERM; case EBADF: default: - krb5_set_error_message(context, KRB5_RC_IO_UNKNOWN, - _("Can't destroy replay cache: %s"), - strerror(errno)); + k5_setmsg(context, KRB5_RC_IO_UNKNOWN, + _("Can't destroy replay cache: %s"), strerror(errno)); return KRB5_RC_IO_UNKNOWN; } return 0; |