diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-10-28 11:23:11 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-10-30 12:38:03 -0400 |
| commit | 5a77bb85294f37d1dfa4c7faedfdfb0d7faaf8dc (patch) | |
| tree | 2ee2c3a24e06c62f22184b7146c458cba1c364f9 | |
| parent | 7b7e72f66cda405967b2a1da0b5ff8141feb0eb1 (diff) | |
| download | krb5-5a77bb85294f37d1dfa4c7faedfdfb0d7faaf8dc.tar.gz krb5-5a77bb85294f37d1dfa4c7faedfdfb0d7faaf8dc.tar.xz krb5-5a77bb85294f37d1dfa4c7faedfdfb0d7faaf8dc.zip | |
Improve LDAP KDB initialization error messages
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.)
ticket: 7739 (new)
target_version: 1.12
tags: pullup
| -rw-r--r-- | src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c index 02fbadc421..b2730d689d 100644 --- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c +++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c @@ -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; } @@ -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); |