From 84a64fe354deb44ab80cf49447af0804ada62e56 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 4 Jul 2024 18:35:45 +0100 Subject: [PATCH] ITS#10237 back-ldap: fix usage of multi-precision add for op counters --- servers/slapd/back-ldap/add.c | 2 +- servers/slapd/back-ldap/bind.c | 10 +++++----- servers/slapd/back-ldap/compare.c | 2 +- servers/slapd/back-ldap/delete.c | 2 +- servers/slapd/back-ldap/extended.c | 4 ++-- servers/slapd/back-ldap/modify.c | 2 +- servers/slapd/back-ldap/modrdn.c | 2 +- servers/slapd/back-ldap/search.c | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c index 3a7217948e..ce2c028203 100644 --- 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 4afbedb854..30269e2c9f 100644 --- 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 ); @@ -1434,7 +1434,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 ); @@ -1504,7 +1504,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 ) { @@ -2339,7 +2339,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 ) { @@ -2450,7 +2450,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 7f18a5eda8..3b8c41d721 100644 --- 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 6bf83add63..058f33cf39 100644 --- 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 61a3663dd3..bc97df6a0d 100644 --- a/servers/slapd/back-ldap/extended.c +++ b/servers/slapd/back-ldap/extended.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_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 ) { @@ -363,7 +363,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 ( text ) { diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c index 8f42dbcde4..b61afab612 100644 --- 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 e3de24387b..a89e6954cd 100644 --- 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 7ff0d32203..ccba43c082 100644 --- 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 ) {