Skip to content

Commit

Permalink
Improve LDAP KDB initialization error messages
Browse files Browse the repository at this point in the history
In krb5_ldap_initialize, don't just blat the LDAP error into the
extended message; give an indication of which LDAP operation we were
trying to do and show what parameters we gave to it.

(Also, krb5_set_error_message can handle a null context argument, so
don't bother to check before calling.)

(cherry picked from commit 5a77bb8)

ticket: 7739
version_fixed: 1.12
status: resolved
  • Loading branch information
greghudson authored and tlyu committed Oct 30, 2013
1 parent a3e57d4 commit eca887c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
Expand Up @@ -113,9 +113,9 @@ krb5_ldap_initialize(krb5_ldap_context *ldap_context,

/* ldap init */
if ((st = ldap_initialize(&ldap_server_handle->ldap_handle, server_info->server_name)) != 0) {
if (ldap_context->kcontext)
krb5_set_error_message (ldap_context->kcontext, KRB5_KDB_ACCESS_ERROR, "%s",
ldap_err2string(st));
krb5_set_error_message(ldap_context->kcontext, KRB5_KDB_ACCESS_ERROR,
_("Cannot create LDAP handle for '%s': %s"),
server_info->server_name, ldap_err2string(st));
st = KRB5_KDB_ACCESS_ERROR;
goto err_out;
}
Expand All @@ -125,10 +125,10 @@ krb5_ldap_initialize(krb5_ldap_context *ldap_context,
server_info->server_status = ON;
krb5_update_ldap_handle(ldap_server_handle, server_info);
} else {
if (ldap_context->kcontext)
krb5_set_error_message (ldap_context->kcontext,
KRB5_KDB_ACCESS_ERROR, "%s",
ldap_err2string(st));
krb5_set_error_message(ldap_context->kcontext, KRB5_KDB_ACCESS_ERROR,
_("Cannot bind to LDAP server '%s' as '%s'"
": %s"), server_info->server_name,
ldap_context->bind_dn, ldap_err2string(st));
st = KRB5_KDB_ACCESS_ERROR;
server_info->server_status = OFF;
time(&server_info->downtime);
Expand Down

0 comments on commit eca887c

Please sign in to comment.