From d637308ceb667ebc1138b1cabe2bbe699288e0ce Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Wed, 21 Jan 2009 01:30:42 +0000 Subject: [PATCH] make messages more esplicative; fix style --- servers/slapd/back-bdb/dn2id.c | 7 +++++-- servers/slapd/back-bdb/modify.c | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c index fd557ea294..ccf7d0c56a 100644 --- a/servers/slapd/back-bdb/dn2id.c +++ b/servers/slapd/back-bdb/dn2id.c @@ -89,8 +89,11 @@ bdb_dn2id_add( /* store it -- don't override */ rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE ); if( rc != 0 ) { - Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add 0x%lx: put failed: %s %d\n", - e->e_id, db_strerror(rc), rc ); + char buf[ SLAP_TEXT_BUFLEN ]; + snprintf( buf, sizeof( buf ), "%s => bdb_dn2id_add dn=\"%s\" ID=0x%lx", + op->o_log_prefix, e->e_name.bv_val, e->e_id ); + Debug( LDAP_DEBUG_ANY, "%s: put failed: %s %d\n", + buf, db_strerror(rc), rc ); goto done; } diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c index 0ae77b443e..6ef43ca76d 100644 --- a/servers/slapd/back-bdb/modify.c +++ b/servers/slapd/back-bdb/modify.c @@ -287,11 +287,11 @@ int bdb_modify_internal( rc = bdb_index_values( op, tid, ap->a_desc, vals, e->e_id, SLAP_INDEX_DELETE_OP ); if ( rc != LDAP_SUCCESS ) { + Debug( LDAP_DEBUG_ANY, + "%s: attribute \"%s\" index delete failure\n", + op->o_log_prefix, ap->a_desc->ad_cname.bv_val, 0 ); attrs_free( e->e_attrs ); e->e_attrs = save_attrs; - Debug( LDAP_DEBUG_ANY, - "Attribute index delete failure", - 0, 0, 0 ); return rc; } } @@ -306,11 +306,11 @@ int bdb_modify_internal( ap->a_nvals, e->e_id, SLAP_INDEX_ADD_OP ); if ( rc != LDAP_SUCCESS ) { + Debug( LDAP_DEBUG_ANY, + "%s: attribute \"%s\" index add failure\n", + op->o_log_prefix, ap->a_desc->ad_cname.bv_val, 0 ); attrs_free( e->e_attrs ); e->e_attrs = save_attrs; - Debug( LDAP_DEBUG_ANY, - "Attribute index add failure", - 0, 0, 0 ); return rc; } } -- 2.39.5