diff options
Diffstat (limited to 'src/lib/kdb/kdb5.c')
| -rw-r--r-- | src/lib/kdb/kdb5.c | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c index 8233a48cc..4b4bb49a7 100644 --- a/src/lib/kdb/kdb5.c +++ b/src/lib/kdb/kdb5.c @@ -218,9 +218,8 @@ get_conf_section(krb5_context context, char **section) status = krb5_get_default_realm(context, &defrealm); if (status) { - krb5_set_error_message(context, KRB5_KDB_SERVER_INTERNAL_ERR, - _("No default realm set; cannot initialize " - "KDB")); + k5_setmsg(context, KRB5_KDB_SERVER_INTERNAL_ERR, + _("No default realm set; cannot initialize KDB")); return KRB5_KDB_SERVER_INTERNAL_ERR; } status = profile_get_string(context->profile, @@ -324,9 +323,8 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *libptr) vftabl_addr = &krb5_ldap_kdb_function_table; #endif if (!vftabl_addr) { - krb5_set_error_message(kcontext, KRB5_KDB_DBTYPE_NOTFOUND, - _("Unable to find requested database type: %s"), - lib_name); + k5_setmsg(kcontext, KRB5_KDB_DBTYPE_NOTFOUND, + _("Unable to find requested database type: %s"), lib_name); return KRB5_PLUGIN_OP_NOTSUPP; } @@ -407,9 +405,8 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *lib) &(*lib)->dl_dir_handle, &kcontext->err))) { const char *err_str = krb5_get_error_message(kcontext, status); status = KRB5_KDB_DBTYPE_NOTFOUND; - krb5_set_error_message(kcontext, status, - _("Unable to find requested database type: %s"), - err_str); + k5_setmsg(kcontext, status, + _("Unable to find requested database type: %s"), err_str); krb5_free_error_message(kcontext, err_str); goto clean_n_exit; } @@ -418,9 +415,9 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *lib) &vftabl_addrs, &kcontext->err))) { const char *err_str = krb5_get_error_message(kcontext, status); status = KRB5_KDB_DBTYPE_INIT; - krb5_set_error_message(kcontext, status, - _("plugin symbol 'kdb_function_table' lookup " - "failed: %s"), err_str); + k5_setmsg(kcontext, status, + _("plugin symbol 'kdb_function_table' lookup failed: %s"), + err_str); krb5_free_error_message(kcontext, err_str); goto clean_n_exit; } @@ -428,10 +425,9 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *lib) if (vftabl_addrs[0] == NULL) { /* No plugins! */ status = KRB5_KDB_DBTYPE_NOTFOUND; - krb5_set_error_message(kcontext, status, - _("Unable to load requested database module " - "'%s': plugin symbol 'kdb_function_table' " - "not found"), lib_name); + k5_setmsg(kcontext, status, + _("Unable to load requested database module '%s': plugin " + "symbol 'kdb_function_table' not found"), lib_name); goto clean_n_exit; } @@ -1653,9 +1649,9 @@ krb5_dbe_lookup_mkey_aux(krb5_context context, krb5_db_entry *entry, prev_data = new_data; } } else { - krb5_set_error_message(context, KRB5_KDB_BAD_VERSION, - _("Illegal version number for " - "KRB5_TL_MKEY_AUX %d\n"), version); + k5_setmsg(context, KRB5_KDB_BAD_VERSION, + _("Illegal version number for KRB5_TL_MKEY_AUX %d\n"), + version); return (KRB5_KDB_BAD_VERSION); } } @@ -1822,9 +1818,9 @@ krb5_dbe_lookup_actkvno(krb5_context context, krb5_db_entry *entry, next_tuple += ACTKVNO_TUPLE_SIZE; } } else { - krb5_set_error_message(context, KRB5_KDB_BAD_VERSION, - _("Illegal version number for " - "KRB5_TL_ACTKVNO %d\n"), version); + k5_setmsg(context, KRB5_KDB_BAD_VERSION, + _("Illegal version number for KRB5_TL_ACTKVNO %d\n"), + version); return (KRB5_KDB_BAD_VERSION); } } |