Fixed minor compile errors

This commit is contained in:
Julius Enarusai 2003-04-15 20:40:02 +00:00
parent 06da0f5e6f
commit 5094d6abda
5 changed files with 10 additions and 10 deletions

View file

@ -46,7 +46,7 @@ do_abandon( Operation *op, SlapReply *rs )
if ( ber_scanf( op->o_ber, "i", &id ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
"conn: %d do_abandon: ber_scanf failed\n", conn->c_connid, 0, 0 );
"conn: %d do_abandon: ber_scanf failed\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
#endif

View file

@ -139,7 +139,7 @@ ldbm_back_delete(
if( (p = dn2entry_w( op->o_bd, &pdn, NULL )) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_delete: parent of (%s) does not exist\n", op->o_req_dn. 0, 0 );
"ldbm_back_delete: parent of (%s) does not exist\n", op->o_req_dn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: parent does not exist\n",
@ -201,7 +201,7 @@ ldbm_back_delete(
#ifdef NEW_LOGGING
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_delete: (%s) has no "
"parent & not a root.\n", dn, 0, 0 );
"parent & not a root.\n", op->o_ndn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: no parent & "

View file

@ -111,7 +111,7 @@ ldbm_back_modrdn(
#ifdef NEW_LOGGING
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_modrdn: no write access to entry of (%s)\n",
dn->bv_val, 0, 0 );
op->o_req_dn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_modrdn: no write access to entry\n", 0,
@ -261,7 +261,7 @@ ldbm_back_modrdn(
#ifdef NEW_LOGGING
LDAP_LOG( BACK_LDBM, ERR,
"ldbm_back_modrdn: (%s) has no parent & not a root.\n",
dn, 0, 0 );
op->o_ndn, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_modrdn: no parent & "

View file

@ -352,7 +352,7 @@ send_ldap_response(
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
"send_ldap_response: conn %lu ber write failed\n",
op->o_connid : 0, 0, 0 );
op->o_connid ? op->o_connid : 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"send_ldap_response: ber write failed\n",
@ -708,7 +708,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
"send_search_entry: conn %lu sl_calloc failed\n",
op->o_connid : 0, 0, 0 );
op->o_connid ? op->o_connid : 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"send_search_entry: sl_calloc failed\n", 0, 0, 0 );
@ -731,7 +731,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
"send_search_entry: conn %lu matched values filtering failed\n",
op->o_connid : 0, 0, 0 );
op->o_connid ? op->o_connid : 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"matched values filtering failed\n", 0, 0, 0 );
@ -918,7 +918,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
LDAP_LOG( OPERATION, ERR,
"send_search_entry: conn %lu "
"matched values filtering failed\n",
op->o_connid : 0, 0, 0);
op->o_connid ? op->o_connid : 0, 0, 0);
#else
Debug( LDAP_DEBUG_ANY,
"matched values filtering failed\n", 0, 0, 0 );

View file

@ -31,7 +31,7 @@ do_unbind( Operation *op, SlapReply *rs )
{
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ENTRY,
"do_unbind: conn %d\n", op->o_connid : -1, 0, 0 );
"do_unbind: conn %d\n", op->o_connid ? op->o_connid : -1, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "do_unbind\n", 0, 0, 0 );
#endif