From b81ea8dcbc64153b8e2fc53d5c12c16ea63fc642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Fri, 3 Feb 2006 12:17:10 +0000 Subject: [PATCH] Log the filter string to the error message. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16690 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/hdb/hdb-ldap.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/hdb/hdb-ldap.c b/lib/hdb/hdb-ldap.c index ee8e85e1b..31606a1cf 100644 --- a/lib/hdb/hdb-ldap.c +++ b/lib/hdb/hdb-ldap.c @@ -729,6 +729,7 @@ LDAP_dn2principal(krb5_context context, HDB * db, const char *dn, { krb5_error_code ret; int rc; + const char *filter = "(objectClass=krb5Principal)"; char **values; LDAPMessage *res = NULL, *e; @@ -737,11 +738,11 @@ LDAP_dn2principal(krb5_context context, HDB * db, const char *dn, goto out; rc = ldap_search_s(HDB2LDAP(db), dn, LDAP_SCOPE_SUBTREE, - "(objectClass=krb5Principal)", krb5principal_attrs, + filter, krb5principal_attrs, 0, &res); if (check_ldap(context, db, rc)) { - krb5_set_error_string(context, "ldap_search_s: %s", - ldap_err2string(rc)); + krb5_set_error_string(context, "ldap_search_s: filter: %s error: %s", + filter, ldap_err2string(rc)); ret = HDB_ERR_NOENTRY; goto out; } @@ -799,8 +800,8 @@ LDAP__lookup_princ(krb5_context context, rc = ldap_search_s(HDB2LDAP(db), HDB2BASE(db), LDAP_SCOPE_SUBTREE, filter, krb5kdcentry_attrs, 0, msg); if (check_ldap(context, db, rc)) { - krb5_set_error_string(context, "ldap_search_s: %s", - ldap_err2string(rc)); + krb5_set_error_string(context, "ldap_search_s: filter: %s - error: %s", + filter, ldap_err2string(rc)); ret = HDB_ERR_NOENTRY; goto out; } @@ -827,8 +828,9 @@ LDAP__lookup_princ(krb5_context context, rc = ldap_search_s(HDB2LDAP(db), HDB2BASE(db), LDAP_SCOPE_SUBTREE, filter, krb5kdcentry_attrs, 0, msg); if (check_ldap(context, db, rc)) { - krb5_set_error_string(context, "ldap_search_s: %s", - ldap_err2string(rc)); + krb5_set_error_string(context, + "ldap_search_s: filter: %s error: %s", + filter, ldap_err2string(rc)); ret = HDB_ERR_NOENTRY; goto out; }