From 08d4af049f14c5099efacfce95eea34778faebff Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Tue, 18 Jan 2005 22:15:34 +0000 Subject: [PATCH] cleanup error logging --- servers/slurpd/ldap_op.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c index 3d7311080b..16d719867a 100644 --- a/servers/slurpd/ldap_op.c +++ b/servers/slurpd/ldap_op.c @@ -103,9 +103,9 @@ do_ldap( lderr = op_ldap_add( ri, re, errmsg, errfree ); if ( lderr != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_ANY, - "Error: ldap_add_s failed adding \"%s\": %s\n", - *errmsg ? *errmsg : ldap_err2string( lderr ), - re->re_dn, 0 ); + "Error: ldap_add_s failed adding DN \"%s\": %s\n", + re->re_dn, *errmsg && (*errmsg)[0] ? + *errmsg : ldap_err2string( lderr ), 0 ); } break; @@ -113,9 +113,9 @@ do_ldap( lderr = op_ldap_modify( ri, re, errmsg, errfree ); if ( lderr != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_ANY, - "Error: ldap_modify_s failed modifying \"%s\": %s\n", - *errmsg ? *errmsg : ldap_err2string( lderr ), - re->re_dn, 0 ); + "Error: ldap_modify_s failed modifying DN \"%s\": %s\n", + re->re_dn, *errmsg && (*errmsg)[0] ? + *errmsg : ldap_err2string( lderr ), 0 ); } break; @@ -123,9 +123,9 @@ do_ldap( lderr = op_ldap_delete( ri, re, errmsg, errfree ); if ( lderr != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_ANY, - "Error: ldap_delete_s failed deleting \"%s\": %s\n", - *errmsg ? *errmsg : ldap_err2string( lderr ), - re->re_dn, 0 ); + "Error: ldap_delete_s failed deleting DN \"%s\": %s\n", + re->re_dn, *errmsg && (*errmsg)[0] ? + *errmsg : ldap_err2string( lderr ), 0 ); } break; @@ -133,15 +133,15 @@ do_ldap( lderr = op_ldap_modrdn( ri, re, errmsg, errfree ); if ( lderr != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_ANY, - "Error: ldap_modrdn_s failed modifying %s: %s\n", - *errmsg ? *errmsg : ldap_err2string( lderr ), - re->re_dn, 0 ); + "Error: ldap_modrdn_s failed modifying DN \"%s\": %s\n", + re->re_dn, *errmsg && (*errmsg)[0] ? + *errmsg : ldap_err2string( lderr ), 0 ); } break; default: Debug( LDAP_DEBUG_ANY, - "Error: do_ldap: bad op \"%d\", dn = \"%s\"\n", + "Error: do_ldap: bad op \"%d\", DN \"%s\"\n", re->re_changetype, re->re_dn, 0 ); return DO_LDAP_ERR_FATAL; } -- 2.39.5