Commit 129dcfbd authored by Ondřej Kuzník's avatar Ondřej Kuzník Committed by Ondřej Kuzník
Browse files

ITS#8731 General Debug() related fixes

parent e5b52325
......@@ -947,7 +947,7 @@ nssov_db_close(
if ( slapMode & SLAP_SERVER_MODE ) {
/* close socket if it's still in use */
if (ni->ni_socket >= 0);
if (ni->ni_socket >= 0)
{
if (close(ni->ni_socket))
Debug( LDAP_DEBUG_ANY,"problem closing server socket (ignored): %s",strerror(errno),0,0);
......
......@@ -837,7 +837,7 @@ smbk5pwd_cf_func( ConfigArgs *c )
if ( c->value_int < 0 ) {
Debug( LDAP_DEBUG_ANY, "%s: smbk5pwd: "
"<%s> invalid negative value \"%d\".",
c->log, c->argv[ 0 ], 0 );
c->log, c->argv[ 0 ], c->value_int );
return 1;
}
pi->smb_must_change = c->value_int;
......@@ -855,7 +855,7 @@ smbk5pwd_cf_func( ConfigArgs *c )
if ( c->value_int < 0 ) {
Debug( LDAP_DEBUG_ANY, "%s: smbk5pwd: "
"<%s> invalid negative value \"%d\".",
c->log, c->argv[ 0 ], 0 );
c->log, c->argv[ 0 ], c->value_int );
return 1;
}
pi->smb_can_change = c->value_int;
......
......@@ -288,7 +288,7 @@ rewrite_parse(
} else {
Debug( LDAP_DEBUG_ANY,
"[%s:%d] unknown command '%s'\n",
fname, lineno, "" );
fname, lineno, argv[ 0 ] );
return -1;
}
......
......@@ -2949,7 +2949,7 @@ asyncmeta_map_config(
if ( src[ 0 ] != '\0' ) {
if ( oc_bvfind( &mapping[ 0 ].src ) == NULL ) {
Debug( LDAP_DEBUG_ANY,
"warning, source objectClass '%s' should be defined in schema\n",
"%s: warning, source objectClass '%s' should be defined in schema\n",
c->log, src, 0 );
/*
......@@ -2961,7 +2961,7 @@ asyncmeta_map_config(
if ( oc_bvfind( &mapping[ 0 ].dst ) == NULL ) {
Debug( LDAP_DEBUG_ANY,
"warning, destination objectClass '%s' is not defined in schema\n",
"%s: warning, destination objectClass '%s' is not defined in schema\n",
c->log, dst, 0 );
}
} else {
......@@ -2973,7 +2973,7 @@ asyncmeta_map_config(
rc = slap_bv2ad( &mapping[ 0 ].src, &ad, &text );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"warning, source attributeType '%s' should be defined in schema\n",
"%s: warning, source attributeType '%s' should be defined in schema\n",
c->log, src, 0 );
/*
......@@ -3001,7 +3001,7 @@ asyncmeta_map_config(
rc = slap_bv2ad( &mapping[ 0 ].dst, &ad, &text );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"warning, destination attributeType '%s' is not defined in schema\n",
"%s: warning, destination attributeType '%s' is not defined in schema\n",
c->log, dst, 0 );
/*
......
......@@ -470,8 +470,7 @@ void asyncmeta_clear_bm_context(bm_context_t *bc)
}
break;
default:
Debug( LDAP_DEBUG_TRACE, "==> asyncmeta_clear_bm_context: other message type",
0, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "==> asyncmeta_clear_bm_context: other message type" );
}
if (bmc->dc != NULL) {
free (bmc->dc);
......@@ -480,8 +479,7 @@ void asyncmeta_clear_bm_context(bm_context_t *bc)
if (clear_cl > 0) {
asyncmeta_free_candidate_list(cl, lock);
Debug( LDAP_DEBUG_TRACE, "==> asyncmeta_clear_bm_context: free_cl_list\n",
0, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "==> asyncmeta_clear_bm_context: free_cl_list\n" );
}
#else
asyncmeta_memctx_put(op->o_threadctx, op->o_tmpmemctx);
......
......@@ -116,7 +116,7 @@ bdb_db_open( BackendDB *be, ConfigReply *cr )
if ( be->be_suffix == NULL ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": need suffix.\n",
1, 0, 0 );
0, 0, 0 );
return -1;
}
......
......@@ -95,7 +95,7 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
if ( be->be_suffix == NULL ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(mdb_db_open) ": need suffix.\n",
1, 0, 0 );
0, 0, 0 );
return -1;
}
......
......@@ -3139,7 +3139,7 @@ ldap_back_map_config(
if ( src[ 0 ] != '\0' ) {
if ( oc_bvfind( &mapping[ 0 ].src ) == NULL ) {
Debug( LDAP_DEBUG_ANY,
"warning, source objectClass '%s' should be defined in schema\n",
"%s: warning, source objectClass '%s' should be defined in schema\n",
c->log, src, 0 );
/*
......@@ -3151,7 +3151,7 @@ ldap_back_map_config(
if ( oc_bvfind( &mapping[ 0 ].dst ) == NULL ) {
Debug( LDAP_DEBUG_ANY,
"warning, destination objectClass '%s' is not defined in schema\n",
"%s: warning, destination objectClass '%s' is not defined in schema\n",
c->log, dst, 0 );
}
} else {
......@@ -3163,7 +3163,7 @@ ldap_back_map_config(
rc = slap_bv2ad( &mapping[ 0 ].src, &ad, &text );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"warning, source attributeType '%s' should be defined in schema\n",
"%s: warning, source attributeType '%s' should be defined in schema\n",
c->log, src, 0 );
/*
......@@ -3191,7 +3191,7 @@ ldap_back_map_config(
rc = slap_bv2ad( &mapping[ 0 ].dst, &ad, &text );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"warning, destination attributeType '%s' is not defined in schema\n",
"%s: warning, destination attributeType '%s' is not defined in schema\n",
c->log, dst, 0 );
/*
......
......@@ -32,7 +32,7 @@ sock_back_extended( Operation *op, SlapReply *rs )
FILE *fp;
struct berval b64;
Debug( LDAP_DEBUG_ARGS, "==> sock_back_extended(%s)\n",
Debug( LDAP_DEBUG_ARGS, "==> sock_back_extended(%s, %s)\n",
op->ore_reqoid.bv_val, op->o_req_dn.bv_val, 0 );
if ( (fp = opensock( si->si_sockpath )) == NULL ) {
......
......@@ -87,7 +87,7 @@ int wt_dn2entry( BackendDB *be,
if ( rc ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(wt_dn2entry)
": entry decode error: %s (%d)\n",
": entry decode error: %d\n",
rc, 0, 0 );
goto done;
}
......
......@@ -157,7 +157,7 @@ int wt_id2entry( BackendDB *be,
if ( rc ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(wt_id2entry)
": entry decode error: %s (%d)\n",
": entry decode error: %d\n",
rc, 0, 0 );
goto done;
}
......
......@@ -62,7 +62,7 @@ wt_db_open( BackendDB *be, ConfigReply *cr )
if ( be->be_suffix == NULL ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(wt_db_open) ": need suffix.\n",
1, 0, 0 );
0, 0, 0 );
return -1;
}
......
......@@ -58,7 +58,7 @@ wt_tool_entry_open( BackendDB *be, int mode )
if( !wc ){
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(wt_tool_entry_open)
": wt_ctx_get failed: %s (%d)\n",
": wt_ctx_get failed\n",
0, 0, 0 );
return -1;
}
......@@ -496,7 +496,7 @@ done:
rc = wc->session->rollback_transaction(wc->session, NULL);
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(wt_tool_entry_reindex)
": rollback transaction %s\n",
": rollback transaction %s (%d)\n",
wiredtiger_strerror(rc), rc, 0 );
}
......
......@@ -267,7 +267,7 @@ register_supported_control2(const char *controloid,
if ( num_known_controls >= SLAP_MAX_CIDS ) {
Debug( LDAP_DEBUG_ANY, "Too many controls registered."
" Recompile slapd with SLAP_MAX_CIDS defined > %d\n",
SLAP_MAX_CIDS, 0, 0 );
num_known_controls, 0, 0 );
return LDAP_OTHER;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment