Skip to content
GitLab
Commit 76df74db authored by Ondřej Kuzník's avatar Ondřej Kuzník
Browse files

ITS#8731 Apply doc/devel/variadic_debug/07-shortcut.cocci

parent 251ce83d
Hide whitespace changes
Inline Side-by-side
servers/slapd/aclparse.c
View file @ 76df74db
......@@ -168,12 +168,9 @@ regtest(const char *fname, int lineno, char *pat) {
regerror(e, &re, error, sizeof(error));
snprintf( buf, sizeof( buf ),
"regular expression \"%s\" bad because of %s",
pat, error );
Debug( LDAP_DEBUG_ANY,
"%s: line %d: %s\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_ANY,
"%s: line %d: regular expression \"%s\" bad because of %s\n",
fname, lineno, pat, error );
acl_usage();
exit( EXIT_FAILURE );
}
......@@ -515,16 +512,11 @@ parse_acl(
if( !mr_usable_with_at( a->acl_attrval_mr, a->acl_attrs[ 0 ].an_desc->ad_type ) )
{
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"matching rule \"%s\" use "
"with attr \"%s\" not appropriate.",
mr, a->acl_attrs[ 0 ].an_name.bv_val );
Debug( LDAP_DEBUG_ANY, "%s: line %d: %s\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_ANY,
"%s: line %d: matching rule \"%s\" use " "with attr \"%s\" not appropriate.\n",
fname, lineno,
mr,
a->acl_attrs[0].an_name.bv_val );
goto fail;
}
}
......@@ -539,12 +531,12 @@ parse_acl(
regerror( e, &a->acl_attrval_re, err, sizeof( err ) );
snprintf( buf, sizeof( buf ),
"regular expression \"%s\" bad because of %s",
right, err );
Debug( LDAP_DEBUG_ANY, "%s: line %d: %s\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_ANY,
"%s: line %d: regular expression \"%s\" bad because of %s\n",
fname,
lineno,
right,
err );
goto fail;
}
a->acl_attrval_style = ACL_STYLE_REGEX;
......@@ -574,45 +566,34 @@ parse_acl(
} else if ( !strcasecmp( style, "children" ) ) {
a->acl_attrval_style = ACL_STYLE_CHILDREN;
} else {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"unknown val.<style> \"%s\" for attributeType \"%s\" "
"with DN syntax.",
style,
a->acl_attrs[0].an_desc->ad_cname.bv_val );
Debug( LDAP_DEBUG_CONFIG | LDAP_DEBUG_ACL,
"%s: line %d: %s\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_CONFIG | LDAP_DEBUG_ACL,
"%s: line %d: unknown val.<style> \"%s\" for attributeType \"%s\" " "with DN syntax.\n",
fname,
lineno,
style,
a->acl_attrs[0].an_desc->ad_cname.bv_val );
goto fail;
}
rc = dnNormalize( 0, NULL, NULL, &bv, &a->acl_attrval, NULL );
if ( rc != LDAP_SUCCESS ) {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"unable to normalize DN \"%s\" "
"for attributeType \"%s\" (%d).",
bv.bv_val,
a->acl_attrs[0].an_desc->ad_cname.bv_val,
rc );
Debug( LDAP_DEBUG_ANY,
"%s: line %d: %s\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_ANY,
"%s: line %d: unable to normalize DN \"%s\" " "for attributeType \"%s\" (%d).\n",
fname,
lineno,
bv.bv_val,
a->acl_attrs[0].an_desc->ad_cname.bv_val,
rc );
goto fail;
}
} else {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"unknown val.<style> \"%s\" for attributeType \"%s\".",
style, a->acl_attrs[0].an_desc->ad_cname.bv_val );
Debug( LDAP_DEBUG_CONFIG | LDAP_DEBUG_ACL,
"%s: line %d: %s\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_CONFIG | LDAP_DEBUG_ACL,
"%s: line %d: unknown val.<style> \"%s\" for attributeType \"%s\".\n",
fname,
lineno,
style,
a->acl_attrs[0].an_desc->ad_cname.bv_val );
goto fail;
}
}
......@@ -646,14 +627,12 @@ parse_acl(
&text,
NULL );
if ( rc != LDAP_SUCCESS ) {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ), "%s: line %d: "
" attr \"%s\" normalization failed (%d: %s)",
fname, lineno,
a->acl_attrs[ 0 ].an_name.bv_val, rc, text );
Debug( LDAP_DEBUG_ANY, "%s: line %d: %s.\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_ANY,
"%s: line %d: %s: line %d: " " attr \"%s\" normalization failed (%d: %s).\n",
fname, lineno,
fname, lineno,
a->acl_attrs[0].an_name.bv_val,
rc, text );
goto fail;
}
}
......@@ -697,11 +676,10 @@ parse_acl(
buf[ SLAP_TEXT_BUFLEN ];
regerror( e, &a->acl_dn_re, err, sizeof( err ) );
snprintf( buf, sizeof( buf ),
"regular expression \"%s\" bad because of %s",
right, err );
Debug( LDAP_DEBUG_ANY, "%s: line %d: %s\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_ANY,
"%s: line %d: regular expression \"%s\" bad because of %s\n",
fname, lineno, right,
err );
goto fail;
}
}
......@@ -1061,14 +1039,10 @@ parse_acl(
rc = slap_str2ad( right, &bdn->a_at, &text );
if( rc != LDAP_SUCCESS ) {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"dnattr \"%s\": %s",
right, text );
Debug( LDAP_DEBUG_ANY,
"%s: line %d: %s\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_ANY,
"%s: line %d: dnattr \"%s\": %s\n",
fname, lineno, right,
text );
goto fail;
}
......@@ -1078,16 +1052,10 @@ parse_acl(
!is_at_syntax( bdn->a_at->ad_type,
SLAPD_NAMEUID_SYNTAX ))
{
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"dnattr \"%s\": "
"inappropriate syntax: %s\n",
right,
bdn->a_at->ad_type->sat_syntax_oid );
Debug( LDAP_DEBUG_ANY,
"%s: line %d: %s\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_ANY,
"%s: line %d: dnattr \"%s\": " "inappropriate syntax: %s\n\n",
fname, lineno, right,
bdn->a_at->ad_type->sat_syntax_oid );
goto fail;
}
......@@ -1230,14 +1198,10 @@ parse_acl(
rc = slap_str2ad( attr_name, &b->a_group_at, &text );
if ( rc != LDAP_SUCCESS ) {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"group \"%s\": %s.",
right, text );
Debug( LDAP_DEBUG_ANY,
"%s: line %d: %s\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_ANY,
"%s: line %d: group \"%s\": %s.\n",
fname, lineno, right,
text );
goto fail;
}
......@@ -1248,19 +1212,11 @@ parse_acl(
&& !is_at_subtype( b->a_group_at->ad_type,
slap_schema.si_ad_labeledURI->ad_type ) /* e.g. memberURL */ )
{
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"group \"%s\" attr \"%s\": inappropriate syntax: %s; "
"must be " SLAPD_DN_SYNTAX " (DN), "
SLAPD_NAMEUID_SYNTAX " (NameUID) "
"or a subtype of labeledURI.",
right,
attr_name,
at_syntax( b->a_group_at->ad_type ) );
Debug( LDAP_DEBUG_ANY,
"%s: line %d: %s\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_ANY,
"%s: line %d: group \"%s\" attr \"%s\": inappropriate syntax: %s; " "must be " SLAPD_DN_SYNTAX " (DN), " SLAPD_NAMEUID_SYNTAX " (NameUID) " "or a subtype of labeledURI.\n",
fname, lineno, right,
attr_name,
at_syntax(b->a_group_at->ad_type) );
goto fail;
}
......@@ -1276,14 +1232,11 @@ parse_acl(
ocs, NULL );
if( rc != 0 ) {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"group: \"%s\" not allowed by \"%s\".",
b->a_group_at->ad_cname.bv_val,
b->a_group_oc->soc_oid );
Debug( LDAP_DEBUG_ANY, "%s: line %d: %s\n",
fname, lineno, buf );
Debug(LDAP_DEBUG_ANY,
"%s: line %d: group: \"%s\" not allowed by \"%s\".\n",
fname, lineno,
b->a_group_at->ad_cname.bv_val,
b->a_group_oc->soc_oid );
goto fail;
}
}
......
servers/slapd/back-asyncmeta/bind.c
View file @ 76df74db
......@@ -96,19 +96,11 @@ asyncmeta_back_bind( Operation *op, SlapReply *rs )
* invalidCredentials */
mc = asyncmeta_getconn( op, rs, candidates, NULL, LDAP_BACK_BIND_DONTSEND, 1 );
if ( !mc ) {
if ( LogTest( LDAP_DEBUG_ANY ) ) {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"asyncmeta_back_bind: no target "
"for dn \"%s\" (%d%s%s).",
op->o_req_dn.bv_val, rs->sr_err,
rs->sr_text ? ". " : "",
rs->sr_text ? rs->sr_text : "" );
Debug( LDAP_DEBUG_ANY,
"%s %s\n",
op->o_log_prefix, buf );
}
Debug(LDAP_DEBUG_ANY,
"%s asyncmeta_back_bind: no target " "for dn \"%s\" (%d%s%s).\n",
op->o_log_prefix, op->o_req_dn.bv_val,
rs->sr_err, rs->sr_text ? ". " : "",
rs->sr_text ? rs->sr_text : "" );
/* FIXME: there might be cases where we don't want
* to map the error onto invalidCredentials */
......@@ -341,12 +333,10 @@ retry:;
ldap_get_option( msc->msc_ld, LDAP_OPT_ERROR_NUMBER,
&rs->sr_err );
snprintf( buf, sizeof( buf ),
"err=%d (%s) nretries=%d",
rs->sr_err, ldap_err2string( rs->sr_err ), nretries );
Debug( LDAP_DEBUG_ANY,
"### %s asyncmeta_bind_op_result[%d]: %s.\n",
op->o_log_prefix, candidate, buf );
Debug(LDAP_DEBUG_ANY,
"### %s asyncmeta_bind_op_result[%d]: err=%d (%s) nretries=%d.\n",
op->o_log_prefix, candidate, rs->sr_err,
ldap_err2string(rs->sr_err), nretries );
break;
default:
......@@ -973,18 +963,11 @@ retry:;
rs->sr_err = slap_map_api2result( rs );
if ( LogTest( LDAP_DEBUG_ANY ) ) {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"asyncmeta_back_op_result[%d] "
"err=%d text=\"%s\" matched=\"%s\"",
i, rs->sr_err,
( xtext ? xtext : "" ),
( xmatched ? xmatched : "" ) );
Debug( LDAP_DEBUG_ANY, "%s %s.\n",
op->o_log_prefix, buf );
}
Debug(LDAP_DEBUG_ANY,
"%s asyncmeta_back_op_result[%d] " "err=%d text=\"%s\" matched=\"%s\".\n",
op->o_log_prefix, i, rs->sr_err,
(xtext ? xtext : ""),
(xmatched ? xmatched : "") );
/*
* FIXME: need to rewrite "match" (need rwinfo)
......@@ -1711,12 +1694,11 @@ asyncmeta_dobind_init(Operation *op, SlapReply *rs, bm_context_t *bc, a_metaconn
bound = 1;
}
snprintf( buf, sizeof( buf ), " mc=%p ld=%p%s DN=\"%s\"",
(void *)mc, (void *)msc->msc_ld,
bound ? " bound" : " anonymous",
bound == 0 ? "" : msc->msc_bound_ndn.bv_val );
Debug( LDAP_DEBUG_ANY, "### %s asyncmeta_search_dobind_init[%d]%s\n",
op->o_log_prefix, candidate, buf );
Debug(LDAP_DEBUG_ANY,
"### %s asyncmeta_search_dobind_init[%d] mc=%p ld=%p%s DN=\"%s\"\n",
op->o_log_prefix, candidate, (void *)mc,
(void *)msc->msc_ld, bound ? " bound" : " anonymous",
bound == 0 ? "" : msc->msc_bound_ndn.bv_val );
#endif /* DEBUG_205 */
retcode = META_SEARCH_CANDIDATE;
......@@ -1727,10 +1709,10 @@ asyncmeta_dobind_init(Operation *op, SlapReply *rs, bm_context_t *bc, a_metaconn
#ifdef DEBUG_205
char buf[ SLAP_TEXT_BUFLEN ] = { '\0' };
snprintf( buf, sizeof( buf ), " mc=%p ld=%p needbind",
(void *)mc, (void *)msc->msc_ld );
Debug( LDAP_DEBUG_ANY, "### %s asyncmeta_search_dobind_init[%d]%s\n",
op->o_log_prefix, candidate, buf );
Debug(LDAP_DEBUG_ANY,
"### %s asyncmeta_search_dobind_init[%d] mc=%p ld=%p needbind\n",
op->o_log_prefix, candidate, (void *)mc,
(void *)msc->msc_ld );
#endif /* DEBUG_205 */
candidates[ candidate ].sr_msgid = META_MSGID_NEED_BIND;
......@@ -1742,10 +1724,10 @@ asyncmeta_dobind_init(Operation *op, SlapReply *rs, bm_context_t *bc, a_metaconn
#ifdef DEBUG_205
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ), " mc=%p ld=%p binding",
(void *)mc, (void *)msc->msc_ld );
Debug( LDAP_DEBUG_ANY, "### %s asyncmeta_search_dobind_init[%d]%s\n",
op->o_log_prefix, candidate, buf );
Debug(LDAP_DEBUG_ANY,
"### %s asyncmeta_search_dobind_init[%d] mc=%p ld=%p binding\n",
op->o_log_prefix, candidate, (void *)mc,
(void *)msc->msc_ld );
#endif /* DEBUG_205 */
if ( msc->msc_ld == NULL ) {
......@@ -1858,14 +1840,10 @@ retry_bind:
candidates[ candidate ].sr_msgid = msgid;
asyncmeta_set_msc_time(msc);
#ifdef DEBUG_205
{
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ), "asyncmeta_search_dobind_init[%d] mc=%p ld=%p rc=%d",
candidate, (void *)mc, (void *)mc->mc_conns[ candidate ].msc_ld, rc );
Debug( LDAP_DEBUG_ANY, "### %s %s\n",
op->o_log_prefix, buf );
}
Debug(LDAP_DEBUG_ANY,
"### %s asyncmeta_search_dobind_init[%d] mc=%p ld=%p rc=%d\n",
op->o_log_prefix, candidate, (void *)mc,
(void *)mc->mc_conns[candidate].msc_ld, rc );
#endif /* DEBUG_205 */
switch ( rc ) {
......@@ -1936,21 +1914,14 @@ retry_dobind:
/* need to retry */
retries--;
if ( LogTest( LDAP_DEBUG_ANY ) ) {
char buf[ SLAP_TEXT_BUFLEN ];
/* this lock is required; however,
* it's invoked only when logging is on */
ldap_pvt_thread_mutex_lock( &mt->mt_uri_mutex );
snprintf( buf, sizeof( buf ),
"retrying URI=\"%s\" DN=\"%s\"",
mt->mt_uri,
BER_BVISNULL( &msc->msc_bound_ndn ) ?
"" : msc->msc_bound_ndn.bv_val );
Debug(LDAP_DEBUG_ANY,
"%s asyncmeta_search_dobind_init_with_retry[%d]: retrying URI=\"%s\" DN=\"%s\".\n",
op->o_log_prefix, candidate, mt->mt_uri,
BER_BVISNULL(&msc->msc_bound_ndn) ? "" : msc->msc_bound_ndn.bv_val );
ldap_pvt_thread_mutex_unlock( &mt->mt_uri_mutex );
Debug( LDAP_DEBUG_ANY,
"%s asyncmeta_search_dobind_init_with_retry[%d]: %s.\n",
op->o_log_prefix, candidate, buf );
}
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex );
......
servers/slapd/back-asyncmeta/candidates.c
View file @ 76df74db
......@@ -260,10 +260,10 @@ asyncmeta_clear_one_msc(
#ifdef DEBUG_205
char buf[ BUFSIZ ];
snprintf( buf, sizeof( buf ), "asyncmeta_clear_one_msc ldap_unbind_ext[%d] ld=%p",
candidate, (void *)msc->msc_ld );
Debug( LDAP_DEBUG_ANY, "### %s %s\n",
op ? op->o_log_prefix : "", buf );
Debug(LDAP_DEBUG_ANY,
"### %s asyncmeta_clear_one_msc ldap_unbind_ext[%d] ld=%p\n",
op ? op->o_log_prefix : "", candidate,
(void *)msc->msc_ld );
#endif /* DEBUG_205 */
ldap_unbind_ext( msc->msc_ld, NULL, NULL );
......
servers/slapd/back-asyncmeta/conn.c
View file @ 76df74db
......@@ -149,16 +149,11 @@ asyncmeta_init_one_conn(
dont_retry = ( ri->ri_num[ ri->ri_idx ] == SLAP_RETRYNUM_TAIL
|| slap_get_time() < ri->ri_last + ri->ri_interval[ ri->ri_idx ] );
if ( !dont_retry ) {
if ( LogTest( LDAP_DEBUG_ANY ) ) {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"asyncmeta_init_one_conn[%d]: quarantine "
"retry block #%d try #%d",
candidate, ri->ri_idx, ri->ri_count );
Debug( LDAP_DEBUG_ANY, "%s %s.\n",
op->o_log_prefix, buf );
}
Debug(LDAP_DEBUG_ANY,
"%s asyncmeta_init_one_conn[%d]: quarantine " "retry block #%d try #%d.\n",
op->o_log_prefix,
candidate, ri->ri_idx,
ri->ri_count );
mt->mt_isquarantined = LDAP_BACK_FQ_RETRYING;
}
......@@ -542,21 +537,14 @@ asyncmeta_retry(
struct berval save_cred;
if ( LogTest( LDAP_DEBUG_ANY ) ) {
char buf[ SLAP_TEXT_BUFLEN ];
/* this lock is required; however,
* it's invoked only when logging is on */
ldap_pvt_thread_mutex_lock( &mt->mt_uri_mutex );
snprintf( buf, sizeof( buf ),
"retrying URI=\"%s\" DN=\"%s\"",
mt->mt_uri,
BER_BVISNULL( &msc->msc_bound_ndn ) ?
"" : msc->msc_bound_ndn.bv_val );
Debug(LDAP_DEBUG_ANY,
"%s asyncmeta_retry[%d]: retrying URI=\"%s\" DN=\"%s\".\n",
op->o_log_prefix, candidate, mt->mt_uri,
BER_BVISNULL(&msc->msc_bound_ndn) ? "" : msc->msc_bound_ndn.bv_val );
ldap_pvt_thread_mutex_unlock( &mt->mt_uri_mutex );
Debug( LDAP_DEBUG_ANY,
"%s asyncmeta_retry[%d]: %s.\n",
op->o_log_prefix, candidate, buf );
}
( void )rewrite_session_delete( mt->mt_rwmap.rwm_rw, op->o_conn );
......@@ -1233,15 +1221,10 @@ asyncmeta_quarantine(
break;
case LDAP_BACK_FQ_RETRYING:
if ( LogTest( LDAP_DEBUG_ANY ) ) {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"asyncmeta_quarantine[%d]: block #%d try #%d failed",
candidate, ri->ri_idx, ri->ri_count );
Debug( LDAP_DEBUG_ANY, "%s %s.\n",
op->o_log_prefix, buf );
}
Debug(LDAP_DEBUG_ANY,
"%s asyncmeta_quarantine[%d]: block #%d try #%d failed.\n",
op->o_log_prefix, candidate, ri->ri_idx,
ri->ri_count );
++ri->ri_count;
if ( ri->ri_num[ ri->ri_idx ] != SLAP_RETRYNUM_FOREVER
......
servers/slapd/back-asyncmeta/init.c
View file @ 76df74db
......@@ -200,12 +200,9 @@ asyncmeta_target_finish(
if ( ( mt->mt_idassert_flags & LDAP_BACK_AUTH_AUTHZ_ALL )
&& !( mt->mt_idassert_flags & LDAP_BACK_AUTH_PRESCRIPTIVE ) )
{
snprintf( msg, msize,
"%s: inconsistent idassert configuration "
"(likely authz=\"*\" used with \"non-prescriptive\" flag)",
log );
Debug( LDAP_DEBUG_ANY, "%s (target %s)\n",
msg, mt->mt_uri );
Debug(LDAP_DEBUG_ANY,
"%s: inconsistent idassert configuration " "(likely authz=\"*\" used with \"non-prescriptive\" flag) (target %s)\n",
log, mt->mt_uri );
return 1;
}
......
servers/slapd/back-asyncmeta/meta_result.c
View file @ 76df74db
......@@ -234,13 +234,10 @@ asyncmeta_send_entry(
{
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"%s meta_send_entry(\"%s\"): "
"slap_bv2undef_ad(%s): %s\n",
op->o_log_prefix, ent.e_name.bv_val,
mapped.bv_val, text );
Debug( LDAP_DEBUG_ANY, "%s", buf );
Debug(LDAP_DEBUG_ANY,
"%s meta_send_entry(\"%s\"): " "slap_bv2undef_ad(%s): %s\n",
op->o_log_prefix, ent.e_name.bv_val,
mapped.bv_val, text );
( void )ber_scanf( &ber, "x" /* [W] */ );
op->o_tmpfree( attr, op->o_tmpmemctx );
continue;
......@@ -1647,13 +1644,10 @@ again:
mc->mc_info->mi_targets[i]->mt_timeout_ops = 0;
break;
default:
{
Debug( LDAP_DEBUG_ANY,
"asyncmeta_op_handle_result: "
"unrecognized response message tag=%d\n",
rc );
}
"asyncmeta_op_handle_result: "
"unrecognized response message tag=%d\n",
rc );
}
if (msg)
ldap_msgfree(msg);
......
servers/slapd/back-bdb/dn2id.c
View file @ 76df74db
......@@ -63,11 +63,10 @@ bdb_dn2id_add(
/* store it -- don't override */
rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
if( rc != 0 ) {
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 );
Debug(LDAP_DEBUG_ANY,
"%s => bdb_dn2id_add dn=\"%s\" ID=0x%lx: put failed: %s %d\n",
op->o_log_prefix, e->e_name.bv_val, e->e_id,
db_strerror(rc), rc );
goto done;
}
......
servers/slapd/back-ldap/bind.c
View file @ 76df74db
......@@ -1095,17 +1095,10 @@ retry_lock:
ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
if ( LogTest( LDAP_DEBUG_TRACE ) ) {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"lc=%p inserted refcnt=%u rc=%d",
(void *)lc, refcnt, rs->sr_err );
Debug( LDAP_DEBUG_TRACE,
"=>ldap_back_getconn: %s: %s\n",
op->o_log_prefix, buf );
}
Debug(LDAP_DEBUG_TRACE,
"=>ldap_back_getconn: %s: lc=%p inserted refcnt=%u rc=%d\n",
op->o_log_prefix, (void *)lc, refcnt,
rs->sr_err );
if ( !LDAP_BACK_PCONN_ISPRIV( lc ) ) {
/* Err could be -1 in case a duplicate ldapconn is inserted */
......@@ -1164,16 +1157,9 @@ retry_lock:
ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
}
if ( LogTest( LDAP_DEBUG_TRACE ) ) {
char buf[ SLAP_TEXT_BUFLEN ];