Fixed minor compile errors

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index dfe03c1daf84395741095a58012d14fe24a355a3..5244d9b4659f315ccf39d6432603587f076061a7 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -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

diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index 3317f40c3799adae3d799b173a05d8b26f4b01b6..1e9a3989c0d07c054f360151f144c8e0d96d5159 100644 (file)
--- a/servers/slapd/back-ldbm/delete.c
+++ b/servers/slapd/back-ldbm/delete.c
@@ -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 & "

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index b1410bb07610f6b8ff4f011419a76aa70f7513ea..50e3ea84d3cf97483e4d74cafd47b40e7b547600 100644 (file)
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -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 & "

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 14791ce7c3359f3b6d799754725f0f54664b550e..41e5eed0f0ecbd7f1ee8de9ec5ac7ba66201dc55 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -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 );

diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index 7515837d516bc95156a1279240e89b6b4fa79488..e3d73bf55e0c433ef5db615c24becbcaf1e9ac7c 100644 (file)
--- a/servers/slapd/unbind.c
+++ b/servers/slapd/unbind.c
@@ -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