ITS#10237 back-ldap: fix usage of multi-precision add for op counters

diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c
index 3a7217948ec111a9afc0bc97009db9ffe26e2812..ce2c0282036295e417476a2afccdec50147cc315 100644 (file)
--- a/servers/slapd/back-ldap/add.c
+++ b/servers/slapd/back-ldap/add.c
@@ -114,7 +114,7 @@ retry:
        }
 
        ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-       ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_ADD ], 1 );
+       ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_ADD ], 1 );
        ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
 
 cleanup:

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 361782781f6b920fd8ac8a066390c6e5c987f649..a6021ada7b5ab9d35f5642e67104366969905a80 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -268,7 +268,7 @@ retry:;
        }
 
        ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-       ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_BIND ], 1 );
+       ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_BIND ], 1 );
        ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
 
        ldap_back_controls_free( op, rs, &ctrls );
@@ -1443,7 +1443,7 @@ retry_lock:;
                                defaults );
 
                ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-               ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_BIND ], 1 );
+               ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_BIND ], 1 );
                ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
 
                lutil_sasl_freedefs( defaults );
@@ -1496,7 +1496,7 @@ retry:;
                        NULL, NULL, &msgid );
 
        ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-       ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_BIND ], 1 );
+       ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_BIND ], 1 );
        ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
 
        if ( rs->sr_err == LDAP_SERVER_DOWN ) {
@@ -2331,7 +2331,7 @@ ldap_back_proxy_authz_bind(
                } while ( rs->sr_err == LDAP_SASL_BIND_IN_PROGRESS );
 
                ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-               ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_BIND ], 1 );
+               ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_BIND ], 1 );
                ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
 
                switch ( rs->sr_err ) {
@@ -2442,7 +2442,7 @@ ldap_back_proxy_authz_bind(
                        -1, ( sendok | LDAP_BACK_BINDING ) );
 
                ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-               ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_BIND ], 1 );
+               ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_BIND ], 1 );
                ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
                break;
 

diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index 7f18a5eda82cf900cf7c2d0978d649a26850839c..3b8c41d72142c6034b758e41070a0dcd87a39f07 100644 (file)
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -74,7 +74,7 @@ retry:
        }
 
        ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-       ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_COMPARE ], 1 );
+       ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_COMPARE ], 1 );
        ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
 
 cleanup:

diff --git a/servers/slapd/back-ldap/delete.c b/servers/slapd/back-ldap/delete.c
index 6bf83add631ba3dbf95351bd3bcb2336ec711d73..058f33cf39d583a9538a584befcaf2d19f20e837 100644 (file)
--- a/servers/slapd/back-ldap/delete.c
+++ b/servers/slapd/back-ldap/delete.c
@@ -71,7 +71,7 @@ retry:
        }
 
        ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-       ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_DELETE ], 1 );
+       ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_DELETE ], 1 );
        ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
 
 cleanup:

diff --git a/servers/slapd/back-ldap/extended.c b/servers/slapd/back-ldap/extended.c
index 8777fcea2819b06887835e7b4421899950969ec4..1948e42b1204d9079703b4747bb533750d61e30d 100644 (file)
--- a/servers/slapd/back-ldap/extended.c
+++ b/servers/slapd/back-ldap/extended.c
@@ -265,7 +265,7 @@ retry:
        }
 
        ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-       ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_EXTENDED ], 1 );
+       ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_EXTENDED ], 1 );
        ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
 
        if ( freedn ) {
@@ -382,7 +382,7 @@ retry:
        }
 
        ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-       ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_EXTENDED ], 1 );
+       ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_EXTENDED ], 1 );
        ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
 
        /* these have to be freed anyway... */

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index 8f42dbcde4969da730603bb8882a6cc8bc59e891..b61afab6124d74a4f3d1006732008ea08c61b788 100644 (file)
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -116,7 +116,7 @@ retry:;
        }
 
        ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-       ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_MODIFY ], 1 );
+       ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_MODIFY ], 1 );
        ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
 
 cleanup:;

diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index e3de24387b1fe1097fb9b87668622ab0a9dbfeb6..a89e6954cd7224620bb916123c106fd35fab32f6 100644 (file)
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -104,7 +104,7 @@ retry:
        }
 
        ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-       ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_MODRDN ], 1 );
+       ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_MODRDN ], 1 );
        ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
 
 cleanup:

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 7ff0d322037f716d5003feeb1baf16505422082c..ccba43c0826fc463c4fa9df926ae3d3b0d12a849 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -254,7 +254,7 @@ retry:
                        op->ors_slimit, op->ors_deref, &msgid );
 
        ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
-       ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_SEARCH ], 1 );
+       ldap_pvt_mp_add_ulong( li->li_ops_completed[ SLAP_OP_SEARCH ], 1 );
        ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
 
        if ( rs->sr_err != LDAP_SUCCESS ) {