ldap/servers/slapd/daemon.c | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit a1635fc45f681ed9066f6beed9be7e1672490f9f
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Wed Jan 13 13:15:53 2016 +0100
Ticket: 48341 - deadlock on connection mutex
If thread is blocked in connection_read_operation() it holds the connection mutex
and the main thread iterating through the connection table is also blocked.
But if the main thread would get the mutex it would just detect that the connection has still the
C_gettingber flag set and immediately release the lock.
The check if c_gettingber == 0 can be done without holding the mutex and so the deadlock
can be avoided
Reviewed by Rich, Thanks
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 355f0fc..d25c44d 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -1740,6 +1740,9 @@ handle_pr_read_ready(Connection_Table *ct, PRIntn num_poll)
{
if ( c->c_mutex != NULL )
{
+ /* this check can be done without acquiring the mutex */
+ if (c->c_gettingber) continue;
+
PR_EnterMonitor(c->c_mutex);
if ( connection_is_active_nolock (c) && c->c_gettingber == 0 )
{
1
0
ldap/servers/slapd/conntable.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e3c009f5e000e66ea77616d3a03f545de541da15
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Thu Jan 14 11:41:13 2016 +0100
fix jenkins warning, cast of c_mutex now has to be PRMonitor
diff --git a/ldap/servers/slapd/conntable.c b/ldap/servers/slapd/conntable.c
index 37da9a5..b5cd47a 100644
--- a/ldap/servers/slapd/conntable.c
+++ b/ldap/servers/slapd/conntable.c
@@ -352,7 +352,7 @@ connection_table_as_entry(Connection_Table *ct, Slapi_Entry *e)
for ( i = 0; i < (ct!=NULL?ct->size:0); i++ )
{
PR_Lock( ct->table_mutex );
- if ( (ct->c[i].c_mutex == NULL) || (ct->c[i].c_mutex == (PRLock*)-1) )
+ if ( (ct->c[i].c_mutex == NULL) || (ct->c[i].c_mutex == (PRMonitor*)-1) )
{
PR_Unlock( ct->table_mutex );
continue;
1
0
ldap/servers/slapd/daemon.c | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit d73b5738fbab9f629c5f4d469ec45944b82ead72
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Wed Jan 13 13:15:53 2016 +0100
Ticket: 48341 - deadlock on connection mutex
If thread is blocked in connection_read_operation() it holds the connection mutex
and the main thread iterating through the connection table is also blocked.
But if the main thread would get the mutex it would just detect that the connection has still the
C_gettingber flag set and immediately release the lock.
The check if c_gettingber == 0 can be done without holding the mutex and so the deadlock
can be avoided
Reviewed by Rich, Thanks
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 3b6acfe..ba7a39a 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -1752,6 +1752,9 @@ handle_pr_read_ready(Connection_Table *ct, PRIntn num_poll)
{
if ( c->c_mutex != NULL )
{
+ /* this check can be done without acquiring the mutex */
+ if (c->c_gettingber) continue;
+
PR_EnterMonitor(c->c_mutex);
if ( connection_is_active_nolock (c) && c->c_gettingber == 0 )
{
1
0
ldap/servers/slapd/abandon.c | 4 -
ldap/servers/slapd/bind.c | 4 -
ldap/servers/slapd/connection.c | 88 +++++++++++++++---------------
ldap/servers/slapd/conntable.c | 19 +++---
ldap/servers/slapd/daemon.c | 14 ++--
ldap/servers/slapd/extendop.c | 10 +--
ldap/servers/slapd/opshared.c | 18 +++---
ldap/servers/slapd/pagedresults.c | 100 +++++++++++++++++------------------
ldap/servers/slapd/pblock.c | 74 +++++++++++++------------
ldap/servers/slapd/psearch.c | 8 +-
ldap/servers/slapd/saslbind.c | 26 ++++-----
ldap/servers/slapd/slap.h | 2
ldap/servers/slapd/start_tls_extop.c | 15 ++---
ldap/servers/slapd/unbind.c | 4 -
14 files changed, 194 insertions(+), 192 deletions(-)
New commits:
commit f69d19a351a34313c5f45499718c892a9bb3b42a
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Jan 11 15:53:28 2016 -0800
Ticket #48406 - Avoid self deadlock by PR_Lock(conn->c_mutex)
Description: Fixing ticket 48338 introduced a self deadlock.
To avoid the self deadlock, tried to remove PR_Lock(conn->c_mutex)
which looked harmless, but it introduced a crash by memory corruption.
This patch replaces PR_Lock/Unlock with PR_EnterMonitor/ExitMonitor,
respectively.
https://fedorahosted.org/389/ticket/48406
Reviewed by rmeggins(a)redhat.com, lkrispen(a)redhat.com, and wibrown(a)redhat.com.
Thank you, Rich, Ludwig and William!
(cherry picked from commit f25f804a8bce83b3790e7045dfc03230d7ece1af)
(cherry picked from commit 84da7d05ddc5a963b0d025df08f38a6ccd7d90d2)
(cherry picked from commit ad08d1fa7c258bb99cd64a4de570035d82e6a492)
diff --git a/ldap/servers/slapd/abandon.c b/ldap/servers/slapd/abandon.c
index 09da149..06a17e1 100644
--- a/ldap/servers/slapd/abandon.c
+++ b/ldap/servers/slapd/abandon.c
@@ -108,7 +108,7 @@ do_abandon( Slapi_PBlock *pb )
* flag and abort the operation at a convenient time.
*/
- PR_Lock( pb->pb_conn->c_mutex );
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
for ( o = pb->pb_conn->c_ops; o != NULL; o = o->o_next ) {
if ( o->o_msgid == id && o != pb->pb_op)
break;
@@ -170,7 +170,7 @@ do_abandon( Slapi_PBlock *pb )
}
- PR_Unlock( pb->pb_conn->c_mutex );
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
/*
* Wake up the persistent searches, so they
* can notice if they've been abandoned.
diff --git a/ldap/servers/slapd/bind.c b/ldap/servers/slapd/bind.c
index 11ec22e..bc8040f 100644
--- a/ldap/servers/slapd/bind.c
+++ b/ldap/servers/slapd/bind.c
@@ -290,7 +290,7 @@ do_bind( Slapi_PBlock *pb )
slapi_pblock_get (pb, SLAPI_PWPOLICY, &pw_response_requested);
}
- PR_Lock( pb->pb_conn->c_mutex );
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
bind_credentials_clear( pb->pb_conn, PR_FALSE, /* do not lock conn */
PR_FALSE /* do not clear external creds. */ );
@@ -323,7 +323,7 @@ do_bind( Slapi_PBlock *pb )
* bound user can work properly
*/
pb->pb_conn->c_needpw = 0;
- PR_Unlock( pb->pb_conn->c_mutex );
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
log_bind_access(pb, dn?dn:"empty", method, version, saslmech, NULL);
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index c2ec4a7..d0387fc 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -111,7 +111,7 @@ connection_done(Connection *conn)
}
if (NULL != conn->c_mutex)
{
- PR_DestroyLock(conn->c_mutex);
+ PR_DestroyMonitor(conn->c_mutex);
}
if (NULL != conn->c_pdumutex)
{
@@ -703,10 +703,10 @@ int connection_is_free (Connection *conn)
{
int rc;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
rc = conn->c_sd == SLAPD_INVALID_SOCKET && conn->c_refcnt == 0 &&
!(conn->c_flags & CONN_FLAG_CLOSING);
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
return rc;
}
@@ -748,17 +748,17 @@ static void inc_op_count(Connection* conn)
static int connection_increment_reference(Connection *conn)
{
int rc = 0;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
rc = connection_acquire_nolock (conn);
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
return rc;
}
static void connection_decrement_reference(Connection *conn)
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_release_nolock (conn);
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
static void
@@ -990,29 +990,29 @@ done:
* If not a persistent search, remove the operation
* from this connection's list.
*/
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_remove_operation( conn, op );
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
/* destroying the pblock will cause destruction of the operation
* so this must happen before releasing the connection
*/
slapi_pblock_destroy( pb );
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
if (connection_release_nolock (conn) != 0)
{
return_value = -1;
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
} else { /* ps code acquires ref to conn - we need to release ours here */
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
if (connection_release_nolock (conn) != 0)
{
return_value = -1;
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
return return_value;
}
@@ -1075,19 +1075,19 @@ static int connection_operation_new(Connection *conn, Operation **ppOp)
Operation *temp_op = NULL;
int rc;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
if (connection_is_active_nolock(conn) == 0) {
LDAPDebug(LDAP_DEBUG_CONNS,
"not creating a new operation when conn %" NSPRIu64 " closing\n",
conn->c_connid,0,0);
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
return -1;
}
temp_op = operation_new( plugin_build_operation_action_bitmap( 0,
plugin_get_server_plg() ));
connection_add_operation( conn, temp_op);
rc = connection_acquire_nolock (conn);
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
/* Stash the op pointer in the connection structure for later use */
PR_ASSERT(NULL == conn->c_private->c_current_op);
conn->c_private->c_current_op = temp_op;
@@ -1173,21 +1173,21 @@ static int read_the_data(Connection *conn, int *process_op, int *defer_io, int *
"conn=%" NSPRIu64 " fd=%d The length of BER Element was too long.\n",
conn->c_connid, conn->c_sd );
}
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_remove_operation( conn, op );
operation_free(&op, conn);
priv->c_current_op = NULL;
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
return -1; /* Abandon Connection */
}
}
if (is_ber_too_big(conn,ber_len))
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_remove_operation( conn, op );
operation_free(&op, conn);
priv->c_current_op = NULL;
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
return -1; /* Abandon Connection */
}
@@ -1210,11 +1210,11 @@ static int read_the_data(Connection *conn, int *process_op, int *defer_io, int *
"conn=%" NSPRIu64 " received a non-LDAP message"
" (tag 0x%lx, expected 0x%lx)\n",
conn->c_connid, tag, LDAP_TAG_MESSAGE );
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_remove_operation( conn, op );
operation_free(&op, conn);
priv->c_current_op = NULL;
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
return -1; /* Abandon Connection */
}
}
@@ -1891,10 +1891,10 @@ int connection_read_operation(Connection *conn, Operation *op, ber_tag_t *tag, i
if (ret <= 0) {
if (0 == ret) {
/* Connection is closed */
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
disconnect_server_nomutex( conn, conn->c_connid, -1, SLAPD_DISCONNECT_BAD_BER_TAG, 0 );
conn->c_gettingber = 0;
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
signal_listner();
return CONN_DONE;
}
@@ -2024,9 +2024,9 @@ int connection_read_operation(Connection *conn, Operation *op, ber_tag_t *tag, i
void connection_make_readable(Connection *conn)
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
conn->c_gettingber = 0;
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
signal_listner();
}
@@ -2037,7 +2037,7 @@ void connection_check_activity_level(Connection *conn)
{
int current_count = 0;
int delta_count = 0;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/* get the current op count */
current_count = conn->c_opscompleted;
/* compare to the previous op count */
@@ -2048,7 +2048,7 @@ void connection_check_activity_level(Connection *conn)
conn->c_private->previous_op_count = current_count;
/* update the last checked time */
conn->c_private->previous_count_check_time = current_time();
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
LDAPDebug(LDAP_DEBUG_CONNS,"conn %" NSPRIu64 " activity level = %d\n",conn->c_connid,delta_count,0);
}
@@ -2092,7 +2092,7 @@ void connection_enter_leave_turbo(Connection *conn, int current_turbo_flag, int
int connection_count = 0;
int our_rank = 0;
int threshold_rank = 0;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* We can already be in turbo mode, or not */
current_mode = current_turbo_flag;
if (pagedresults_in_use_nolock(conn)) {
@@ -2148,7 +2148,7 @@ void connection_enter_leave_turbo(Connection *conn, int current_turbo_flag, int
}
}
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (current_mode != new_mode) {
if (current_mode) {
LDAPDebug(LDAP_DEBUG_CONNS,"conn %" NSPRIu64 " leaving turbo mode\n",conn->c_connid,0,0);
@@ -2244,13 +2244,13 @@ connection_threadmain()
*/
PR_Sleep(PR_INTERVAL_NO_WAIT);
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* Make our own pb in turbo mode */
connection_make_new_pb(&pb,conn);
if (connection_call_io_layer_callbacks(conn)) {
LDAPDebug0Args( LDAP_DEBUG_ANY, "Error: could not add/remove IO layers from connection\n" );
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (! config_check_referral_mode()) {
slapi_counter_increment(ops_initiated);
slapi_counter_increment(g_get_global_snmp_vars()->ops_tbl.dsInOps);
@@ -2374,7 +2374,7 @@ done:
/* If this op isn't a persistent search, remove it */
if ( !( pb->pb_op->o_flags & OP_FLAG_PS )) {
/* delete from connection operation queue & decr refcnt */
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_remove_operation( conn, op );
/* destroying the pblock will cause destruction of the operation
* so this must happend before releasing the connection
@@ -2386,11 +2386,11 @@ done:
if (!thread_turbo_flag && !more_data) {
connection_release_nolock (conn);
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
} else { /* the ps code acquires a ref to the conn - we need to release ours here */
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_release_nolock (conn);
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
/* Since we didn't do so earlier, we need to make a replication connection readable again here */
if ( ((1 == is_timedout) || (replication_connection && !thread_turbo_flag)) && !more_data)
@@ -2401,7 +2401,7 @@ done:
}
if (!thread_turbo_flag && !more_data) { /* Don't do this in turbo mode */
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/* if the threadnumber of now below the maximum, wakeup
* the listener thread so that we start polling on this
* connection again
@@ -2412,7 +2412,7 @@ done:
else
need_wakeup = 0;
conn->c_threadnumber--;
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
if (need_wakeup)
signal_listner();
@@ -2647,7 +2647,7 @@ op_copy_identity(Connection *conn, Operation *op)
size_t dnlen;
size_t typelen;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
dnlen= conn->c_dn ? strlen (conn->c_dn) : 0;
typelen= conn->c_authtype ? strlen (conn->c_authtype) : 0;
@@ -2679,14 +2679,14 @@ op_copy_identity(Connection *conn, Operation *op)
op->o_ssf = conn->c_local_ssf;
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
/* Sets the SSL SSF in the connection struct. */
static void
connection_set_ssl_ssf(Connection *conn)
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
if (conn->c_flags & CONN_FLAG_SSL) {
SSL_SecurityStatus(conn->c_prfd, NULL, NULL, NULL, &(conn->c_ssl_ssf), NULL, NULL);
@@ -2694,7 +2694,7 @@ connection_set_ssl_ssf(Connection *conn)
conn->c_ssl_ssf = 0;
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
static int
@@ -2741,9 +2741,9 @@ log_ber_too_big_error(const Connection *conn, ber_len_t ber_len,
void
disconnect_server( Connection *conn, PRUint64 opconnid, int opid, PRErrorCode reason, PRInt32 error )
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
disconnect_server_nomutex( conn, opconnid, opid, reason, error );
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
static ps_wakeup_all_fn_ptr ps_wakeup_all_fn = NULL;
diff --git a/ldap/servers/slapd/conntable.c b/ldap/servers/slapd/conntable.c
index 7cf9f31..5917401 100644
--- a/ldap/servers/slapd/conntable.c
+++ b/ldap/servers/slapd/conntable.c
@@ -141,11 +141,11 @@ connection_table_abandon_all_operations(Connection_Table *ct)
int i;
for ( i = 0; i < ct->size; i++ )
{
- if ( ct->c[i].c_mutex != NULL )
+ if ( ct->c[i].c_mutex )
{
- PR_Lock( ct->c[i].c_mutex );
+ PR_EnterMonitor(ct->c[i].c_mutex);
connection_abandon_operations( &ct->c[i] );
- PR_Unlock( ct->c[i].c_mutex );
+ PR_ExitMonitor(ct->c[i].c_mutex);
}
}
}
@@ -195,7 +195,7 @@ connection_table_get_connection(Connection_Table *ct, int sd)
if ( c->c_mutex == NULL )
{
PR_Lock( ct->table_mutex );
- c->c_mutex = PR_NewLock();
+ c->c_mutex = PR_NewMonitor();
c->c_pdumutex = PR_NewLock();
PR_Unlock( ct->table_mutex );
if ( c->c_mutex == NULL || c->c_pdumutex == NULL )
@@ -399,7 +399,7 @@ connection_table_as_entry(Connection_Table *ct, Slapi_Entry *e)
/* Can't take c_mutex if holding table_mutex; temporarily unlock */
PR_Unlock( ct->table_mutex );
- PR_Lock( ct->c[i].c_mutex );
+ PR_EnterMonitor(ct->c[i].c_mutex);
if ( ct->c[i].c_sd != SLAPD_INVALID_SOCKET )
{
char buf2[20];
@@ -446,7 +446,7 @@ connection_table_as_entry(Connection_Table *ct, Slapi_Entry *e)
attrlist_merge( &e->e_attrs, "connection", vals );
slapi_ch_free_string(&newbuf);
}
- PR_Unlock( ct->c[i].c_mutex );
+ PR_ExitMonitor(ct->c[i].c_mutex);
}
PR_snprintf( buf, sizeof(buf), "%d", nconns );
@@ -474,14 +474,15 @@ void
connection_table_dump_activity_to_errors_log(Connection_Table *ct)
{
int i;
+
for ( i = 0; i < ct->size; i++ )
{
Connection *c= &(ct->c[i]);
- if ( c->c_mutex != NULL )
+ if ( c->c_mutex )
{
/* Find the connection we are referring to */
int j= c->c_fdi;
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
if ( (c->c_sd != SLAPD_INVALID_SOCKET) &&
(j >= 0) && (c->c_prfd == ct->fd[j].fd) )
{
@@ -491,7 +492,7 @@ connection_table_dump_activity_to_errors_log(Connection_Table *ct)
LDAPDebug( LDAP_DEBUG_CONNS,"activity on %d%s\n", i, r ? "r" : "",0 );
}
}
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
}
}
}
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 4cea840..e9081f4 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -1678,7 +1678,7 @@ setup_pr_read_pds(Connection_Table *ct, PRFileDesc **n_tcps, PRFileDesc **s_tcps
}
else
{
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
if (c->c_flags & CONN_FLAG_CLOSING)
{
/* A worker thread has marked that this connection
@@ -1724,7 +1724,7 @@ setup_pr_read_pds(Connection_Table *ct, PRFileDesc **n_tcps, PRFileDesc **s_tcps
c->c_fdi = SLAPD_INVALID_SOCKET_INDEX;
}
}
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
}
c = next;
}
@@ -1743,7 +1743,7 @@ handle_timeout( void )
time_t curtime = current_time();
if (0 == prevtime) {
- prevtime = time (&housekeeping_fire_time);
+ prevtime = time (&housekeeping_fire_time);
}
if ( difftime(curtime, prevtime) >=
@@ -1979,7 +1979,7 @@ handle_pr_read_ready(Connection_Table *ct, PRIntn num_poll)
{
if ( c->c_mutex != NULL )
{
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
if ( connection_is_active_nolock (c) && c->c_gettingber == 0 )
{
PRInt16 out_flags;
@@ -2036,7 +2036,7 @@ handle_pr_read_ready(Connection_Table *ct, PRIntn num_poll)
SLAPD_DISCONNECT_IDLE_TIMEOUT, EAGAIN );
}
}
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
}
}
#endif
@@ -2612,7 +2612,7 @@ handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, i
PR_Close(pr_acceptfd);
return -1;
}
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/*
* Set the default idletimeout and the handle. We'll update c_idletimeout
@@ -2722,7 +2722,7 @@ handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, i
connection_table_move_connection_on_to_active_list(the_connection_table,conn);
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
g_increment_current_conn_count();
diff --git a/ldap/servers/slapd/extendop.c b/ldap/servers/slapd/extendop.c
index 8f25b27..0a0615c 100644
--- a/ldap/servers/slapd/extendop.c
+++ b/ldap/servers/slapd/extendop.c
@@ -90,7 +90,7 @@ static void extop_handle_import_start(Slapi_PBlock *pb, char *extoid,
send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL, NULL, 0, NULL);
return;
}
- suffix = slapi_sdn_get_dn(sdn);
+ suffix = slapi_sdn_get_dn(sdn);
/* be = slapi_be_select(sdn); */
be = slapi_mapping_tree_find_backend_for_sdn(sdn);
if (be == NULL || be == defbackend_get_backend()) {
@@ -164,10 +164,10 @@ static void extop_handle_import_start(Slapi_PBlock *pb, char *extoid,
/* okay, the import is starting now -- save the backend in the
* connection block & mark this connection as belonging to a bulk import
*/
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pb->pb_conn->c_flags |= CONN_FLAG_IMPORT;
pb->pb_conn->c_bi_backend = be;
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
slapi_pblock_set(pb, SLAPI_EXT_OP_RET_OID, EXTOP_BULK_IMPORT_START_OID);
bv.bv_val = NULL;
@@ -189,11 +189,11 @@ static void extop_handle_import_done(Slapi_PBlock *pb, char *extoid,
struct berval bv;
int ret;
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pb->pb_conn->c_flags &= ~CONN_FLAG_IMPORT;
be = pb->pb_conn->c_bi_backend;
pb->pb_conn->c_bi_backend = NULL;
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
if ((be == NULL) || (be->be_wire_import == NULL)) {
/* can this even happen? */
diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c
index e73ac6e..6ddbc91 100644
--- a/ldap/servers/slapd/opshared.c
+++ b/ldap/servers/slapd/opshared.c
@@ -700,7 +700,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
* In async paged result case, the search result might be released
* by other theads. We need to double check it in the locked region.
*/
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, 1/*locked*/, pr_idx);
if (pr_search_result) {
if (pagedresults_is_abandoned_or_notavailable(pb->pb_conn, 1/*locked*/, pr_idx)) {
@@ -708,7 +708,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
/* Previous operation was abandoned and the simplepaged object is not in use. */
send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL);
rc = LDAP_SUCCESS;
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
goto free_and_return;
} else {
slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_SET, pr_search_result );
@@ -717,7 +717,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
/* search result could be reset in the backend/dse */
slapi_pblock_get(pb, SLAPI_SEARCH_RESULT_SET, &sr);
pagedresults_set_search_result(pb->pb_conn, operation, sr, 1/*locked*/, pr_idx);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
}
} else {
pr_stat = PAGEDRESULTS_SEARCH_END;
@@ -851,10 +851,10 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
/* PAGED RESULTS */
if (op_is_pagedresults(operation)) {
/* cleanup the slot */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pagedresults_set_search_result(pb->pb_conn, operation, NULL, 1, pr_idx);
rc = pagedresults_set_current_be(pb->pb_conn, NULL, pr_idx, 1);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
}
if (1 == flag_no_such_object) {
break;
@@ -896,11 +896,11 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
slapi_pblock_get(pb, SLAPI_SEARCH_RESULT_SET, &sr);
if (PAGEDRESULTS_SEARCH_END == pr_stat) {
/* no more entries, but at least another backend */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pagedresults_set_search_result(pb->pb_conn, operation, NULL, 1, pr_idx);
be->be_search_results_release(&sr);
rc = pagedresults_set_current_be(pb->pb_conn, next_be, pr_idx, 1);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
if (NULL == next_be) {
/* no more entries && no more backends */
curr_search_count = -1;
@@ -925,9 +925,9 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
next_be = NULL; /* to break the loop */
if (operation->o_status & SLAPI_OP_STATUS_ABANDONED) {
/* It turned out this search was abandoned. */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pagedresults_free_one_msgid_nolock( pb->pb_conn, operation->o_msgid);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
/* paged-results-request was abandoned; making an empty cookie. */
pagedresults_set_response_control(pb, 0, estimate, -1, pr_idx);
send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL);
diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c
index c1947f1..d10edd0 100644
--- a/ldap/servers/slapd/pagedresults.c
+++ b/ldap/servers/slapd/pagedresults.c
@@ -119,7 +119,7 @@ pagedresults_parse_control_value( Slapi_PBlock *pb,
return LDAP_PROTOCOL_ERROR;
}
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* the ber encoding is no longer needed */
ber_free(ber, 1);
if ( cookie.bv_len <= 0 ) {
@@ -217,7 +217,7 @@ bail:
}
}
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_parse_control_value: idx %d\n", *index);
@@ -314,7 +314,7 @@ pagedresults_free_one( Connection *conn, Operation *op, int index )
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_free_one: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (conn->c_pagedresults.prl_count <= 0) {
LDAPDebug2Args(LDAP_DEBUG_TRACE, "pagedresults_free_one: "
"conn=%d paged requests list count is %d\n",
@@ -325,7 +325,7 @@ pagedresults_free_one( Connection *conn, Operation *op, int index )
conn->c_pagedresults.prl_count--;
rc = 0;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_free_one: %d\n", rc);
@@ -377,11 +377,11 @@ pagedresults_get_current_be(Connection *conn, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_current_be: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
be = conn->c_pagedresults.prl_list[index].pr_current_be;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_current_be: %p\n", be);
@@ -395,12 +395,12 @@ pagedresults_set_current_be(Connection *conn, Slapi_Backend *be, int index, int
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_current_be: idx=%d\n", index);
if (conn && (index > -1)) {
- if (!nolock) PR_Lock(conn->c_mutex);
+ if (!nolock) PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_current_be = be;
}
rc = 0;
- if (!nolock) PR_Unlock(conn->c_mutex);
+ if (!nolock) PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_set_current_be: %d\n", rc);
@@ -419,13 +419,13 @@ pagedresults_get_search_result(Connection *conn, Operation *op, int locked, int
locked?"locked":"not locked", index);
if (conn && (index > -1)) {
if (!locked) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
if (index < conn->c_pagedresults.prl_maxlen) {
sr = conn->c_pagedresults.prl_list[index].pr_search_result_set;
}
if (!locked) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -444,7 +444,7 @@ pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int lo
"--> pagedresults_set_search_result: idx=%d, sr=%p\n",
index, sr);
if (conn && (index > -1)) {
- if (!locked) PR_Lock(conn->c_mutex);
+ if (!locked) PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
PagedResults *prp = conn->c_pagedresults.prl_list + index;
if (!(prp->pr_flags & CONN_FLAG_PAGEDRESULTS_ABANDONED) || !sr) {
@@ -453,7 +453,7 @@ pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int lo
}
rc = 0;
}
- if (!locked) PR_Unlock(conn->c_mutex);
+ if (!locked) PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_set_search_result: %d\n", rc);
@@ -470,11 +470,11 @@ pagedresults_get_search_result_count(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_search_result_count: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
count = conn->c_pagedresults.prl_list[index].pr_search_result_count;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_search_result_count: %d\n", count);
@@ -492,11 +492,11 @@ pagedresults_set_search_result_count(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_search_result_count: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_search_result_count = count;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -517,11 +517,11 @@ pagedresults_get_search_result_set_size_estimate(Connection *conn,
"--> pagedresults_get_search_result_set_size_estimate: "
"idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
count = conn->c_pagedresults.prl_list[index].pr_search_result_set_size_estimate;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_search_result_set_size_estimate: %d\n",
@@ -542,11 +542,11 @@ pagedresults_set_search_result_set_size_estimate(Connection *conn,
"--> pagedresults_set_search_result_set_size_estimate: "
"idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_search_result_set_size_estimate = count;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -565,11 +565,11 @@ pagedresults_get_with_sort(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_with_sort: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
flags = conn->c_pagedresults.prl_list[index].pr_flags&CONN_FLAG_PAGEDRESULTS_WITH_SORT;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_with_sort: %p\n", flags);
@@ -587,14 +587,14 @@ pagedresults_set_with_sort(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_with_sort: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
if (flags & OP_FLAG_SERVER_SIDE_SORTING) {
conn->c_pagedresults.prl_list[index].pr_flags |=
CONN_FLAG_PAGEDRESULTS_WITH_SORT;
}
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_set_with_sort: %d\n", rc);
@@ -611,11 +611,11 @@ pagedresults_get_unindexed(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_unindexed: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
flags = conn->c_pagedresults.prl_list[index].pr_flags&CONN_FLAG_PAGEDRESULTS_UNINDEXED;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_unindexed: %p\n", flags);
@@ -632,12 +632,12 @@ pagedresults_set_unindexed(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_unindexed: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_flags |=
CONN_FLAG_PAGEDRESULTS_UNINDEXED;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -655,11 +655,11 @@ pagedresults_get_sort_result_code(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_sort_result_code: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
code = conn->c_pagedresults.prl_list[index].pr_sort_result_code;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_sort_result_code: %d\n", code);
@@ -677,11 +677,11 @@ pagedresults_set_sort_result_code(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_sort_result_code: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_sort_result_code = code;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -700,11 +700,11 @@ pagedresults_set_timelimit(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_timelimit: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_timelimit = timelimit;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_set_timelimit: %d\n", rc);
@@ -762,7 +762,7 @@ pagedresults_cleanup(Connection *conn, int needlock)
}
if (needlock) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
for (i = 0; conn->c_pagedresults.prl_list &&
i < conn->c_pagedresults.prl_maxlen; i++) {
@@ -780,7 +780,7 @@ pagedresults_cleanup(Connection *conn, int needlock)
}
conn->c_pagedresults.prl_count = 0;
if (needlock) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_cleanup: %d\n", rc);
return rc;
@@ -807,7 +807,7 @@ pagedresults_cleanup_all(Connection *conn, int needlock)
}
if (needlock) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
for (i = 0; conn->c_pagedresults.prl_list &&
i < conn->c_pagedresults.prl_maxlen; i++) {
@@ -826,7 +826,7 @@ pagedresults_cleanup_all(Connection *conn, int needlock)
conn->c_pagedresults.prl_maxlen = 0;
conn->c_pagedresults.prl_count = 0;
if (needlock) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_cleanup_all: %d\n", rc);
return rc;
@@ -845,7 +845,7 @@ pagedresults_check_or_set_processing(Connection *conn, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_check_or_set_processing\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
ret = (conn->c_pagedresults.prl_list[index].pr_flags &
CONN_FLAG_PAGEDRESULTS_PROCESSING);
@@ -853,7 +853,7 @@ pagedresults_check_or_set_processing(Connection *conn, int index)
conn->c_pagedresults.prl_list[index].pr_flags |=
CONN_FLAG_PAGEDRESULTS_PROCESSING;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_check_or_set_processing: %d\n", ret);
@@ -872,7 +872,7 @@ pagedresults_reset_processing(Connection *conn, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_reset_processing: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
ret = (conn->c_pagedresults.prl_list[index].pr_flags &
CONN_FLAG_PAGEDRESULTS_PROCESSING);
@@ -880,7 +880,7 @@ pagedresults_reset_processing(Connection *conn, int index)
conn->c_pagedresults.prl_list[index].pr_flags &=
~CONN_FLAG_PAGEDRESULTS_PROCESSING;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_reset_processing: %d\n", ret);
@@ -994,9 +994,9 @@ pagedresults_lock( Connection *conn, int index )
if (!conn || (index < 0) || (index >= conn->c_pagedresults.prl_maxlen)) {
return;
}
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
prp = conn->c_pagedresults.prl_list + index;
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (prp->pr_mutex) {
PR_Lock(prp->pr_mutex);
}
@@ -1010,9 +1010,9 @@ pagedresults_unlock( Connection *conn, int index )
if (!conn || (index < 0) || (index >= conn->c_pagedresults.prl_maxlen)) {
return;
}
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
prp = conn->c_pagedresults.prl_list + index;
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (prp->pr_mutex) {
PR_Unlock(prp->pr_mutex);
}
@@ -1027,11 +1027,11 @@ pagedresults_is_abandoned_or_notavailable(Connection *conn, int locked, int inde
return 1; /* not abandoned, but do not want to proceed paged results op. */
}
if (!locked) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
prp = conn->c_pagedresults.prl_list + index;
if (!locked) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
return prp->pr_flags & CONN_FLAG_PAGEDRESULTS_ABANDONED;
}
@@ -1055,12 +1055,12 @@ pagedresults_set_search_result_pb(Slapi_PBlock *pb, void *sr, int locked)
LDAPDebug2Args(LDAP_DEBUG_TRACE,
"--> pagedresults_set_search_result_pb: idx=%d, sr=%p\n", index, sr);
if (conn && (index > -1)) {
- if (!locked) PR_Lock(conn->c_mutex);
+ if (!locked) PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_search_result_set = sr;
rc = 0;
}
- if (!locked) PR_Unlock(conn->c_mutex);
+ if (!locked) PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_set_search_result_pb: %d\n", rc);
diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c
index b12881b..40d0358 100644
--- a/ldap/servers/slapd/pblock.c
+++ b/ldap/servers/slapd/pblock.c
@@ -145,7 +145,7 @@ if ( PBLOCK ->pb_plugin->plg_type != TYPE) return( -1 )
int
slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
{
- char *authtype;
+ char *authtype;
Slapi_Backend *be;
PR_ASSERT( NULL != pblock );
@@ -202,10 +202,10 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_DN \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(char **)value) = (NULL == pblock->pb_conn->c_dn ? NULL :
slapi_ch_strdup( pblock->pb_conn->c_dn ));
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_AUTHTYPE:/* deprecated */
if (pblock->pb_conn == NULL) {
@@ -213,9 +213,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_AUTHTYPE \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
- authtype = pblock->pb_conn->c_authtype;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
+ authtype = pblock->pb_conn->c_authtype;
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
if (authtype == NULL) {
(*(char **)value) = NULL;
} else if (strcasecmp(authtype, SLAPD_AUTH_NONE) == 0) {
@@ -240,10 +240,10 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_AUTHMETHOD \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(char **)value) = pblock->pb_conn->c_authtype ?
slapi_ch_strdup(pblock->pb_conn->c_authtype) : NULL;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_CLIENTNETADDR:
if (pblock->pb_conn == NULL)
@@ -251,14 +251,14 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( PRNetAddr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_addr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
(*(PRNetAddr *)value) =
*(pblock->pb_conn->cin_addr);
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SERVERNETADDR:
if (pblock->pb_conn == NULL)
@@ -266,14 +266,14 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( PRNetAddr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_destaddr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
(*(PRNetAddr *)value) =
*(pblock->pb_conn->cin_destaddr);
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_CLIENTIP:
if (pblock->pb_conn == NULL)
@@ -281,7 +281,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( struct in_addr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_addr == NULL ) {
memset( value, 0, sizeof( struct in_addr ));
} else {
@@ -296,7 +296,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( struct in_addr ));
}
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SERVERIP:
if (pblock->pb_conn == NULL)
@@ -304,7 +304,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( struct in_addr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_destaddr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
@@ -320,7 +320,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
}
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_IS_REPLICATION_SESSION:
if (pblock->pb_conn == NULL) {
@@ -328,9 +328,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_IS_REPLICATION_SESSION \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_isreplication_session;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_IS_SSL_SESSION:
if (pblock->pb_conn == NULL) {
@@ -338,9 +338,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_IS_SSL_SESSION \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_flags & CONN_FLAG_SSL;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SASL_SSF:
if (pblock->pb_conn == NULL) {
@@ -348,9 +348,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_SASL_SSF \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_sasl_ssf;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SSL_SSF:
if (pblock->pb_conn == NULL) {
@@ -358,9 +358,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_SSL_SSF \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_ssl_ssf;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_LOCAL_SSF:
if (pblock->pb_conn == NULL) {
@@ -368,9 +368,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_LOCAL_SSF \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_local_ssf;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_CERT:
if (pblock->pb_conn == NULL) {
@@ -1970,7 +1970,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
int
slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
{
- char *authtype;
+ char *authtype;
PR_ASSERT( NULL != pblock );
@@ -2036,10 +2036,10 @@ slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_AUTHMETHOD \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
- slapi_ch_free((void**)&pblock->pb_conn->c_authtype);
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
+ slapi_ch_free((void**)&pblock->pb_conn->c_authtype);
pblock->pb_conn->c_authtype = slapi_ch_strdup((char *) value);
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_IS_REPLICATION_SESSION:
if (pblock->pb_conn == NULL) {
@@ -2047,9 +2047,9 @@ slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_IS_REPLICATION_SESSION \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
pblock->pb_conn->c_isreplication_session = *((int *) value);
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
/* stuff related to config file processing */
@@ -3565,7 +3565,7 @@ bind_credentials_clear( Connection *conn, PRBool lock_conn,
PRBool clear_externalcreds )
{
if ( lock_conn ) {
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
}
if ( conn->c_dn != NULL ) { /* a non-anonymous bind has occurred */
@@ -3591,7 +3591,7 @@ bind_credentials_clear( Connection *conn, PRBool lock_conn,
}
if ( lock_conn ) {
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
}
@@ -3647,10 +3647,10 @@ void
bind_credentials_set( Connection *conn, char *authtype, char *normdn,
char *extauthtype, char *externaldn, CERTCertificate *clientcert, Slapi_Entry * bind_target_entry )
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
bind_credentials_set_nolock(conn, authtype, normdn,
extauthtype, externaldn, clientcert, bind_target_entry);
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
void
diff --git a/ldap/servers/slapd/psearch.c b/ldap/servers/slapd/psearch.c
index b5b4c3a..dcfc07a 100644
--- a/ldap/servers/slapd/psearch.c
+++ b/ldap/servers/slapd/psearch.c
@@ -300,9 +300,9 @@ ps_send_results( void *arg )
/* need to acquire a reference to this connection so that it will not
be released or cleaned up out from under us */
- PR_Lock( ps->ps_pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(ps->ps_pblock->pb_conn->c_mutex);
conn_acq_flag = connection_acquire_nolock(ps->ps_pblock->pb_conn);
- PR_Unlock( ps->ps_pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(ps->ps_pblock->pb_conn->c_mutex);
if (conn_acq_flag) {
slapi_log_error(SLAPI_LOG_CONNS, "Persistent Search",
@@ -419,7 +419,7 @@ ps_send_results( void *arg )
slapi_filter_free(filter, 1);
/* Clean up the connection structure */
- PR_Lock( ps->ps_pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(ps->ps_pblock->pb_conn->c_mutex);
slapi_log_error(SLAPI_LOG_CONNS, "Persistent Search",
"conn=%" NSPRIu64 " op=%d Releasing the connection and operation\n",
@@ -433,7 +433,7 @@ ps_send_results( void *arg )
if (conn_acq_flag == 0) { /* we acquired it, so release it */
connection_release_nolock (ps->ps_pblock->pb_conn);
}
- PR_Unlock( ps->ps_pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(ps->ps_pblock->pb_conn->c_mutex);
PR_DestroyLock ( ps->ps_lock );
ps->ps_lock = NULL;
diff --git a/ldap/servers/slapd/saslbind.c b/ldap/servers/slapd/saslbind.c
index eb814a2..c1e5f2b 100644
--- a/ldap/servers/slapd/saslbind.c
+++ b/ldap/servers/slapd/saslbind.c
@@ -673,7 +673,7 @@ char **ids_sasl_listmech(Slapi_PBlock *pb)
if (sasl_conn == NULL) return ret;
/* sasl library mechanisms are connection dependent */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
if (sasl_listmech(sasl_conn,
NULL, /* username */
"", ",", "",
@@ -686,7 +686,7 @@ char **ids_sasl_listmech(Slapi_PBlock *pb)
charray_free(others);
slapi_ch_free((void**)&dupstr);
}
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
LDAPDebug( LDAP_DEBUG_TRACE, "<= ids_sasl_listmech\n", 0, 0, 0 );
@@ -769,13 +769,13 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
PR_ASSERT(pb);
PR_ASSERT(pb->pb_conn);
- PR_Lock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_EnterMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
continuing = pb->pb_conn->c_flags & CONN_FLAG_SASL_CONTINUE;
pb->pb_conn->c_flags &= ~CONN_FLAG_SASL_CONTINUE; /* reset flag */
sasl_conn = (sasl_conn_t*)pb->pb_conn->c_sasl_conn;
if (sasl_conn == NULL) {
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result( pb, LDAP_AUTH_METHOD_NOT_SUPPORTED, NULL,
"sasl library unavailable", 0, NULL );
return;
@@ -850,7 +850,7 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
if (sasl_conn == NULL) {
send_ldap_result( pb, LDAP_AUTH_METHOD_NOT_SUPPORTED, NULL,
"sasl library unavailable", 0, NULL );
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
return;
}
}
@@ -866,7 +866,7 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
/* retrieve the authenticated username */
if (sasl_getprop(sasl_conn, SASL_USERNAME,
(const void**)&username) != SASL_OK) {
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL,
"could not obtain sasl username", 0, NULL);
break;
@@ -887,7 +887,7 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
}
}
if (dn == NULL) {
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL,
"could not get auth dn from sasl", 0, NULL);
break;
@@ -928,7 +928,7 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
slapi_ch_strdup(normdn),
NULL, NULL, NULL, bind_target_entry);
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
if (plugin_call_plugins( pb, SLAPI_PLUGIN_PRE_BIND_FN ) != 0){
break;
@@ -1003,9 +1003,9 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
/* see if we negotiated a security layer */
if (*ssfp > 0) {
/* Enable SASL I/O on the connection */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
connection_set_io_layer_cb(pb->pb_conn, sasl_io_enable, NULL, NULL);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
}
/* send successful result */
@@ -1018,7 +1018,7 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
case SASL_CONTINUE: /* another step needed */
pb->pb_conn->c_flags |= CONN_FLAG_SASL_CONTINUE;
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
if (plugin_call_plugins( pb, SLAPI_PLUGIN_PRE_BIND_FN ) != 0){
break;
@@ -1040,7 +1040,7 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
case SASL_NOMECH:
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_AUTH_METHOD_NOT_SUPPORTED, NULL,
"sasl mechanism not supported", 0, NULL);
break;
@@ -1048,7 +1048,7 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
default: /* other error */
errstr = sasl_errdetail(sasl_conn);
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_INVALID_CREDENTIALS, NULL,
(char*)errstr, 0, NULL);
break;
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index da90fe6..a84e802 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -1417,7 +1417,7 @@ typedef struct conn {
PRInt32 c_opscompleted; /* # ops completed */
PRInt32 c_threadnumber; /* # threads used in this conn */
int c_refcnt; /* # ops refering to this conn */
- PRLock *c_mutex; /* protect each conn structure */
+ PRMonitor *c_mutex; /* protect each conn structure; need to be re-entrant */
PRLock *c_pdumutex; /* only write one pdu at a time */
time_t c_idlesince; /* last time of activity on conn */
int c_idletimeout; /* local copy of idletimeout */
diff --git a/ldap/servers/slapd/start_tls_extop.c b/ldap/servers/slapd/start_tls_extop.c
index 1efa657..ef492f3 100644
--- a/ldap/servers/slapd/start_tls_extop.c
+++ b/ldap/servers/slapd/start_tls_extop.c
@@ -209,7 +209,7 @@ start_tls( Slapi_PBlock *pb )
/* At least we know that the request was indeed an Start TLS one. */
conn = pb->pb_conn;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/* cannot call slapi_send_ldap_result with mutex locked - will deadlock if ber_flush returns error */
#ifndef _WIN32
if ( conn->c_prfd == (PRFileDesc *) NULL ) {
@@ -298,12 +298,12 @@ start_tls( Slapi_PBlock *pb )
/* Since no specific argument for denying the Start TLS request has been found,
* we send a success response back to the client. */
- ldapmsg = "Start TLS request accepted.Server willing to negotiate SSL.";
- unlock_and_return:
- PR_Unlock( conn->c_mutex );
+ ldapmsg = "Start TLS request accepted.Server willing to negotiate SSL.";
+unlock_and_return:
+ PR_ExitMonitor(conn->c_mutex);
slapi_send_ldap_result( pb, ldaprc, NULL, ldapmsg, 0, NULL );
- return( SLAPI_PLUGIN_EXTENDED_SENT_RESULT );
+ return( SLAPI_PLUGIN_EXTENDED_SENT_RESULT );
}/* start_tls */
@@ -368,8 +368,7 @@ start_tls_graceful_closure( Connection *c, Slapi_PBlock * pb, int is_initiator )
*/
}
-
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
/* "Unimport" the socket from SSL, i.e. get rid of the upper layer of the
* file descriptor stack, which represents SSL.
@@ -409,7 +408,7 @@ start_tls_graceful_closure( Connection *c, Slapi_PBlock * pb, int is_initiator )
bind_credentials_clear( c, PR_FALSE, PR_TRUE );
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
diff --git a/ldap/servers/slapd/unbind.c b/ldap/servers/slapd/unbind.c
index afc6069..8800ce4 100644
--- a/ldap/servers/slapd/unbind.c
+++ b/ldap/servers/slapd/unbind.c
@@ -104,9 +104,9 @@ do_unbind( Slapi_PBlock *pb )
}
/* target spec is used to decide which plugins are applicable for the operation */
- PR_Lock( pb->pb_conn->c_mutex );
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
operation_set_target_spec_str (operation, pb->pb_conn->c_dn);
- PR_Unlock( pb->pb_conn->c_mutex );
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
/* ONREPL - plugins should be called and passed bind dn and, possibly, other data */
commit bab6ec6554b6f9da5dd734b1dcf5de2a382edfa8
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Thu Jan 7 18:04:19 2016 -0800
Revert "Ticket #48338 - SimplePagedResults -- abandon could happen between the abandon check and sending results"
This reverts commit 79ca67d1fc5d50d8a9ae6b686b9564f3960f8592.
The commit caused the bug 1296694 - ns-slapd crash in ipa context -
c_mutex lock memory corruption and self locks
(cherry picked from commit 181847863bda74c2e3d77b6a7d9278350d50d4cc)
(cherry picked from commit c8b1817896af7db6e4fab42734b827e002a7a25b)
(cherry picked from commit 61c3ff6ae654f9e0617741ee504f382fe78ee452)
diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c
index 4e57fc3..b12881b 100644
--- a/ldap/servers/slapd/pblock.c
+++ b/ldap/servers/slapd/pblock.c
@@ -251,12 +251,14 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( PRNetAddr ));
break;
}
- /* For fields with atomic access, remove the PR_Lock(c_mutex) */
+ PR_Lock( pblock->pb_conn->c_mutex );
if ( pblock->pb_conn->cin_addr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
- (*(PRNetAddr *)value) = *(pblock->pb_conn->cin_addr);
+ (*(PRNetAddr *)value) =
+ *(pblock->pb_conn->cin_addr);
}
+ PR_Unlock( pblock->pb_conn->c_mutex );
break;
case SLAPI_CONN_SERVERNETADDR:
if (pblock->pb_conn == NULL)
1
0
ldap/servers/slapd/abandon.c | 4 -
ldap/servers/slapd/bind.c | 4 -
ldap/servers/slapd/connection.c | 64 +++++++++++-----------
ldap/servers/slapd/conntable.c | 19 +++---
ldap/servers/slapd/daemon.c | 14 ++--
ldap/servers/slapd/extendop.c | 10 +--
ldap/servers/slapd/operation.c | 18 +++---
ldap/servers/slapd/opshared.c | 18 +++---
ldap/servers/slapd/pagedresults.c | 100 +++++++++++++++++------------------
ldap/servers/slapd/pblock.c | 74 +++++++++++++------------
ldap/servers/slapd/psearch.c | 10 +--
ldap/servers/slapd/saslbind.c | 26 ++++-----
ldap/servers/slapd/slap.h | 2
ldap/servers/slapd/start_tls_extop.c | 15 ++---
ldap/servers/slapd/unbind.c | 4 -
15 files changed, 192 insertions(+), 190 deletions(-)
New commits:
commit ad08d1fa7c258bb99cd64a4de570035d82e6a492
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Jan 11 15:53:28 2016 -0800
Ticket #48406 - Avoid self deadlock by PR_Lock(conn->c_mutex)
Description: Fixing ticket 48338 introduced a self deadlock.
To avoid the self deadlock, tried to remove PR_Lock(conn->c_mutex)
which looked harmless, but it introduced a crash by memory corruption.
This patch replaces PR_Lock/Unlock with PR_EnterMonitor/ExitMonitor,
respectively.
https://fedorahosted.org/389/ticket/48406
Reviewed by rmeggins(a)redhat.com, lkrispen(a)redhat.com, and wibrown(a)redhat.com.
Thank you, Rich, Ludwig and William!
(cherry picked from commit f25f804a8bce83b3790e7045dfc03230d7ece1af)
(cherry picked from commit 84da7d05ddc5a963b0d025df08f38a6ccd7d90d2)
diff --git a/ldap/servers/slapd/abandon.c b/ldap/servers/slapd/abandon.c
index 9797f7c..541788d 100644
--- a/ldap/servers/slapd/abandon.c
+++ b/ldap/servers/slapd/abandon.c
@@ -108,7 +108,7 @@ do_abandon( Slapi_PBlock *pb )
* flag and abort the operation at a convenient time.
*/
- PR_Lock( pb->pb_conn->c_mutex );
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
for ( o = pb->pb_conn->c_ops; o != NULL; o = o->o_next ) {
if ( o->o_msgid == id && o != pb->pb_op)
break;
@@ -169,7 +169,7 @@ do_abandon( Slapi_PBlock *pb )
o->o_results.r.r_search.nentries, current_time() - o->o_time );
}
- PR_Unlock( pb->pb_conn->c_mutex );
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
/*
* Wake up the persistent searches, so they
* can notice if they've been abandoned.
diff --git a/ldap/servers/slapd/bind.c b/ldap/servers/slapd/bind.c
index acc65ce..889f88f 100644
--- a/ldap/servers/slapd/bind.c
+++ b/ldap/servers/slapd/bind.c
@@ -290,7 +290,7 @@ do_bind( Slapi_PBlock *pb )
slapi_pblock_get (pb, SLAPI_PWPOLICY, &pw_response_requested);
}
- PR_Lock( pb->pb_conn->c_mutex );
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
bind_credentials_clear( pb->pb_conn, PR_FALSE, /* do not lock conn */
PR_FALSE /* do not clear external creds. */ );
@@ -323,7 +323,7 @@ do_bind( Slapi_PBlock *pb )
* bound user can work properly
*/
pb->pb_conn->c_needpw = 0;
- PR_Unlock( pb->pb_conn->c_mutex );
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
log_bind_access(pb, dn?dn:"empty", method, version, saslmech, NULL);
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index 9f0d9dc..3bb8959 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -178,7 +178,7 @@ connection_done(Connection *conn)
}
if (NULL != conn->c_mutex)
{
- PR_DestroyLock(conn->c_mutex);
+ PR_DestroyMonitor(conn->c_mutex);
}
if (NULL != conn->c_pdumutex)
{
@@ -764,10 +764,10 @@ int connection_is_free (Connection *conn)
{
int rc;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
rc = conn->c_sd == SLAPD_INVALID_SOCKET && conn->c_refcnt == 0 &&
!(conn->c_flags & CONN_FLAG_CLOSING);
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
return rc;
}
@@ -1968,7 +1968,7 @@ int connection_read_operation(Connection *conn, Operation *op, ber_tag_t *tag, i
PRErrorCode err = 0;
PRInt32 syserr = 0;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/*
* if the socket is still valid, get the ber element
* waiting for us on this connection. timeout is handled
@@ -2154,15 +2154,15 @@ int connection_read_operation(Connection *conn, Operation *op, ber_tag_t *tag, i
}
op->o_tag = *tag;
done:
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
return ret;
}
void connection_make_readable(Connection *conn)
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
conn->c_gettingber = 0;
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
signal_listner();
}
@@ -2178,7 +2178,7 @@ void connection_check_activity_level(Connection *conn)
{
int current_count = 0;
int delta_count = 0;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/* get the current op count */
current_count = conn->c_opscompleted;
/* compare to the previous op count */
@@ -2189,7 +2189,7 @@ void connection_check_activity_level(Connection *conn)
conn->c_private->previous_op_count = current_count;
/* update the last checked time */
conn->c_private->previous_count_check_time = current_time();
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
LDAPDebug(LDAP_DEBUG_CONNS,"conn %" NSPRIu64 " activity level = %d\n",conn->c_connid,delta_count,0);
}
@@ -2233,7 +2233,7 @@ void connection_enter_leave_turbo(Connection *conn, int current_turbo_flag, int
int connection_count = 0;
int our_rank = 0;
int threshold_rank = 0;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* We can already be in turbo mode, or not */
current_mode = current_turbo_flag;
if (pagedresults_in_use_nolock(conn)) {
@@ -2289,7 +2289,7 @@ void connection_enter_leave_turbo(Connection *conn, int current_turbo_flag, int
}
}
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (current_mode != new_mode) {
if (current_mode) {
LDAPDebug(LDAP_DEBUG_CONNS,"conn %" NSPRIu64 " leaving turbo mode\n",conn->c_connid,0,0);
@@ -2391,13 +2391,13 @@ connection_threadmain()
*/
PR_Sleep(PR_INTERVAL_NO_WAIT);
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* Make our own pb in turbo mode */
connection_make_new_pb(pb,conn);
if (connection_call_io_layer_callbacks(conn)) {
LDAPDebug0Args( LDAP_DEBUG_ANY, "Error: could not add/remove IO layers from connection\n" );
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (! config_check_referral_mode()) {
slapi_counter_increment(ops_initiated);
slapi_counter_increment(g_get_global_snmp_vars()->ops_tbl.dsInOps);
@@ -2485,7 +2485,7 @@ connection_threadmain()
signal_listner();
} else { /* more data in conn - just put back on work_q - bypass poll */
bypasspollcnt++;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* don't do this if it would put us over the max threads per conn */
if (conn->c_threadnumber < maxthreads) {
/* for turbo, c_idlesince is set above - for !turbo and
@@ -2499,7 +2499,7 @@ connection_threadmain()
/* keep count of how many times maxthreads has blocked an operation */
conn->c_maxthreadsblocked++;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
}
@@ -2535,14 +2535,14 @@ connection_threadmain()
done:
if (doshutdown) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
connection_remove_operation_ext(pb, conn, op);
connection_make_readable_nolock(conn);
conn->c_threadnumber--;
slapi_counter_decrement(conns_in_maxthreads);
slapi_counter_decrement(g_get_global_snmp_vars()->ops_tbl.dsConnectionsInMaxThreads);
connection_release_nolock(conn);
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
signal_listner();
return;
}
@@ -2559,9 +2559,9 @@ done:
slapi_counter_increment(ops_completed);
/* If this op isn't a persistent search, remove it */
if ( pb->pb_op->o_flags & OP_FLAG_PS ) {
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_release_nolock (conn); /* psearch acquires ref to conn - release this one now */
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
/* ps_add makes a shallow copy of the pb - so we
* can't free it or init it here - just memset it to 0
* ps_send_results will call connection_remove_operation_ext to free it
@@ -2569,7 +2569,7 @@ done:
memset(pb, 0, sizeof(*pb));
} else {
/* delete from connection operation queue & decr refcnt */
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_remove_operation_ext( pb, conn, op );
/* If we're in turbo mode, we keep our reference to the connection alive */
@@ -2607,7 +2607,7 @@ done:
signal_listner();
}
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
} /* while (1) */
}
@@ -2886,16 +2886,16 @@ op_copy_identity(Connection *conn, Operation *op)
size_t dnlen;
size_t typelen;
- PR_Lock( conn->c_mutex );
- dnlen= conn->c_dn ? strlen (conn->c_dn) : 0;
- typelen= conn->c_authtype ? strlen (conn->c_authtype) : 0;
+ PR_EnterMonitor(conn->c_mutex);
+ dnlen= conn->c_dn ? strlen (conn->c_dn) : 0;
+ typelen= conn->c_authtype ? strlen (conn->c_authtype) : 0;
- slapi_sdn_done(&op->o_sdn);
- slapi_ch_free_string(&(op->o_authtype));
+ slapi_sdn_done(&op->o_sdn);
+ slapi_ch_free_string(&(op->o_authtype));
if (dnlen <= 0 && typelen <= 0) {
op->o_authtype = NULL;
} else {
- slapi_sdn_set_dn_byval(&op->o_sdn,conn->c_dn);
+ slapi_sdn_set_dn_byval(&op->o_sdn,conn->c_dn);
op->o_authtype = slapi_ch_strdup(conn->c_authtype);
/* set the thread data bind dn index */
slapi_td_set_dn(slapi_ch_strdup(conn->c_dn));
@@ -2918,14 +2918,14 @@ op_copy_identity(Connection *conn, Operation *op)
op->o_ssf = conn->c_local_ssf;
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
/* Sets the SSL SSF in the connection struct. */
static void
connection_set_ssl_ssf(Connection *conn)
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
if (conn->c_flags & CONN_FLAG_SSL) {
SSL_SecurityStatus(conn->c_prfd, NULL, NULL, NULL, &(conn->c_ssl_ssf), NULL, NULL);
@@ -2933,7 +2933,7 @@ connection_set_ssl_ssf(Connection *conn)
conn->c_ssl_ssf = 0;
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
static int
@@ -2980,9 +2980,9 @@ log_ber_too_big_error(const Connection *conn, ber_len_t ber_len,
void
disconnect_server( Connection *conn, PRUint64 opconnid, int opid, PRErrorCode reason, PRInt32 error )
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
disconnect_server_nomutex( conn, opconnid, opid, reason, error );
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
static ps_wakeup_all_fn_ptr ps_wakeup_all_fn = NULL;
diff --git a/ldap/servers/slapd/conntable.c b/ldap/servers/slapd/conntable.c
index 5225e11..0d1ac94 100644
--- a/ldap/servers/slapd/conntable.c
+++ b/ldap/servers/slapd/conntable.c
@@ -140,11 +140,11 @@ connection_table_abandon_all_operations(Connection_Table *ct)
int i;
for ( i = 0; i < ct->size; i++ )
{
- if ( ct->c[i].c_mutex != NULL )
+ if ( ct->c[i].c_mutex )
{
- PR_Lock( ct->c[i].c_mutex );
+ PR_EnterMonitor(ct->c[i].c_mutex);
connection_abandon_operations( &ct->c[i] );
- PR_Unlock( ct->c[i].c_mutex );
+ PR_ExitMonitor(ct->c[i].c_mutex);
}
}
}
@@ -194,7 +194,7 @@ connection_table_get_connection(Connection_Table *ct, int sd)
if ( c->c_mutex == NULL )
{
PR_Lock( ct->table_mutex );
- c->c_mutex = PR_NewLock();
+ c->c_mutex = PR_NewMonitor();
c->c_pdumutex = PR_NewLock();
PR_Unlock( ct->table_mutex );
if ( c->c_mutex == NULL || c->c_pdumutex == NULL )
@@ -399,7 +399,7 @@ connection_table_as_entry(Connection_Table *ct, Slapi_Entry *e)
/* Can't take c_mutex if holding table_mutex; temporarily unlock */
PR_Unlock( ct->table_mutex );
- PR_Lock( ct->c[i].c_mutex );
+ PR_EnterMonitor(ct->c[i].c_mutex);
if ( ct->c[i].c_sd != SLAPD_INVALID_SOCKET )
{
char buf2[20];
@@ -467,7 +467,7 @@ connection_table_as_entry(Connection_Table *ct, Slapi_Entry *e)
attrlist_merge( &e->e_attrs, "connection", vals );
slapi_ch_free_string(&newbuf);
}
- PR_Unlock( ct->c[i].c_mutex );
+ PR_ExitMonitor(ct->c[i].c_mutex);
}
PR_snprintf( buf, sizeof(buf), "%d", nconns );
@@ -505,14 +505,15 @@ void
connection_table_dump_activity_to_errors_log(Connection_Table *ct)
{
int i;
+
for ( i = 0; i < ct->size; i++ )
{
Connection *c= &(ct->c[i]);
- if ( c->c_mutex != NULL )
+ if ( c->c_mutex )
{
/* Find the connection we are referring to */
int j= c->c_fdi;
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
if ( (c->c_sd != SLAPD_INVALID_SOCKET) &&
(j >= 0) && (c->c_prfd == ct->fd[j].fd) )
{
@@ -522,7 +523,7 @@ connection_table_dump_activity_to_errors_log(Connection_Table *ct)
LDAPDebug( LDAP_DEBUG_CONNS,"activity on %d%s\n", i, r ? "r" : "",0 );
}
}
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
}
}
}
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 1230abc..11f51bc 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -1929,7 +1929,7 @@ setup_pr_read_pds(Connection_Table *ct, PRFileDesc **n_tcps, PRFileDesc **s_tcps
}
else
{
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
if (c->c_flags & CONN_FLAG_CLOSING)
{
/* A worker thread has marked that this connection
@@ -1978,7 +1978,7 @@ setup_pr_read_pds(Connection_Table *ct, PRFileDesc **n_tcps, PRFileDesc **s_tcps
c->c_fdi = SLAPD_INVALID_SOCKET_INDEX;
}
}
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
}
c = next;
}
@@ -1997,7 +1997,7 @@ handle_timeout( void )
time_t curtime = current_time();
if (0 == prevtime) {
- prevtime = time (&housekeeping_fire_time);
+ prevtime = time (&housekeeping_fire_time);
}
if ( difftime(curtime, prevtime) >=
@@ -2185,7 +2185,7 @@ handle_pr_read_ready(Connection_Table *ct, PRIntn num_poll)
{
if ( c->c_mutex != NULL )
{
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
if ( connection_is_active_nolock (c) && c->c_gettingber == 0 )
{
PRInt16 out_flags;
@@ -2242,7 +2242,7 @@ handle_pr_read_ready(Connection_Table *ct, PRIntn num_poll)
SLAPD_DISCONNECT_IDLE_TIMEOUT, EAGAIN );
}
}
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
}
}
#endif
@@ -2819,7 +2819,7 @@ handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, i
PR_Close(pr_acceptfd);
return -1;
}
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/*
* Set the default idletimeout and the handle. We'll update c_idletimeout
@@ -2932,7 +2932,7 @@ handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, i
connection_table_move_connection_on_to_active_list(the_connection_table,conn);
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
g_increment_current_conn_count();
diff --git a/ldap/servers/slapd/extendop.c b/ldap/servers/slapd/extendop.c
index e5a4fcb..3e47919 100644
--- a/ldap/servers/slapd/extendop.c
+++ b/ldap/servers/slapd/extendop.c
@@ -90,7 +90,7 @@ static void extop_handle_import_start(Slapi_PBlock *pb, char *extoid,
send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL, NULL, 0, NULL);
return;
}
- suffix = slapi_sdn_get_dn(sdn);
+ suffix = slapi_sdn_get_dn(sdn);
/* be = slapi_be_select(sdn); */
be = slapi_mapping_tree_find_backend_for_sdn(sdn);
if (be == NULL || be == defbackend_get_backend()) {
@@ -164,10 +164,10 @@ static void extop_handle_import_start(Slapi_PBlock *pb, char *extoid,
/* okay, the import is starting now -- save the backend in the
* connection block & mark this connection as belonging to a bulk import
*/
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pb->pb_conn->c_flags |= CONN_FLAG_IMPORT;
pb->pb_conn->c_bi_backend = be;
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
slapi_pblock_set(pb, SLAPI_EXT_OP_RET_OID, EXTOP_BULK_IMPORT_START_OID);
bv.bv_val = NULL;
@@ -189,11 +189,11 @@ static void extop_handle_import_done(Slapi_PBlock *pb, char *extoid,
struct berval bv;
int ret;
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pb->pb_conn->c_flags &= ~CONN_FLAG_IMPORT;
be = pb->pb_conn->c_bi_backend;
pb->pb_conn->c_bi_backend = NULL;
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
if ((be == NULL) || (be->be_wire_import == NULL)) {
/* can this even happen? */
diff --git a/ldap/servers/slapd/operation.c b/ldap/servers/slapd/operation.c
index f27c673..b68e575 100644
--- a/ldap/servers/slapd/operation.c
+++ b/ldap/servers/slapd/operation.c
@@ -601,7 +601,7 @@ int slapi_connection_acquire(Slapi_Connection *conn)
{
int rc;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* rc = connection_acquire_nolock(conn); */
/* connection in the closing state can't be acquired */
if (conn->c_flags & CONN_FLAG_CLOSING)
@@ -617,7 +617,7 @@ int slapi_connection_acquire(Slapi_Connection *conn)
conn->c_refcnt++;
rc = 0;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
return(rc);
}
@@ -627,7 +627,7 @@ slapi_connection_remove_operation( Slapi_PBlock *pb, Slapi_Connection *conn, Sla
int rc = 0;
Slapi_Operation **olist= &conn->c_ops;
Slapi_Operation **tmp;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/* connection_remove_operation_ext(pb, conn,op); */
for ( tmp = olist; *tmp != NULL && *tmp != op; tmp = &(*tmp)->o_next )
; /* NULL */
@@ -645,15 +645,15 @@ slapi_connection_remove_operation( Slapi_PBlock *pb, Slapi_Connection *conn, Sla
if (release) {
/* connection_release_nolock(conn); */
if (conn->c_refcnt <= 0) {
- slapi_log_error(SLAPI_LOG_FATAL, "connection",
- "conn=%" NSPRIu64 " fd=%d Attempt to release connection that is not acquired\n",
- conn->c_connid, conn->c_sd);
- rc = -1;
+ slapi_log_error(SLAPI_LOG_FATAL, "connection",
+ "conn=%" NSPRIu64 " fd=%d Attempt to release connection that is not acquired\n",
+ conn->c_connid, conn->c_sd);
+ rc = -1;
} else {
- conn->c_refcnt--;
+ conn->c_refcnt--;
rc = 0;
}
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
return (rc);
}
diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c
index 0ce6a59..53335cf 100644
--- a/ldap/servers/slapd/opshared.c
+++ b/ldap/servers/slapd/opshared.c
@@ -707,7 +707,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
* In async paged result case, the search result might be released
* by other theads. We need to double check it in the locked region.
*/
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, 1/*locked*/, pr_idx);
if (pr_search_result) {
if (pagedresults_is_abandoned_or_notavailable(pb->pb_conn, 1/*locked*/, pr_idx)) {
@@ -715,7 +715,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
/* Previous operation was abandoned and the simplepaged object is not in use. */
send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL);
rc = LDAP_SUCCESS;
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
goto free_and_return;
} else {
slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_SET, pr_search_result );
@@ -724,7 +724,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
/* search result could be reset in the backend/dse */
slapi_pblock_get(pb, SLAPI_SEARCH_RESULT_SET, &sr);
pagedresults_set_search_result(pb->pb_conn, operation, sr, 1/*locked*/, pr_idx);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
}
} else {
pr_stat = PAGEDRESULTS_SEARCH_END;
@@ -858,10 +858,10 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
/* PAGED RESULTS */
if (op_is_pagedresults(operation)) {
/* cleanup the slot */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pagedresults_set_search_result(pb->pb_conn, operation, NULL, 1, pr_idx);
rc = pagedresults_set_current_be(pb->pb_conn, NULL, pr_idx, 1);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
}
if (1 == flag_no_such_object) {
break;
@@ -903,11 +903,11 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
slapi_pblock_get(pb, SLAPI_SEARCH_RESULT_SET, &sr);
if (PAGEDRESULTS_SEARCH_END == pr_stat) {
/* no more entries, but at least another backend */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pagedresults_set_search_result(pb->pb_conn, operation, NULL, 1, pr_idx);
be->be_search_results_release(&sr);
rc = pagedresults_set_current_be(pb->pb_conn, next_be, pr_idx, 1);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
if (NULL == next_be) {
/* no more entries && no more backends */
curr_search_count = -1;
@@ -932,9 +932,9 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
next_be = NULL; /* to break the loop */
if (operation->o_status & SLAPI_OP_STATUS_ABANDONED) {
/* It turned out this search was abandoned. */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pagedresults_free_one_msgid_nolock( pb->pb_conn, operation->o_msgid);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
/* paged-results-request was abandoned; making an empty cookie. */
pagedresults_set_response_control(pb, 0, estimate, -1, pr_idx);
send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL);
diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c
index c1947f1..d10edd0 100644
--- a/ldap/servers/slapd/pagedresults.c
+++ b/ldap/servers/slapd/pagedresults.c
@@ -119,7 +119,7 @@ pagedresults_parse_control_value( Slapi_PBlock *pb,
return LDAP_PROTOCOL_ERROR;
}
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* the ber encoding is no longer needed */
ber_free(ber, 1);
if ( cookie.bv_len <= 0 ) {
@@ -217,7 +217,7 @@ bail:
}
}
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_parse_control_value: idx %d\n", *index);
@@ -314,7 +314,7 @@ pagedresults_free_one( Connection *conn, Operation *op, int index )
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_free_one: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (conn->c_pagedresults.prl_count <= 0) {
LDAPDebug2Args(LDAP_DEBUG_TRACE, "pagedresults_free_one: "
"conn=%d paged requests list count is %d\n",
@@ -325,7 +325,7 @@ pagedresults_free_one( Connection *conn, Operation *op, int index )
conn->c_pagedresults.prl_count--;
rc = 0;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_free_one: %d\n", rc);
@@ -377,11 +377,11 @@ pagedresults_get_current_be(Connection *conn, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_current_be: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
be = conn->c_pagedresults.prl_list[index].pr_current_be;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_current_be: %p\n", be);
@@ -395,12 +395,12 @@ pagedresults_set_current_be(Connection *conn, Slapi_Backend *be, int index, int
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_current_be: idx=%d\n", index);
if (conn && (index > -1)) {
- if (!nolock) PR_Lock(conn->c_mutex);
+ if (!nolock) PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_current_be = be;
}
rc = 0;
- if (!nolock) PR_Unlock(conn->c_mutex);
+ if (!nolock) PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_set_current_be: %d\n", rc);
@@ -419,13 +419,13 @@ pagedresults_get_search_result(Connection *conn, Operation *op, int locked, int
locked?"locked":"not locked", index);
if (conn && (index > -1)) {
if (!locked) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
if (index < conn->c_pagedresults.prl_maxlen) {
sr = conn->c_pagedresults.prl_list[index].pr_search_result_set;
}
if (!locked) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -444,7 +444,7 @@ pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int lo
"--> pagedresults_set_search_result: idx=%d, sr=%p\n",
index, sr);
if (conn && (index > -1)) {
- if (!locked) PR_Lock(conn->c_mutex);
+ if (!locked) PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
PagedResults *prp = conn->c_pagedresults.prl_list + index;
if (!(prp->pr_flags & CONN_FLAG_PAGEDRESULTS_ABANDONED) || !sr) {
@@ -453,7 +453,7 @@ pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int lo
}
rc = 0;
}
- if (!locked) PR_Unlock(conn->c_mutex);
+ if (!locked) PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_set_search_result: %d\n", rc);
@@ -470,11 +470,11 @@ pagedresults_get_search_result_count(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_search_result_count: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
count = conn->c_pagedresults.prl_list[index].pr_search_result_count;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_search_result_count: %d\n", count);
@@ -492,11 +492,11 @@ pagedresults_set_search_result_count(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_search_result_count: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_search_result_count = count;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -517,11 +517,11 @@ pagedresults_get_search_result_set_size_estimate(Connection *conn,
"--> pagedresults_get_search_result_set_size_estimate: "
"idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
count = conn->c_pagedresults.prl_list[index].pr_search_result_set_size_estimate;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_search_result_set_size_estimate: %d\n",
@@ -542,11 +542,11 @@ pagedresults_set_search_result_set_size_estimate(Connection *conn,
"--> pagedresults_set_search_result_set_size_estimate: "
"idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_search_result_set_size_estimate = count;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -565,11 +565,11 @@ pagedresults_get_with_sort(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_with_sort: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
flags = conn->c_pagedresults.prl_list[index].pr_flags&CONN_FLAG_PAGEDRESULTS_WITH_SORT;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_with_sort: %p\n", flags);
@@ -587,14 +587,14 @@ pagedresults_set_with_sort(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_with_sort: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
if (flags & OP_FLAG_SERVER_SIDE_SORTING) {
conn->c_pagedresults.prl_list[index].pr_flags |=
CONN_FLAG_PAGEDRESULTS_WITH_SORT;
}
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_set_with_sort: %d\n", rc);
@@ -611,11 +611,11 @@ pagedresults_get_unindexed(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_unindexed: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
flags = conn->c_pagedresults.prl_list[index].pr_flags&CONN_FLAG_PAGEDRESULTS_UNINDEXED;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_unindexed: %p\n", flags);
@@ -632,12 +632,12 @@ pagedresults_set_unindexed(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_unindexed: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_flags |=
CONN_FLAG_PAGEDRESULTS_UNINDEXED;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -655,11 +655,11 @@ pagedresults_get_sort_result_code(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_sort_result_code: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
code = conn->c_pagedresults.prl_list[index].pr_sort_result_code;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_sort_result_code: %d\n", code);
@@ -677,11 +677,11 @@ pagedresults_set_sort_result_code(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_sort_result_code: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_sort_result_code = code;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -700,11 +700,11 @@ pagedresults_set_timelimit(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_timelimit: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_timelimit = timelimit;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_set_timelimit: %d\n", rc);
@@ -762,7 +762,7 @@ pagedresults_cleanup(Connection *conn, int needlock)
}
if (needlock) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
for (i = 0; conn->c_pagedresults.prl_list &&
i < conn->c_pagedresults.prl_maxlen; i++) {
@@ -780,7 +780,7 @@ pagedresults_cleanup(Connection *conn, int needlock)
}
conn->c_pagedresults.prl_count = 0;
if (needlock) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_cleanup: %d\n", rc);
return rc;
@@ -807,7 +807,7 @@ pagedresults_cleanup_all(Connection *conn, int needlock)
}
if (needlock) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
for (i = 0; conn->c_pagedresults.prl_list &&
i < conn->c_pagedresults.prl_maxlen; i++) {
@@ -826,7 +826,7 @@ pagedresults_cleanup_all(Connection *conn, int needlock)
conn->c_pagedresults.prl_maxlen = 0;
conn->c_pagedresults.prl_count = 0;
if (needlock) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_cleanup_all: %d\n", rc);
return rc;
@@ -845,7 +845,7 @@ pagedresults_check_or_set_processing(Connection *conn, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_check_or_set_processing\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
ret = (conn->c_pagedresults.prl_list[index].pr_flags &
CONN_FLAG_PAGEDRESULTS_PROCESSING);
@@ -853,7 +853,7 @@ pagedresults_check_or_set_processing(Connection *conn, int index)
conn->c_pagedresults.prl_list[index].pr_flags |=
CONN_FLAG_PAGEDRESULTS_PROCESSING;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_check_or_set_processing: %d\n", ret);
@@ -872,7 +872,7 @@ pagedresults_reset_processing(Connection *conn, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_reset_processing: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
ret = (conn->c_pagedresults.prl_list[index].pr_flags &
CONN_FLAG_PAGEDRESULTS_PROCESSING);
@@ -880,7 +880,7 @@ pagedresults_reset_processing(Connection *conn, int index)
conn->c_pagedresults.prl_list[index].pr_flags &=
~CONN_FLAG_PAGEDRESULTS_PROCESSING;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_reset_processing: %d\n", ret);
@@ -994,9 +994,9 @@ pagedresults_lock( Connection *conn, int index )
if (!conn || (index < 0) || (index >= conn->c_pagedresults.prl_maxlen)) {
return;
}
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
prp = conn->c_pagedresults.prl_list + index;
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (prp->pr_mutex) {
PR_Lock(prp->pr_mutex);
}
@@ -1010,9 +1010,9 @@ pagedresults_unlock( Connection *conn, int index )
if (!conn || (index < 0) || (index >= conn->c_pagedresults.prl_maxlen)) {
return;
}
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
prp = conn->c_pagedresults.prl_list + index;
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (prp->pr_mutex) {
PR_Unlock(prp->pr_mutex);
}
@@ -1027,11 +1027,11 @@ pagedresults_is_abandoned_or_notavailable(Connection *conn, int locked, int inde
return 1; /* not abandoned, but do not want to proceed paged results op. */
}
if (!locked) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
prp = conn->c_pagedresults.prl_list + index;
if (!locked) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
return prp->pr_flags & CONN_FLAG_PAGEDRESULTS_ABANDONED;
}
@@ -1055,12 +1055,12 @@ pagedresults_set_search_result_pb(Slapi_PBlock *pb, void *sr, int locked)
LDAPDebug2Args(LDAP_DEBUG_TRACE,
"--> pagedresults_set_search_result_pb: idx=%d, sr=%p\n", index, sr);
if (conn && (index > -1)) {
- if (!locked) PR_Lock(conn->c_mutex);
+ if (!locked) PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_search_result_set = sr;
rc = 0;
}
- if (!locked) PR_Unlock(conn->c_mutex);
+ if (!locked) PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_set_search_result_pb: %d\n", rc);
diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c
index d331b57..838e666 100644
--- a/ldap/servers/slapd/pblock.c
+++ b/ldap/servers/slapd/pblock.c
@@ -146,7 +146,7 @@ if ( PBLOCK ->pb_plugin->plg_type != TYPE) return( -1 )
int
slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
{
- char *authtype;
+ char *authtype;
Slapi_Backend *be;
PR_ASSERT( NULL != pblock );
@@ -203,10 +203,10 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_DN \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(char **)value) = (NULL == pblock->pb_conn->c_dn ? NULL :
slapi_ch_strdup( pblock->pb_conn->c_dn ));
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_AUTHTYPE:/* deprecated */
if (pblock->pb_conn == NULL) {
@@ -214,9 +214,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_AUTHTYPE \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
- authtype = pblock->pb_conn->c_authtype;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
+ authtype = pblock->pb_conn->c_authtype;
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
if (authtype == NULL) {
(*(char **)value) = NULL;
} else if (strcasecmp(authtype, SLAPD_AUTH_NONE) == 0) {
@@ -241,10 +241,10 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_AUTHMETHOD \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(char **)value) = pblock->pb_conn->c_authtype ?
slapi_ch_strdup(pblock->pb_conn->c_authtype) : NULL;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_CLIENTNETADDR:
if (pblock->pb_conn == NULL)
@@ -252,14 +252,14 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( PRNetAddr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_addr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
(*(PRNetAddr *)value) =
*(pblock->pb_conn->cin_addr);
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SERVERNETADDR:
if (pblock->pb_conn == NULL)
@@ -267,14 +267,14 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( PRNetAddr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_destaddr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
(*(PRNetAddr *)value) =
*(pblock->pb_conn->cin_destaddr);
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_CLIENTIP:
if (pblock->pb_conn == NULL)
@@ -282,7 +282,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( struct in_addr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_addr == NULL ) {
memset( value, 0, sizeof( struct in_addr ));
} else {
@@ -297,7 +297,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( struct in_addr ));
}
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SERVERIP:
if (pblock->pb_conn == NULL)
@@ -305,7 +305,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( struct in_addr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_destaddr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
@@ -321,7 +321,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
}
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_IS_REPLICATION_SESSION:
if (pblock->pb_conn == NULL) {
@@ -329,9 +329,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_IS_REPLICATION_SESSION \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_isreplication_session;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_IS_SSL_SESSION:
if (pblock->pb_conn == NULL) {
@@ -339,9 +339,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_IS_SSL_SESSION \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_flags & CONN_FLAG_SSL;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SASL_SSF:
if (pblock->pb_conn == NULL) {
@@ -349,9 +349,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_SASL_SSF \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_sasl_ssf;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SSL_SSF:
if (pblock->pb_conn == NULL) {
@@ -359,9 +359,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_SSL_SSF \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_ssl_ssf;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_LOCAL_SSF:
if (pblock->pb_conn == NULL) {
@@ -369,9 +369,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_LOCAL_SSF \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_local_ssf;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_CERT:
if (pblock->pb_conn == NULL) {
@@ -1982,7 +1982,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
int
slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
{
- char *authtype;
+ char *authtype;
PR_ASSERT( NULL != pblock );
@@ -2049,10 +2049,10 @@ slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_AUTHMETHOD \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
- slapi_ch_free((void**)&pblock->pb_conn->c_authtype);
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
+ slapi_ch_free((void**)&pblock->pb_conn->c_authtype);
pblock->pb_conn->c_authtype = slapi_ch_strdup((char *) value);
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_IS_REPLICATION_SESSION:
if (pblock->pb_conn == NULL) {
@@ -2060,9 +2060,9 @@ slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_IS_REPLICATION_SESSION \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
pblock->pb_conn->c_isreplication_session = *((int *) value);
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
/* stuff related to config file processing */
@@ -3600,7 +3600,7 @@ bind_credentials_clear( Connection *conn, PRBool lock_conn,
PRBool clear_externalcreds )
{
if ( lock_conn ) {
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
}
if ( conn->c_dn != NULL ) { /* a non-anonymous bind has occurred */
@@ -3626,7 +3626,7 @@ bind_credentials_clear( Connection *conn, PRBool lock_conn,
}
if ( lock_conn ) {
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
}
@@ -3682,10 +3682,10 @@ void
bind_credentials_set( Connection *conn, char *authtype, char *normdn,
char *extauthtype, char *externaldn, CERTCertificate *clientcert, Slapi_Entry * bind_target_entry )
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
bind_credentials_set_nolock(conn, authtype, normdn,
extauthtype, externaldn, clientcert, bind_target_entry);
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
void
diff --git a/ldap/servers/slapd/psearch.c b/ldap/servers/slapd/psearch.c
index 25a562a..c1dd7ee 100644
--- a/ldap/servers/slapd/psearch.c
+++ b/ldap/servers/slapd/psearch.c
@@ -306,9 +306,9 @@ ps_send_results( void *arg )
/* need to acquire a reference to this connection so that it will not
be released or cleaned up out from under us */
- PR_Lock( ps->ps_pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(ps->ps_pblock->pb_conn->c_mutex);
conn_acq_flag = connection_acquire_nolock(ps->ps_pblock->pb_conn);
- PR_Unlock( ps->ps_pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(ps->ps_pblock->pb_conn->c_mutex);
if (conn_acq_flag) {
slapi_log_error(SLAPI_LOG_CONNS, "Persistent Search",
@@ -426,7 +426,7 @@ ps_send_results( void *arg )
conn = ps->ps_pblock->pb_conn; /* save to release later - connection_remove_operation_ext will NULL the pb_conn */
/* Clean up the connection structure */
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
slapi_log_error(SLAPI_LOG_CONNS, "Persistent Search",
"conn=%" NSPRIu64 " op=%d Releasing the connection and operation\n",
@@ -436,9 +436,9 @@ ps_send_results( void *arg )
/* Decrement the connection refcnt */
if (conn_acq_flag == 0) { /* we acquired it, so release it */
- connection_release_nolock (conn);
+ connection_release_nolock (conn);
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
conn = NULL;
PR_DestroyLock ( ps->ps_lock );
diff --git a/ldap/servers/slapd/saslbind.c b/ldap/servers/slapd/saslbind.c
index 3ec9cd8..b31223f 100644
--- a/ldap/servers/slapd/saslbind.c
+++ b/ldap/servers/slapd/saslbind.c
@@ -691,7 +691,7 @@ char **ids_sasl_listmech(Slapi_PBlock *pb)
if (sasl_conn == NULL) return ret;
/* sasl library mechanisms are connection dependent */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
if (sasl_listmech(sasl_conn,
NULL, /* username */
"", ",", "",
@@ -704,7 +704,7 @@ char **ids_sasl_listmech(Slapi_PBlock *pb)
charray_free(others);
slapi_ch_free((void**)&dupstr);
}
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
LDAPDebug( LDAP_DEBUG_TRACE, "<= ids_sasl_listmech\n", 0, 0, 0 );
@@ -787,13 +787,13 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
PR_ASSERT(pb);
PR_ASSERT(pb->pb_conn);
- PR_Lock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_EnterMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
continuing = pb->pb_conn->c_flags & CONN_FLAG_SASL_CONTINUE;
pb->pb_conn->c_flags &= ~CONN_FLAG_SASL_CONTINUE; /* reset flag */
sasl_conn = (sasl_conn_t*)pb->pb_conn->c_sasl_conn;
if (sasl_conn == NULL) {
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result( pb, LDAP_AUTH_METHOD_NOT_SUPPORTED, NULL,
"sasl library unavailable", 0, NULL );
return;
@@ -874,7 +874,7 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
if (sasl_conn == NULL) {
send_ldap_result( pb, LDAP_AUTH_METHOD_NOT_SUPPORTED, NULL,
"sasl library unavailable", 0, NULL );
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
return;
}
}
@@ -890,7 +890,7 @@ sasl_check_result:
/* retrieve the authenticated username */
if (sasl_getprop(sasl_conn, SASL_USERNAME,
(const void**)&username) != SASL_OK) {
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL,
"could not obtain sasl username", 0, NULL);
break;
@@ -911,7 +911,7 @@ sasl_check_result:
}
}
if (dn == NULL) {
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL,
"could not get auth dn from sasl", 0, NULL);
break;
@@ -952,7 +952,7 @@ sasl_check_result:
slapi_ch_strdup(normdn),
NULL, NULL, NULL, bind_target_entry);
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
if (plugin_call_plugins( pb, SLAPI_PLUGIN_PRE_BIND_FN ) != 0){
break;
@@ -1027,9 +1027,9 @@ sasl_check_result:
/* see if we negotiated a security layer */
if (*ssfp > 0) {
/* Enable SASL I/O on the connection */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
connection_set_io_layer_cb(pb->pb_conn, sasl_io_enable, NULL, NULL);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
}
/* send successful result */
@@ -1042,7 +1042,7 @@ sasl_check_result:
case SASL_CONTINUE: /* another step needed */
pb->pb_conn->c_flags |= CONN_FLAG_SASL_CONTINUE;
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
if (plugin_call_plugins( pb, SLAPI_PLUGIN_PRE_BIND_FN ) != 0){
break;
@@ -1064,7 +1064,7 @@ sasl_check_result:
case SASL_NOMECH:
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_AUTH_METHOD_NOT_SUPPORTED, NULL,
"sasl mechanism not supported", 0, NULL);
break;
@@ -1072,7 +1072,7 @@ sasl_check_result:
default: /* other error */
errstr = sasl_errdetail(sasl_conn);
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_INVALID_CREDENTIALS, NULL,
(char*)errstr, 0, NULL);
break;
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index e2d2c90..98af114 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -1472,7 +1472,7 @@ typedef struct conn {
PRInt32 c_opscompleted; /* # ops completed */
PRInt32 c_threadnumber; /* # threads used in this conn */
int c_refcnt; /* # ops refering to this conn */
- PRLock *c_mutex; /* protect each conn structure */
+ PRMonitor *c_mutex; /* protect each conn structure; need to be re-entrant */
PRLock *c_pdumutex; /* only write one pdu at a time */
time_t c_idlesince; /* last time of activity on conn */
int c_idletimeout; /* local copy of idletimeout */
diff --git a/ldap/servers/slapd/start_tls_extop.c b/ldap/servers/slapd/start_tls_extop.c
index 1efa657..ef492f3 100644
--- a/ldap/servers/slapd/start_tls_extop.c
+++ b/ldap/servers/slapd/start_tls_extop.c
@@ -209,7 +209,7 @@ start_tls( Slapi_PBlock *pb )
/* At least we know that the request was indeed an Start TLS one. */
conn = pb->pb_conn;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/* cannot call slapi_send_ldap_result with mutex locked - will deadlock if ber_flush returns error */
#ifndef _WIN32
if ( conn->c_prfd == (PRFileDesc *) NULL ) {
@@ -298,12 +298,12 @@ start_tls( Slapi_PBlock *pb )
/* Since no specific argument for denying the Start TLS request has been found,
* we send a success response back to the client. */
- ldapmsg = "Start TLS request accepted.Server willing to negotiate SSL.";
- unlock_and_return:
- PR_Unlock( conn->c_mutex );
+ ldapmsg = "Start TLS request accepted.Server willing to negotiate SSL.";
+unlock_and_return:
+ PR_ExitMonitor(conn->c_mutex);
slapi_send_ldap_result( pb, ldaprc, NULL, ldapmsg, 0, NULL );
- return( SLAPI_PLUGIN_EXTENDED_SENT_RESULT );
+ return( SLAPI_PLUGIN_EXTENDED_SENT_RESULT );
}/* start_tls */
@@ -368,8 +368,7 @@ start_tls_graceful_closure( Connection *c, Slapi_PBlock * pb, int is_initiator )
*/
}
-
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
/* "Unimport" the socket from SSL, i.e. get rid of the upper layer of the
* file descriptor stack, which represents SSL.
@@ -409,7 +408,7 @@ start_tls_graceful_closure( Connection *c, Slapi_PBlock * pb, int is_initiator )
bind_credentials_clear( c, PR_FALSE, PR_TRUE );
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
diff --git a/ldap/servers/slapd/unbind.c b/ldap/servers/slapd/unbind.c
index 8cedeec..558020c 100644
--- a/ldap/servers/slapd/unbind.c
+++ b/ldap/servers/slapd/unbind.c
@@ -104,9 +104,9 @@ do_unbind( Slapi_PBlock *pb )
}
/* target spec is used to decide which plugins are applicable for the operation */
- PR_Lock( pb->pb_conn->c_mutex );
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
operation_set_target_spec_str (operation, pb->pb_conn->c_dn);
- PR_Unlock( pb->pb_conn->c_mutex );
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
/* ONREPL - plugins should be called and passed bind dn and, possibly, other data */
commit 61c3ff6ae654f9e0617741ee504f382fe78ee452
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Thu Jan 7 18:04:19 2016 -0800
Revert "Ticket #48338 - SimplePagedResults -- abandon could happen between the abandon check and sending results"
This reverts commit 79ca67d1fc5d50d8a9ae6b686b9564f3960f8592.
The commit caused the bug 1296694 - ns-slapd crash in ipa context -
c_mutex lock memory corruption and self locks
(cherry picked from commit 181847863bda74c2e3d77b6a7d9278350d50d4cc)
(cherry picked from commit c8b1817896af7db6e4fab42734b827e002a7a25b)
diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c
index 8586428..d331b57 100644
--- a/ldap/servers/slapd/pblock.c
+++ b/ldap/servers/slapd/pblock.c
@@ -252,12 +252,14 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( PRNetAddr ));
break;
}
- /* For fields with atomic access, remove the PR_Lock(c_mutex) */
+ PR_Lock( pblock->pb_conn->c_mutex );
if ( pblock->pb_conn->cin_addr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
- (*(PRNetAddr *)value) = *(pblock->pb_conn->cin_addr);
+ (*(PRNetAddr *)value) =
+ *(pblock->pb_conn->cin_addr);
}
+ PR_Unlock( pblock->pb_conn->c_mutex );
break;
case SLAPI_CONN_SERVERNETADDR:
if (pblock->pb_conn == NULL)
1
0
ldap/servers/slapd/abandon.c | 4 -
ldap/servers/slapd/bind.c | 4 -
ldap/servers/slapd/connection.c | 64 +++++++++++-----------
ldap/servers/slapd/conntable.c | 19 +++---
ldap/servers/slapd/daemon.c | 22 +++----
ldap/servers/slapd/extendop.c | 10 +--
ldap/servers/slapd/operation.c | 18 +++---
ldap/servers/slapd/opshared.c | 18 +++---
ldap/servers/slapd/pagedresults.c | 100 +++++++++++++++++------------------
ldap/servers/slapd/pblock.c | 74 +++++++++++++------------
ldap/servers/slapd/psearch.c | 10 +--
ldap/servers/slapd/saslbind.c | 26 ++++-----
ldap/servers/slapd/slap.h | 2
ldap/servers/slapd/start_tls_extop.c | 10 +--
ldap/servers/slapd/unbind.c | 4 -
15 files changed, 194 insertions(+), 191 deletions(-)
New commits:
commit 84da7d05ddc5a963b0d025df08f38a6ccd7d90d2
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Jan 11 15:53:28 2016 -0800
Ticket #48406 - Avoid self deadlock by PR_Lock(conn->c_mutex)
Description: Fixing ticket 48338 introduced a self deadlock.
To avoid the self deadlock, tried to remove PR_Lock(conn->c_mutex)
which looked harmless, but it introduced a crash by memory corruption.
This patch replaces PR_Lock/Unlock with PR_EnterMonitor/ExitMonitor,
respectively.
https://fedorahosted.org/389/ticket/48406
Reviewed by rmeggins(a)redhat.com, lkrispen(a)redhat.com, and wibrown(a)redhat.com.
Thank you, Rich, Ludwig and William!
(cherry picked from commit f25f804a8bce83b3790e7045dfc03230d7ece1af)
diff --git a/ldap/servers/slapd/abandon.c b/ldap/servers/slapd/abandon.c
index 761b895..9a39f6a 100644
--- a/ldap/servers/slapd/abandon.c
+++ b/ldap/servers/slapd/abandon.c
@@ -77,7 +77,7 @@ do_abandon( Slapi_PBlock *pb )
* flag and abort the operation at a convenient time.
*/
- PR_Lock( pb->pb_conn->c_mutex );
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
for ( o = pb->pb_conn->c_ops; o != NULL; o = o->o_next ) {
if ( o->o_msgid == id && o != pb->pb_op)
break;
@@ -138,7 +138,7 @@ do_abandon( Slapi_PBlock *pb )
o->o_results.r.r_search.nentries, current_time() - o->o_time );
}
- PR_Unlock( pb->pb_conn->c_mutex );
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
/*
* Wake up the persistent searches, so they
* can notice if they've been abandoned.
diff --git a/ldap/servers/slapd/bind.c b/ldap/servers/slapd/bind.c
index 474b508..f81edfb 100644
--- a/ldap/servers/slapd/bind.c
+++ b/ldap/servers/slapd/bind.c
@@ -258,7 +258,7 @@ do_bind( Slapi_PBlock *pb )
slapi_pblock_get (pb, SLAPI_PWPOLICY, &pw_response_requested);
}
- PR_Lock( pb->pb_conn->c_mutex );
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
bind_credentials_clear( pb->pb_conn, PR_FALSE, /* do not lock conn */
PR_FALSE /* do not clear external creds. */ );
@@ -291,7 +291,7 @@ do_bind( Slapi_PBlock *pb )
* bound user can work properly
*/
pb->pb_conn->c_needpw = 0;
- PR_Unlock( pb->pb_conn->c_mutex );
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
log_bind_access(pb, dn?dn:"empty", method, version, saslmech, NULL);
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index fc3b741..a3d123e 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -147,7 +147,7 @@ connection_done(Connection *conn)
}
if (NULL != conn->c_mutex)
{
- PR_DestroyLock(conn->c_mutex);
+ PR_DestroyMonitor(conn->c_mutex);
}
if (NULL != conn->c_pdumutex)
{
@@ -738,10 +738,10 @@ int connection_is_free (Connection *conn)
{
int rc;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
rc = conn->c_sd == SLAPD_INVALID_SOCKET && conn->c_refcnt == 0 &&
!(conn->c_flags & CONN_FLAG_CLOSING);
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
return rc;
}
@@ -1128,7 +1128,7 @@ int connection_read_operation(Connection *conn, Operation *op, ber_tag_t *tag, i
PRInt32 syserr = 0;
size_t buffer_data_avail;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/*
* if the socket is still valid, get the ber element
* waiting for us on this connection. timeout is handled
@@ -1317,15 +1317,15 @@ int connection_read_operation(Connection *conn, Operation *op, ber_tag_t *tag, i
}
op->o_tag = *tag;
done:
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
return ret;
}
void connection_make_readable(Connection *conn)
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
conn->c_gettingber = 0;
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
signal_listner();
}
@@ -1347,7 +1347,7 @@ void connection_check_activity_level(Connection *conn)
{
int current_count = 0;
int delta_count = 0;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/* get the current op count */
current_count = conn->c_opscompleted;
/* compare to the previous op count */
@@ -1358,7 +1358,7 @@ void connection_check_activity_level(Connection *conn)
conn->c_private->previous_op_count = current_count;
/* update the last checked time */
conn->c_private->previous_count_check_time = current_time();
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
LDAPDebug(LDAP_DEBUG_CONNS,"conn %" NSPRIu64 " activity level = %d\n",conn->c_connid,delta_count,0);
}
@@ -1402,7 +1402,7 @@ void connection_enter_leave_turbo(Connection *conn, int current_turbo_flag, int
int connection_count = 0;
int our_rank = 0;
int threshold_rank = 0;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* We can already be in turbo mode, or not */
current_mode = current_turbo_flag;
if (pagedresults_in_use_nolock(conn)) {
@@ -1458,7 +1458,7 @@ void connection_enter_leave_turbo(Connection *conn, int current_turbo_flag, int
}
}
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (current_mode != new_mode) {
if (current_mode) {
LDAPDebug(LDAP_DEBUG_CONNS,"conn %" NSPRIu64 " leaving turbo mode\n",conn->c_connid,0,0);
@@ -1564,13 +1564,13 @@ connection_threadmain()
*/
PR_Sleep(PR_INTERVAL_NO_WAIT);
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* Make our own pb in turbo mode */
connection_make_new_pb(pb,conn);
if (connection_call_io_layer_callbacks(conn)) {
LDAPDebug0Args( LDAP_DEBUG_ANY, "Error: could not add/remove IO layers from connection\n" );
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (! config_check_referral_mode()) {
slapi_counter_increment(ops_initiated);
slapi_counter_increment(g_get_global_snmp_vars()->ops_tbl.dsInOps);
@@ -1685,7 +1685,7 @@ connection_threadmain()
*/
} else if (!enable_nunc_stans) { /* more data in conn - just put back on work_q - bypass poll */
bypasspollcnt++;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* don't do this if it would put us over the max threads per conn */
if (conn->c_threadnumber < maxthreads) {
/* for turbo, c_idlesince is set above - for !turbo and
@@ -1700,7 +1700,7 @@ connection_threadmain()
/* keep count of how many times maxthreads has blocked an operation */
conn->c_maxthreadsblocked++;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
}
@@ -1736,14 +1736,14 @@ connection_threadmain()
done:
if (doshutdown) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
connection_remove_operation_ext(pb, conn, op);
connection_make_readable_nolock(conn);
conn->c_threadnumber--;
slapi_counter_decrement(conns_in_maxthreads);
slapi_counter_decrement(g_get_global_snmp_vars()->ops_tbl.dsConnectionsInMaxThreads);
connection_release_nolock(conn);
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
signal_listner();
return;
}
@@ -1760,9 +1760,9 @@ done:
slapi_counter_increment(ops_completed);
/* If this op isn't a persistent search, remove it */
if ( pb->pb_op->o_flags & OP_FLAG_PS ) {
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_release_nolock (conn); /* psearch acquires ref to conn - release this one now */
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
/* ps_add makes a shallow copy of the pb - so we
* can't free it or init it here - just memset it to 0
* ps_send_results will call connection_remove_operation_ext to free it
@@ -1770,7 +1770,7 @@ done:
memset(pb, 0, sizeof(*pb));
} else {
/* delete from connection operation queue & decr refcnt */
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_remove_operation_ext( pb, conn, op );
/* If we're in turbo mode, we keep our reference to the connection alive */
@@ -1811,7 +1811,7 @@ done:
signal_listner();
}
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
} /* while (1) */
}
@@ -2071,16 +2071,16 @@ op_copy_identity(Connection *conn, Operation *op)
size_t dnlen;
size_t typelen;
- PR_Lock( conn->c_mutex );
- dnlen= conn->c_dn ? strlen (conn->c_dn) : 0;
- typelen= conn->c_authtype ? strlen (conn->c_authtype) : 0;
+ PR_EnterMonitor(conn->c_mutex);
+ dnlen= conn->c_dn ? strlen (conn->c_dn) : 0;
+ typelen= conn->c_authtype ? strlen (conn->c_authtype) : 0;
- slapi_sdn_done(&op->o_sdn);
- slapi_ch_free_string(&(op->o_authtype));
+ slapi_sdn_done(&op->o_sdn);
+ slapi_ch_free_string(&(op->o_authtype));
if (dnlen <= 0 && typelen <= 0) {
op->o_authtype = NULL;
} else {
- slapi_sdn_set_dn_byval(&op->o_sdn,conn->c_dn);
+ slapi_sdn_set_dn_byval(&op->o_sdn,conn->c_dn);
op->o_authtype = slapi_ch_strdup(conn->c_authtype);
/* set the thread data bind dn index */
slapi_td_set_dn(slapi_ch_strdup(conn->c_dn));
@@ -2103,14 +2103,14 @@ op_copy_identity(Connection *conn, Operation *op)
op->o_ssf = conn->c_local_ssf;
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
/* Sets the SSL SSF in the connection struct. */
static void
connection_set_ssl_ssf(Connection *conn)
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
if (conn->c_flags & CONN_FLAG_SSL) {
SSL_SecurityStatus(conn->c_prfd, NULL, NULL, NULL, &(conn->c_ssl_ssf), NULL, NULL);
@@ -2118,7 +2118,7 @@ connection_set_ssl_ssf(Connection *conn)
conn->c_ssl_ssf = 0;
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
static int
@@ -2165,9 +2165,9 @@ log_ber_too_big_error(const Connection *conn, ber_len_t ber_len,
void
disconnect_server( Connection *conn, PRUint64 opconnid, int opid, PRErrorCode reason, PRInt32 error )
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
disconnect_server_nomutex( conn, opconnid, opid, reason, error );
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
static ps_wakeup_all_fn_ptr ps_wakeup_all_fn = NULL;
diff --git a/ldap/servers/slapd/conntable.c b/ldap/servers/slapd/conntable.c
index d5b9058..37da9a5 100644
--- a/ldap/servers/slapd/conntable.c
+++ b/ldap/servers/slapd/conntable.c
@@ -85,11 +85,11 @@ connection_table_abandon_all_operations(Connection_Table *ct)
int i;
for ( i = 0; i < ct->size; i++ )
{
- if ( ct->c[i].c_mutex != NULL )
+ if ( ct->c[i].c_mutex )
{
- PR_Lock( ct->c[i].c_mutex );
+ PR_EnterMonitor(ct->c[i].c_mutex);
connection_abandon_operations( &ct->c[i] );
- PR_Unlock( ct->c[i].c_mutex );
+ PR_ExitMonitor(ct->c[i].c_mutex);
}
}
}
@@ -139,7 +139,7 @@ connection_table_get_connection(Connection_Table *ct, int sd)
if ( c->c_mutex == NULL )
{
PR_Lock( ct->table_mutex );
- c->c_mutex = PR_NewLock();
+ c->c_mutex = PR_NewMonitor();
c->c_pdumutex = PR_NewLock();
PR_Unlock( ct->table_mutex );
if ( c->c_mutex == NULL || c->c_pdumutex == NULL )
@@ -360,7 +360,7 @@ connection_table_as_entry(Connection_Table *ct, Slapi_Entry *e)
/* Can't take c_mutex if holding table_mutex; temporarily unlock */
PR_Unlock( ct->table_mutex );
- PR_Lock( ct->c[i].c_mutex );
+ PR_EnterMonitor(ct->c[i].c_mutex);
if ( ct->c[i].c_sd != SLAPD_INVALID_SOCKET )
{
char buf2[20];
@@ -420,7 +420,7 @@ connection_table_as_entry(Connection_Table *ct, Slapi_Entry *e)
attrlist_merge( &e->e_attrs, "connection", vals );
slapi_ch_free_string(&newbuf);
}
- PR_Unlock( ct->c[i].c_mutex );
+ PR_ExitMonitor(ct->c[i].c_mutex);
}
PR_snprintf( buf, sizeof(buf), "%d", nconns );
@@ -458,14 +458,15 @@ void
connection_table_dump_activity_to_errors_log(Connection_Table *ct)
{
int i;
+
for ( i = 0; i < ct->size; i++ )
{
Connection *c= &(ct->c[i]);
- if ( c->c_mutex != NULL )
+ if ( c->c_mutex )
{
/* Find the connection we are referring to */
int j= c->c_fdi;
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
if ( (c->c_sd != SLAPD_INVALID_SOCKET) &&
(j >= 0) && (c->c_prfd == ct->fd[j].fd) )
{
@@ -475,7 +476,7 @@ connection_table_dump_activity_to_errors_log(Connection_Table *ct)
LDAPDebug( LDAP_DEBUG_CONNS,"activity on %d%s\n", i, r ? "r" : "",0 );
}
}
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
}
}
}
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 5d70647..355f0fc 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -1612,7 +1612,7 @@ setup_pr_read_pds(Connection_Table *ct, PRFileDesc **n_tcps, PRFileDesc **s_tcps
}
else
{
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
if (c->c_flags & CONN_FLAG_CLOSING)
{
/* A worker thread has marked that this connection
@@ -1661,7 +1661,7 @@ setup_pr_read_pds(Connection_Table *ct, PRFileDesc **n_tcps, PRFileDesc **s_tcps
c->c_fdi = SLAPD_INVALID_SOCKET_INDEX;
}
}
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
}
c = next;
}
@@ -1680,7 +1680,7 @@ handle_timeout( void )
time_t curtime = current_time();
if (0 == prevtime) {
- prevtime = time (&housekeeping_fire_time);
+ prevtime = time (&housekeeping_fire_time);
}
if ( difftime(curtime, prevtime) >=
@@ -1740,7 +1740,7 @@ handle_pr_read_ready(Connection_Table *ct, PRIntn num_poll)
{
if ( c->c_mutex != NULL )
{
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
if ( connection_is_active_nolock (c) && c->c_gettingber == 0 )
{
PRInt16 out_flags;
@@ -1797,7 +1797,7 @@ handle_pr_read_ready(Connection_Table *ct, PRIntn num_poll)
SLAPD_DISCONNECT_IDLE_TIMEOUT, EAGAIN );
}
}
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
}
}
}
@@ -1843,12 +1843,12 @@ ns_handle_closure(struct ns_job_t *job)
return;
}
#endif
- PR_Lock(c->c_mutex);
+ PR_EnterMonitor(c->c_mutex);
connection_release_nolock_ext(c, 1); /* release ref acquired for event framework */
PR_ASSERT(c->c_ns_close_jobs == 1); /* should be exactly 1 active close job - this one */
c->c_ns_close_jobs--; /* this job is processing closure */
do_yield = ns_handle_closure_nomutex(c);
- PR_Unlock(c->c_mutex);
+ PR_ExitMonitor(c->c_mutex);
ns_job_done(job);
if (do_yield) {
/* closure not done - another reference still outstanding */
@@ -1939,7 +1939,7 @@ ns_handle_pr_read_ready(struct ns_job_t *job)
}
#endif
- PR_Lock(c->c_mutex);
+ PR_EnterMonitor(c->c_mutex);
LDAPDebug2Args(LDAP_DEBUG_CONNS, "activity on conn %" NSPRIu64 " for fd=%d\n",
c->c_connid, c->c_sd);
/* if we were called due to some i/o event, see what the state of the socket is */
@@ -1986,7 +1986,7 @@ ns_handle_pr_read_ready(struct ns_job_t *job)
LDAPDebug2Args(LDAP_DEBUG_CONNS, "queued conn %" NSPRIu64 " for fd=%d\n",
c->c_connid, c->c_sd);
}
- PR_Unlock(c->c_mutex);
+ PR_ExitMonitor(c->c_mutex);
ns_job_done(job);
return;
}
@@ -2493,7 +2493,7 @@ handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, i
PR_Close(pr_acceptfd);
return -1;
}
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/*
* Set the default idletimeout and the handle. We'll update c_idletimeout
@@ -2592,7 +2592,7 @@ handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, i
connection_table_move_connection_on_to_active_list(the_connection_table,conn);
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
g_increment_current_conn_count();
diff --git a/ldap/servers/slapd/extendop.c b/ldap/servers/slapd/extendop.c
index 94036c6..8d0b8fb 100644
--- a/ldap/servers/slapd/extendop.c
+++ b/ldap/servers/slapd/extendop.c
@@ -61,7 +61,7 @@ static void extop_handle_import_start(Slapi_PBlock *pb, char *extoid,
send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL, NULL, 0, NULL);
return;
}
- suffix = slapi_sdn_get_dn(sdn);
+ suffix = slapi_sdn_get_dn(sdn);
/* be = slapi_be_select(sdn); */
be = slapi_mapping_tree_find_backend_for_sdn(sdn);
if (be == NULL || be == defbackend_get_backend()) {
@@ -135,10 +135,10 @@ static void extop_handle_import_start(Slapi_PBlock *pb, char *extoid,
/* okay, the import is starting now -- save the backend in the
* connection block & mark this connection as belonging to a bulk import
*/
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pb->pb_conn->c_flags |= CONN_FLAG_IMPORT;
pb->pb_conn->c_bi_backend = be;
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
slapi_pblock_set(pb, SLAPI_EXT_OP_RET_OID, EXTOP_BULK_IMPORT_START_OID);
bv.bv_val = NULL;
@@ -160,11 +160,11 @@ static void extop_handle_import_done(Slapi_PBlock *pb, char *extoid,
struct berval bv;
int ret;
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pb->pb_conn->c_flags &= ~CONN_FLAG_IMPORT;
be = pb->pb_conn->c_bi_backend;
pb->pb_conn->c_bi_backend = NULL;
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
if ((be == NULL) || (be->be_wire_import == NULL)) {
/* can this even happen? */
diff --git a/ldap/servers/slapd/operation.c b/ldap/servers/slapd/operation.c
index 869298b..6c95552 100644
--- a/ldap/servers/slapd/operation.c
+++ b/ldap/servers/slapd/operation.c
@@ -570,7 +570,7 @@ int slapi_connection_acquire(Slapi_Connection *conn)
{
int rc;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* rc = connection_acquire_nolock(conn); */
/* connection in the closing state can't be acquired */
if (conn->c_flags & CONN_FLAG_CLOSING)
@@ -586,7 +586,7 @@ int slapi_connection_acquire(Slapi_Connection *conn)
conn->c_refcnt++;
rc = 0;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
return(rc);
}
@@ -596,7 +596,7 @@ slapi_connection_remove_operation( Slapi_PBlock *pb, Slapi_Connection *conn, Sla
int rc = 0;
Slapi_Operation **olist= &conn->c_ops;
Slapi_Operation **tmp;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/* connection_remove_operation_ext(pb, conn,op); */
for ( tmp = olist; *tmp != NULL && *tmp != op; tmp = &(*tmp)->o_next )
; /* NULL */
@@ -614,15 +614,15 @@ slapi_connection_remove_operation( Slapi_PBlock *pb, Slapi_Connection *conn, Sla
if (release) {
/* connection_release_nolock(conn); */
if (conn->c_refcnt <= 0) {
- slapi_log_error(SLAPI_LOG_FATAL, "connection",
- "conn=%" NSPRIu64 " fd=%d Attempt to release connection that is not acquired\n",
- conn->c_connid, conn->c_sd);
- rc = -1;
+ slapi_log_error(SLAPI_LOG_FATAL, "connection",
+ "conn=%" NSPRIu64 " fd=%d Attempt to release connection that is not acquired\n",
+ conn->c_connid, conn->c_sd);
+ rc = -1;
} else {
- conn->c_refcnt--;
+ conn->c_refcnt--;
rc = 0;
}
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
return (rc);
}
diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c
index 5cafc3c..e76ca0f 100644
--- a/ldap/servers/slapd/opshared.c
+++ b/ldap/servers/slapd/opshared.c
@@ -675,7 +675,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
* In async paged result case, the search result might be released
* by other theads. We need to double check it in the locked region.
*/
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, 1/*locked*/, pr_idx);
if (pr_search_result) {
if (pagedresults_is_abandoned_or_notavailable(pb->pb_conn, 1/*locked*/, pr_idx)) {
@@ -683,7 +683,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
/* Previous operation was abandoned and the simplepaged object is not in use. */
send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL);
rc = LDAP_SUCCESS;
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
goto free_and_return;
} else {
slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_SET, pr_search_result );
@@ -692,7 +692,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
/* search result could be reset in the backend/dse */
slapi_pblock_get(pb, SLAPI_SEARCH_RESULT_SET, &sr);
pagedresults_set_search_result(pb->pb_conn, operation, sr, 1/*locked*/, pr_idx);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
}
} else {
pr_stat = PAGEDRESULTS_SEARCH_END;
@@ -826,10 +826,10 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
/* PAGED RESULTS */
if (op_is_pagedresults(operation)) {
/* cleanup the slot */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pagedresults_set_search_result(pb->pb_conn, operation, NULL, 1, pr_idx);
rc = pagedresults_set_current_be(pb->pb_conn, NULL, pr_idx, 1);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
}
if (1 == flag_no_such_object) {
break;
@@ -871,11 +871,11 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
slapi_pblock_get(pb, SLAPI_SEARCH_RESULT_SET, &sr);
if (PAGEDRESULTS_SEARCH_END == pr_stat) {
/* no more entries, but at least another backend */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pagedresults_set_search_result(pb->pb_conn, operation, NULL, 1, pr_idx);
be->be_search_results_release(&sr);
rc = pagedresults_set_current_be(pb->pb_conn, next_be, pr_idx, 1);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
if (NULL == next_be) {
/* no more entries && no more backends */
curr_search_count = -1;
@@ -900,9 +900,9 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
next_be = NULL; /* to break the loop */
if (operation->o_status & SLAPI_OP_STATUS_ABANDONED) {
/* It turned out this search was abandoned. */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pagedresults_free_one_msgid_nolock( pb->pb_conn, operation->o_msgid);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
/* paged-results-request was abandoned; making an empty cookie. */
pagedresults_set_response_control(pb, 0, estimate, -1, pr_idx);
send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL);
diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c
index 4458cfb..d394dab 100644
--- a/ldap/servers/slapd/pagedresults.c
+++ b/ldap/servers/slapd/pagedresults.c
@@ -98,7 +98,7 @@ pagedresults_parse_control_value( Slapi_PBlock *pb,
return LDAP_UNWILLING_TO_PERFORM;
}
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* the ber encoding is no longer needed */
ber_free(ber, 1);
if ( cookie.bv_len <= 0 ) {
@@ -204,7 +204,7 @@ bail:
}
}
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_parse_control_value: idx %d\n", *index);
@@ -301,7 +301,7 @@ pagedresults_free_one( Connection *conn, Operation *op, int index )
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_free_one: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (conn->c_pagedresults.prl_count <= 0) {
LDAPDebug2Args(LDAP_DEBUG_TRACE, "pagedresults_free_one: "
"conn=%d paged requests list count is %d\n",
@@ -312,7 +312,7 @@ pagedresults_free_one( Connection *conn, Operation *op, int index )
conn->c_pagedresults.prl_count--;
rc = 0;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_free_one: %d\n", rc);
@@ -364,11 +364,11 @@ pagedresults_get_current_be(Connection *conn, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_current_be: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
be = conn->c_pagedresults.prl_list[index].pr_current_be;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_current_be: %p\n", be);
@@ -382,12 +382,12 @@ pagedresults_set_current_be(Connection *conn, Slapi_Backend *be, int index, int
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_current_be: idx=%d\n", index);
if (conn && (index > -1)) {
- if (!nolock) PR_Lock(conn->c_mutex);
+ if (!nolock) PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_current_be = be;
}
rc = 0;
- if (!nolock) PR_Unlock(conn->c_mutex);
+ if (!nolock) PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_set_current_be: %d\n", rc);
@@ -406,13 +406,13 @@ pagedresults_get_search_result(Connection *conn, Operation *op, int locked, int
locked?"locked":"not locked", index);
if (conn && (index > -1)) {
if (!locked) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
if (index < conn->c_pagedresults.prl_maxlen) {
sr = conn->c_pagedresults.prl_list[index].pr_search_result_set;
}
if (!locked) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -431,7 +431,7 @@ pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int lo
"--> pagedresults_set_search_result: idx=%d, sr=%p\n",
index, sr);
if (conn && (index > -1)) {
- if (!locked) PR_Lock(conn->c_mutex);
+ if (!locked) PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
PagedResults *prp = conn->c_pagedresults.prl_list + index;
if (!(prp->pr_flags & CONN_FLAG_PAGEDRESULTS_ABANDONED) || !sr) {
@@ -440,7 +440,7 @@ pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int lo
}
rc = 0;
}
- if (!locked) PR_Unlock(conn->c_mutex);
+ if (!locked) PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_set_search_result: %d\n", rc);
@@ -457,11 +457,11 @@ pagedresults_get_search_result_count(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_search_result_count: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
count = conn->c_pagedresults.prl_list[index].pr_search_result_count;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_search_result_count: %d\n", count);
@@ -479,11 +479,11 @@ pagedresults_set_search_result_count(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_search_result_count: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_search_result_count = count;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -504,11 +504,11 @@ pagedresults_get_search_result_set_size_estimate(Connection *conn,
"--> pagedresults_get_search_result_set_size_estimate: "
"idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
count = conn->c_pagedresults.prl_list[index].pr_search_result_set_size_estimate;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_search_result_set_size_estimate: %d\n",
@@ -529,11 +529,11 @@ pagedresults_set_search_result_set_size_estimate(Connection *conn,
"--> pagedresults_set_search_result_set_size_estimate: "
"idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_search_result_set_size_estimate = count;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -552,11 +552,11 @@ pagedresults_get_with_sort(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_with_sort: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
flags = conn->c_pagedresults.prl_list[index].pr_flags&CONN_FLAG_PAGEDRESULTS_WITH_SORT;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_with_sort: %p\n", flags);
@@ -574,14 +574,14 @@ pagedresults_set_with_sort(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_with_sort: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
if (flags & OP_FLAG_SERVER_SIDE_SORTING) {
conn->c_pagedresults.prl_list[index].pr_flags |=
CONN_FLAG_PAGEDRESULTS_WITH_SORT;
}
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_set_with_sort: %d\n", rc);
@@ -598,11 +598,11 @@ pagedresults_get_unindexed(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_unindexed: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
flags = conn->c_pagedresults.prl_list[index].pr_flags&CONN_FLAG_PAGEDRESULTS_UNINDEXED;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_unindexed: %p\n", flags);
@@ -619,12 +619,12 @@ pagedresults_set_unindexed(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_unindexed: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_flags |=
CONN_FLAG_PAGEDRESULTS_UNINDEXED;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -642,11 +642,11 @@ pagedresults_get_sort_result_code(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_sort_result_code: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
code = conn->c_pagedresults.prl_list[index].pr_sort_result_code;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_sort_result_code: %d\n", code);
@@ -664,11 +664,11 @@ pagedresults_set_sort_result_code(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_sort_result_code: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_sort_result_code = code;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -687,11 +687,11 @@ pagedresults_set_timelimit(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_timelimit: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_timelimit = timelimit;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_set_timelimit: %d\n", rc);
@@ -749,7 +749,7 @@ pagedresults_cleanup(Connection *conn, int needlock)
}
if (needlock) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
for (i = 0; conn->c_pagedresults.prl_list &&
i < conn->c_pagedresults.prl_maxlen; i++) {
@@ -767,7 +767,7 @@ pagedresults_cleanup(Connection *conn, int needlock)
}
conn->c_pagedresults.prl_count = 0;
if (needlock) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_cleanup: %d\n", rc);
return rc;
@@ -794,7 +794,7 @@ pagedresults_cleanup_all(Connection *conn, int needlock)
}
if (needlock) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
for (i = 0; conn->c_pagedresults.prl_list &&
i < conn->c_pagedresults.prl_maxlen; i++) {
@@ -813,7 +813,7 @@ pagedresults_cleanup_all(Connection *conn, int needlock)
conn->c_pagedresults.prl_maxlen = 0;
conn->c_pagedresults.prl_count = 0;
if (needlock) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_cleanup_all: %d\n", rc);
return rc;
@@ -832,7 +832,7 @@ pagedresults_check_or_set_processing(Connection *conn, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_check_or_set_processing\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
ret = (conn->c_pagedresults.prl_list[index].pr_flags &
CONN_FLAG_PAGEDRESULTS_PROCESSING);
@@ -840,7 +840,7 @@ pagedresults_check_or_set_processing(Connection *conn, int index)
conn->c_pagedresults.prl_list[index].pr_flags |=
CONN_FLAG_PAGEDRESULTS_PROCESSING;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_check_or_set_processing: %d\n", ret);
@@ -859,7 +859,7 @@ pagedresults_reset_processing(Connection *conn, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_reset_processing: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
ret = (conn->c_pagedresults.prl_list[index].pr_flags &
CONN_FLAG_PAGEDRESULTS_PROCESSING);
@@ -867,7 +867,7 @@ pagedresults_reset_processing(Connection *conn, int index)
conn->c_pagedresults.prl_list[index].pr_flags &=
~CONN_FLAG_PAGEDRESULTS_PROCESSING;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_reset_processing: %d\n", ret);
@@ -981,9 +981,9 @@ pagedresults_lock( Connection *conn, int index )
if (!conn || (index < 0) || (index >= conn->c_pagedresults.prl_maxlen)) {
return;
}
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
prp = conn->c_pagedresults.prl_list + index;
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (prp->pr_mutex) {
PR_Lock(prp->pr_mutex);
}
@@ -997,9 +997,9 @@ pagedresults_unlock( Connection *conn, int index )
if (!conn || (index < 0) || (index >= conn->c_pagedresults.prl_maxlen)) {
return;
}
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
prp = conn->c_pagedresults.prl_list + index;
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (prp->pr_mutex) {
PR_Unlock(prp->pr_mutex);
}
@@ -1014,11 +1014,11 @@ pagedresults_is_abandoned_or_notavailable(Connection *conn, int locked, int inde
return 1; /* not abandoned, but do not want to proceed paged results op. */
}
if (!locked) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
prp = conn->c_pagedresults.prl_list + index;
if (!locked) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
return prp->pr_flags & CONN_FLAG_PAGEDRESULTS_ABANDONED;
}
@@ -1042,12 +1042,12 @@ pagedresults_set_search_result_pb(Slapi_PBlock *pb, void *sr, int locked)
LDAPDebug2Args(LDAP_DEBUG_TRACE,
"--> pagedresults_set_search_result_pb: idx=%d, sr=%p\n", index, sr);
if (conn && (index > -1)) {
- if (!locked) PR_Lock(conn->c_mutex);
+ if (!locked) PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_search_result_set = sr;
rc = 0;
}
- if (!locked) PR_Unlock(conn->c_mutex);
+ if (!locked) PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_set_search_result_pb: %d\n", rc);
diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c
index bf57a33..d373d99 100644
--- a/ldap/servers/slapd/pblock.c
+++ b/ldap/servers/slapd/pblock.c
@@ -117,7 +117,7 @@ if ( PBLOCK ->pb_plugin->plg_type != TYPE) return( -1 )
int
slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
{
- char *authtype;
+ char *authtype;
Slapi_Backend *be;
PR_ASSERT( NULL != pblock );
@@ -174,10 +174,10 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_DN \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(char **)value) = (NULL == pblock->pb_conn->c_dn ? NULL :
slapi_ch_strdup( pblock->pb_conn->c_dn ));
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_AUTHTYPE:/* deprecated */
if (pblock->pb_conn == NULL) {
@@ -185,9 +185,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_AUTHTYPE \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
- authtype = pblock->pb_conn->c_authtype;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
+ authtype = pblock->pb_conn->c_authtype;
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
if (authtype == NULL) {
(*(char **)value) = NULL;
} else if (strcasecmp(authtype, SLAPD_AUTH_NONE) == 0) {
@@ -212,10 +212,10 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_AUTHMETHOD \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(char **)value) = pblock->pb_conn->c_authtype ?
slapi_ch_strdup(pblock->pb_conn->c_authtype) : NULL;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_CLIENTNETADDR:
if (pblock->pb_conn == NULL)
@@ -223,14 +223,14 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( PRNetAddr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_addr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
(*(PRNetAddr *)value) =
*(pblock->pb_conn->cin_addr);
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SERVERNETADDR:
if (pblock->pb_conn == NULL)
@@ -238,14 +238,14 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( PRNetAddr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_destaddr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
(*(PRNetAddr *)value) =
*(pblock->pb_conn->cin_destaddr);
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_CLIENTIP:
if (pblock->pb_conn == NULL)
@@ -253,7 +253,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( struct in_addr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_addr == NULL ) {
memset( value, 0, sizeof( struct in_addr ));
} else {
@@ -268,7 +268,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( struct in_addr ));
}
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SERVERIP:
if (pblock->pb_conn == NULL)
@@ -276,7 +276,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( struct in_addr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_destaddr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
@@ -292,7 +292,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
}
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_IS_REPLICATION_SESSION:
if (pblock->pb_conn == NULL) {
@@ -300,9 +300,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_IS_REPLICATION_SESSION \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_isreplication_session;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_IS_SSL_SESSION:
if (pblock->pb_conn == NULL) {
@@ -310,9 +310,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_IS_SSL_SESSION \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_flags & CONN_FLAG_SSL;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SASL_SSF:
if (pblock->pb_conn == NULL) {
@@ -320,9 +320,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_SASL_SSF \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_sasl_ssf;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SSL_SSF:
if (pblock->pb_conn == NULL) {
@@ -330,9 +330,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_SSL_SSF \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_ssl_ssf;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_LOCAL_SSF:
if (pblock->pb_conn == NULL) {
@@ -340,9 +340,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_LOCAL_SSF \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_local_ssf;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_CERT:
if (pblock->pb_conn == NULL) {
@@ -1953,7 +1953,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
int
slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
{
- char *authtype;
+ char *authtype;
PR_ASSERT( NULL != pblock );
@@ -2020,10 +2020,10 @@ slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_AUTHMETHOD \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
- slapi_ch_free((void**)&pblock->pb_conn->c_authtype);
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
+ slapi_ch_free((void**)&pblock->pb_conn->c_authtype);
pblock->pb_conn->c_authtype = slapi_ch_strdup((char *) value);
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_IS_REPLICATION_SESSION:
if (pblock->pb_conn == NULL) {
@@ -2031,9 +2031,9 @@ slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_IS_REPLICATION_SESSION \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
pblock->pb_conn->c_isreplication_session = *((int *) value);
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
/* stuff related to config file processing */
@@ -3571,7 +3571,7 @@ bind_credentials_clear( Connection *conn, PRBool lock_conn,
PRBool clear_externalcreds )
{
if ( lock_conn ) {
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
}
if ( conn->c_dn != NULL ) { /* a non-anonymous bind has occurred */
@@ -3597,7 +3597,7 @@ bind_credentials_clear( Connection *conn, PRBool lock_conn,
}
if ( lock_conn ) {
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
}
@@ -3653,10 +3653,10 @@ void
bind_credentials_set( Connection *conn, char *authtype, char *normdn,
char *extauthtype, char *externaldn, CERTCertificate *clientcert, Slapi_Entry * bind_target_entry )
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
bind_credentials_set_nolock(conn, authtype, normdn,
extauthtype, externaldn, clientcert, bind_target_entry);
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
void
diff --git a/ldap/servers/slapd/psearch.c b/ldap/servers/slapd/psearch.c
index c9d23cf..00f13be 100644
--- a/ldap/servers/slapd/psearch.c
+++ b/ldap/servers/slapd/psearch.c
@@ -277,9 +277,9 @@ ps_send_results( void *arg )
/* need to acquire a reference to this connection so that it will not
be released or cleaned up out from under us */
- PR_Lock( ps->ps_pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(ps->ps_pblock->pb_conn->c_mutex);
conn_acq_flag = connection_acquire_nolock(ps->ps_pblock->pb_conn);
- PR_Unlock( ps->ps_pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(ps->ps_pblock->pb_conn->c_mutex);
if (conn_acq_flag) {
slapi_log_error(SLAPI_LOG_CONNS, "Persistent Search",
@@ -397,7 +397,7 @@ ps_send_results( void *arg )
conn = ps->ps_pblock->pb_conn; /* save to release later - connection_remove_operation_ext will NULL the pb_conn */
/* Clean up the connection structure */
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
slapi_log_error(SLAPI_LOG_CONNS, "Persistent Search",
"conn=%" NSPRIu64 " op=%d Releasing the connection and operation\n",
@@ -407,9 +407,9 @@ ps_send_results( void *arg )
/* Decrement the connection refcnt */
if (conn_acq_flag == 0) { /* we acquired it, so release it */
- connection_release_nolock (conn);
+ connection_release_nolock (conn);
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
conn = NULL;
PR_DestroyLock ( ps->ps_lock );
diff --git a/ldap/servers/slapd/saslbind.c b/ldap/servers/slapd/saslbind.c
index b05c7ae..76294ac 100644
--- a/ldap/servers/slapd/saslbind.c
+++ b/ldap/servers/slapd/saslbind.c
@@ -667,7 +667,7 @@ char **ids_sasl_listmech(Slapi_PBlock *pb)
if (sasl_conn == NULL) return ret;
/* sasl library mechanisms are connection dependent */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
if (sasl_listmech(sasl_conn,
NULL, /* username */
"", ",", "",
@@ -680,7 +680,7 @@ char **ids_sasl_listmech(Slapi_PBlock *pb)
charray_free(others);
slapi_ch_free((void**)&dupstr);
}
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
LDAPDebug( LDAP_DEBUG_TRACE, "<= ids_sasl_listmech\n", 0, 0, 0 );
@@ -763,13 +763,13 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
PR_ASSERT(pb);
PR_ASSERT(pb->pb_conn);
- PR_Lock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_EnterMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
continuing = pb->pb_conn->c_flags & CONN_FLAG_SASL_CONTINUE;
pb->pb_conn->c_flags &= ~CONN_FLAG_SASL_CONTINUE; /* reset flag */
sasl_conn = (sasl_conn_t*)pb->pb_conn->c_sasl_conn;
if (sasl_conn == NULL) {
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result( pb, LDAP_AUTH_METHOD_NOT_SUPPORTED, NULL,
"sasl library unavailable", 0, NULL );
return;
@@ -850,7 +850,7 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
if (sasl_conn == NULL) {
send_ldap_result( pb, LDAP_AUTH_METHOD_NOT_SUPPORTED, NULL,
"sasl library unavailable", 0, NULL );
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
return;
}
}
@@ -866,7 +866,7 @@ sasl_check_result:
/* retrieve the authenticated username */
if (sasl_getprop(sasl_conn, SASL_USERNAME,
(const void**)&username) != SASL_OK) {
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL,
"could not obtain sasl username", 0, NULL);
break;
@@ -887,7 +887,7 @@ sasl_check_result:
}
}
if (dn == NULL) {
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL,
"could not get auth dn from sasl", 0, NULL);
break;
@@ -928,7 +928,7 @@ sasl_check_result:
slapi_ch_strdup(normdn),
NULL, NULL, NULL, bind_target_entry);
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
if (plugin_call_plugins( pb, SLAPI_PLUGIN_PRE_BIND_FN ) != 0){
break;
@@ -1003,9 +1003,9 @@ sasl_check_result:
/* see if we negotiated a security layer */
if (*ssfp > 0) {
/* Enable SASL I/O on the connection */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
connection_set_io_layer_cb(pb->pb_conn, sasl_io_enable, NULL, NULL);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
}
/* send successful result */
@@ -1018,7 +1018,7 @@ sasl_check_result:
case SASL_CONTINUE: /* another step needed */
pb->pb_conn->c_flags |= CONN_FLAG_SASL_CONTINUE;
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
if (plugin_call_plugins( pb, SLAPI_PLUGIN_PRE_BIND_FN ) != 0){
break;
@@ -1040,7 +1040,7 @@ sasl_check_result:
case SASL_NOMECH:
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_AUTH_METHOD_NOT_SUPPORTED, NULL,
"sasl mechanism not supported", 0, NULL);
break;
@@ -1048,7 +1048,7 @@ sasl_check_result:
default: /* other error */
errstr = sasl_errdetail(sasl_conn);
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_INVALID_CREDENTIALS, NULL,
(char*)errstr, 0, NULL);
break;
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 38895c6..657f16d 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -1411,7 +1411,7 @@ typedef struct conn {
PRInt32 c_opscompleted; /* # ops completed */
PRInt32 c_threadnumber; /* # threads used in this conn */
int c_refcnt; /* # ops refering to this conn */
- PRLock *c_mutex; /* protect each conn structure */
+ PRMonitor *c_mutex; /* protect each conn structure; need to be re-entrant */
PRLock *c_pdumutex; /* only write one pdu at a time */
time_t c_idlesince; /* last time of activity on conn */
int c_idletimeout; /* local copy of idletimeout */
diff --git a/ldap/servers/slapd/start_tls_extop.c b/ldap/servers/slapd/start_tls_extop.c
index 69b8607..af8d8f7 100644
--- a/ldap/servers/slapd/start_tls_extop.c
+++ b/ldap/servers/slapd/start_tls_extop.c
@@ -172,7 +172,7 @@ start_tls( Slapi_PBlock *pb )
/* At least we know that the request was indeed an Start TLS one. */
conn = pb->pb_conn;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/* cannot call slapi_send_ldap_result with mutex locked - will deadlock if ber_flush returns error */
if ( conn->c_prfd == (PRFileDesc *) NULL ) {
slapi_log_error( SLAPI_LOG_PLUGIN, "start_tls",
@@ -246,10 +246,10 @@ start_tls( Slapi_PBlock *pb )
* we send a success response back to the client. */
ldapmsg = "Start TLS request accepted.Server willing to negotiate SSL.";
unlock_and_return:
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
slapi_send_ldap_result( pb, ldaprc, NULL, ldapmsg, 0, NULL );
- return( SLAPI_PLUGIN_EXTENDED_SENT_RESULT );
+ return( SLAPI_PLUGIN_EXTENDED_SENT_RESULT );
}/* start_tls */
@@ -312,7 +312,7 @@ start_tls_graceful_closure( Connection *c, Slapi_PBlock * pb, int is_initiator )
*/
}
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
/* "Unimport" the socket from SSL, i.e. get rid of the upper layer of the
* file descriptor stack, which represents SSL.
@@ -342,7 +342,7 @@ start_tls_graceful_closure( Connection *c, Slapi_PBlock * pb, int is_initiator )
bind_credentials_clear( c, PR_FALSE, PR_TRUE );
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
return ( SLAPI_PLUGIN_EXTENDED_SENT_RESULT );
}
diff --git a/ldap/servers/slapd/unbind.c b/ldap/servers/slapd/unbind.c
index 9b6a70f..c0dec9d 100644
--- a/ldap/servers/slapd/unbind.c
+++ b/ldap/servers/slapd/unbind.c
@@ -73,9 +73,9 @@ do_unbind( Slapi_PBlock *pb )
}
/* target spec is used to decide which plugins are applicable for the operation */
- PR_Lock( pb->pb_conn->c_mutex );
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
operation_set_target_spec_str (operation, pb->pb_conn->c_dn);
- PR_Unlock( pb->pb_conn->c_mutex );
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
/* ONREPL - plugins should be called and passed bind dn and, possibly, other data */
commit c8b1817896af7db6e4fab42734b827e002a7a25b
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Thu Jan 7 18:04:19 2016 -0800
Revert "Ticket #48338 - SimplePagedResults -- abandon could happen between the abandon check and sending results"
This reverts commit 79ca67d1fc5d50d8a9ae6b686b9564f3960f8592.
The commit caused the bug 1296694 - ns-slapd crash in ipa context -
c_mutex lock memory corruption and self locks
(cherry picked from commit 181847863bda74c2e3d77b6a7d9278350d50d4cc)
diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c
index f2017be..bf57a33 100644
--- a/ldap/servers/slapd/pblock.c
+++ b/ldap/servers/slapd/pblock.c
@@ -223,12 +223,14 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( PRNetAddr ));
break;
}
- /* For fields with atomic access, remove the PR_Lock(c_mutex) */
+ PR_Lock( pblock->pb_conn->c_mutex );
if ( pblock->pb_conn->cin_addr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
- (*(PRNetAddr *)value) = *(pblock->pb_conn->cin_addr);
+ (*(PRNetAddr *)value) =
+ *(pblock->pb_conn->cin_addr);
}
+ PR_Unlock( pblock->pb_conn->c_mutex );
break;
case SLAPI_CONN_SERVERNETADDR:
if (pblock->pb_conn == NULL)
1
0
ldap/servers/slapd/abandon.c | 4 -
ldap/servers/slapd/bind.c | 4 -
ldap/servers/slapd/connection.c | 64 +++++++++++-----------
ldap/servers/slapd/conntable.c | 19 +++---
ldap/servers/slapd/daemon.c | 22 +++----
ldap/servers/slapd/extendop.c | 10 +--
ldap/servers/slapd/operation.c | 18 +++---
ldap/servers/slapd/opshared.c | 18 +++---
ldap/servers/slapd/pagedresults.c | 100 +++++++++++++++++------------------
ldap/servers/slapd/pblock.c | 74 +++++++++++++------------
ldap/servers/slapd/psearch.c | 10 +--
ldap/servers/slapd/saslbind.c | 26 ++++-----
ldap/servers/slapd/slap.h | 2
ldap/servers/slapd/start_tls_extop.c | 10 +--
ldap/servers/slapd/unbind.c | 4 -
15 files changed, 194 insertions(+), 191 deletions(-)
New commits:
commit f25f804a8bce83b3790e7045dfc03230d7ece1af
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Jan 11 15:53:28 2016 -0800
Ticket #48406 - Avoid self deadlock by PR_Lock(conn->c_mutex)
Description: Fixing ticket 48338 introduced a self deadlock.
To avoid the self deadlock, tried to remove PR_Lock(conn->c_mutex)
which looked harmless, but it introduced a crash by memory corruption.
This patch replaces PR_Lock/Unlock with PR_EnterMonitor/ExitMonitor,
respectively.
https://fedorahosted.org/389/ticket/48406
Reviewed by rmeggins(a)redhat.com, lkrispen(a)redhat.com, and wibrown(a)redhat.com.
Thank you, Rich, Ludwig and William!
diff --git a/ldap/servers/slapd/abandon.c b/ldap/servers/slapd/abandon.c
index 761b895..9a39f6a 100644
--- a/ldap/servers/slapd/abandon.c
+++ b/ldap/servers/slapd/abandon.c
@@ -77,7 +77,7 @@ do_abandon( Slapi_PBlock *pb )
* flag and abort the operation at a convenient time.
*/
- PR_Lock( pb->pb_conn->c_mutex );
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
for ( o = pb->pb_conn->c_ops; o != NULL; o = o->o_next ) {
if ( o->o_msgid == id && o != pb->pb_op)
break;
@@ -138,7 +138,7 @@ do_abandon( Slapi_PBlock *pb )
o->o_results.r.r_search.nentries, current_time() - o->o_time );
}
- PR_Unlock( pb->pb_conn->c_mutex );
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
/*
* Wake up the persistent searches, so they
* can notice if they've been abandoned.
diff --git a/ldap/servers/slapd/bind.c b/ldap/servers/slapd/bind.c
index 474b508..f81edfb 100644
--- a/ldap/servers/slapd/bind.c
+++ b/ldap/servers/slapd/bind.c
@@ -258,7 +258,7 @@ do_bind( Slapi_PBlock *pb )
slapi_pblock_get (pb, SLAPI_PWPOLICY, &pw_response_requested);
}
- PR_Lock( pb->pb_conn->c_mutex );
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
bind_credentials_clear( pb->pb_conn, PR_FALSE, /* do not lock conn */
PR_FALSE /* do not clear external creds. */ );
@@ -291,7 +291,7 @@ do_bind( Slapi_PBlock *pb )
* bound user can work properly
*/
pb->pb_conn->c_needpw = 0;
- PR_Unlock( pb->pb_conn->c_mutex );
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
log_bind_access(pb, dn?dn:"empty", method, version, saslmech, NULL);
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index 1a9301a..c2cec85 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -147,7 +147,7 @@ connection_done(Connection *conn)
}
if (NULL != conn->c_mutex)
{
- PR_DestroyLock(conn->c_mutex);
+ PR_DestroyMonitor(conn->c_mutex);
}
if (NULL != conn->c_pdumutex)
{
@@ -746,10 +746,10 @@ int connection_is_free (Connection *conn)
{
int rc;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
rc = conn->c_sd == SLAPD_INVALID_SOCKET && conn->c_refcnt == 0 &&
!(conn->c_flags & CONN_FLAG_CLOSING);
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
return rc;
}
@@ -1136,7 +1136,7 @@ int connection_read_operation(Connection *conn, Operation *op, ber_tag_t *tag, i
PRInt32 syserr = 0;
size_t buffer_data_avail;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/*
* if the socket is still valid, get the ber element
* waiting for us on this connection. timeout is handled
@@ -1325,15 +1325,15 @@ int connection_read_operation(Connection *conn, Operation *op, ber_tag_t *tag, i
}
op->o_tag = *tag;
done:
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
return ret;
}
void connection_make_readable(Connection *conn)
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
conn->c_gettingber = 0;
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
signal_listner();
}
@@ -1355,7 +1355,7 @@ void connection_check_activity_level(Connection *conn)
{
int current_count = 0;
int delta_count = 0;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/* get the current op count */
current_count = conn->c_opscompleted;
/* compare to the previous op count */
@@ -1366,7 +1366,7 @@ void connection_check_activity_level(Connection *conn)
conn->c_private->previous_op_count = current_count;
/* update the last checked time */
conn->c_private->previous_count_check_time = current_time();
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
LDAPDebug(LDAP_DEBUG_CONNS,"conn %" NSPRIu64 " activity level = %d\n",conn->c_connid,delta_count,0);
}
@@ -1410,7 +1410,7 @@ void connection_enter_leave_turbo(Connection *conn, int current_turbo_flag, int
int connection_count = 0;
int our_rank = 0;
int threshold_rank = 0;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* We can already be in turbo mode, or not */
current_mode = current_turbo_flag;
if (pagedresults_in_use_nolock(conn)) {
@@ -1466,7 +1466,7 @@ void connection_enter_leave_turbo(Connection *conn, int current_turbo_flag, int
}
}
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (current_mode != new_mode) {
if (current_mode) {
LDAPDebug(LDAP_DEBUG_CONNS,"conn %" NSPRIu64 " leaving turbo mode\n",conn->c_connid,0,0);
@@ -1572,13 +1572,13 @@ connection_threadmain()
*/
PR_Sleep(PR_INTERVAL_NO_WAIT);
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* Make our own pb in turbo mode */
connection_make_new_pb(pb,conn);
if (connection_call_io_layer_callbacks(conn)) {
LDAPDebug0Args( LDAP_DEBUG_ANY, "Error: could not add/remove IO layers from connection\n" );
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (! config_check_referral_mode()) {
slapi_counter_increment(ops_initiated);
slapi_counter_increment(g_get_global_snmp_vars()->ops_tbl.dsInOps);
@@ -1693,7 +1693,7 @@ connection_threadmain()
*/
} else if (!enable_nunc_stans) { /* more data in conn - just put back on work_q - bypass poll */
bypasspollcnt++;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* don't do this if it would put us over the max threads per conn */
if (conn->c_threadnumber < maxthreads) {
/* for turbo, c_idlesince is set above - for !turbo and
@@ -1708,7 +1708,7 @@ connection_threadmain()
/* keep count of how many times maxthreads has blocked an operation */
conn->c_maxthreadsblocked++;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
}
@@ -1744,14 +1744,14 @@ connection_threadmain()
done:
if (doshutdown) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
connection_remove_operation_ext(pb, conn, op);
connection_make_readable_nolock(conn);
conn->c_threadnumber--;
slapi_counter_decrement(conns_in_maxthreads);
slapi_counter_decrement(g_get_global_snmp_vars()->ops_tbl.dsConnectionsInMaxThreads);
connection_release_nolock(conn);
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
signal_listner();
return;
}
@@ -1768,9 +1768,9 @@ done:
slapi_counter_increment(ops_completed);
/* If this op isn't a persistent search, remove it */
if ( pb->pb_op->o_flags & OP_FLAG_PS ) {
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_release_nolock (conn); /* psearch acquires ref to conn - release this one now */
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
/* ps_add makes a shallow copy of the pb - so we
* can't free it or init it here - just memset it to 0
* ps_send_results will call connection_remove_operation_ext to free it
@@ -1778,7 +1778,7 @@ done:
memset(pb, 0, sizeof(*pb));
} else {
/* delete from connection operation queue & decr refcnt */
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
connection_remove_operation_ext( pb, conn, op );
/* If we're in turbo mode, we keep our reference to the connection alive */
@@ -1819,7 +1819,7 @@ done:
signal_listner();
}
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
} /* while (1) */
}
@@ -2079,16 +2079,16 @@ op_copy_identity(Connection *conn, Operation *op)
size_t dnlen;
size_t typelen;
- PR_Lock( conn->c_mutex );
- dnlen= conn->c_dn ? strlen (conn->c_dn) : 0;
- typelen= conn->c_authtype ? strlen (conn->c_authtype) : 0;
+ PR_EnterMonitor(conn->c_mutex);
+ dnlen= conn->c_dn ? strlen (conn->c_dn) : 0;
+ typelen= conn->c_authtype ? strlen (conn->c_authtype) : 0;
- slapi_sdn_done(&op->o_sdn);
- slapi_ch_free_string(&(op->o_authtype));
+ slapi_sdn_done(&op->o_sdn);
+ slapi_ch_free_string(&(op->o_authtype));
if (dnlen <= 0 && typelen <= 0) {
op->o_authtype = NULL;
} else {
- slapi_sdn_set_dn_byval(&op->o_sdn,conn->c_dn);
+ slapi_sdn_set_dn_byval(&op->o_sdn,conn->c_dn);
op->o_authtype = slapi_ch_strdup(conn->c_authtype);
/* set the thread data bind dn index */
slapi_td_set_dn(slapi_ch_strdup(conn->c_dn));
@@ -2111,14 +2111,14 @@ op_copy_identity(Connection *conn, Operation *op)
op->o_ssf = conn->c_local_ssf;
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
/* Sets the SSL SSF in the connection struct. */
static void
connection_set_ssl_ssf(Connection *conn)
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
if (conn->c_flags & CONN_FLAG_SSL) {
SSL_SecurityStatus(conn->c_prfd, NULL, NULL, NULL, &(conn->c_ssl_ssf), NULL, NULL);
@@ -2126,7 +2126,7 @@ connection_set_ssl_ssf(Connection *conn)
conn->c_ssl_ssf = 0;
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
static int
@@ -2173,9 +2173,9 @@ log_ber_too_big_error(const Connection *conn, ber_len_t ber_len,
void
disconnect_server( Connection *conn, PRUint64 opconnid, int opid, PRErrorCode reason, PRInt32 error )
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
disconnect_server_nomutex( conn, opconnid, opid, reason, error );
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
static ps_wakeup_all_fn_ptr ps_wakeup_all_fn = NULL;
diff --git a/ldap/servers/slapd/conntable.c b/ldap/servers/slapd/conntable.c
index d5b9058..37da9a5 100644
--- a/ldap/servers/slapd/conntable.c
+++ b/ldap/servers/slapd/conntable.c
@@ -85,11 +85,11 @@ connection_table_abandon_all_operations(Connection_Table *ct)
int i;
for ( i = 0; i < ct->size; i++ )
{
- if ( ct->c[i].c_mutex != NULL )
+ if ( ct->c[i].c_mutex )
{
- PR_Lock( ct->c[i].c_mutex );
+ PR_EnterMonitor(ct->c[i].c_mutex);
connection_abandon_operations( &ct->c[i] );
- PR_Unlock( ct->c[i].c_mutex );
+ PR_ExitMonitor(ct->c[i].c_mutex);
}
}
}
@@ -139,7 +139,7 @@ connection_table_get_connection(Connection_Table *ct, int sd)
if ( c->c_mutex == NULL )
{
PR_Lock( ct->table_mutex );
- c->c_mutex = PR_NewLock();
+ c->c_mutex = PR_NewMonitor();
c->c_pdumutex = PR_NewLock();
PR_Unlock( ct->table_mutex );
if ( c->c_mutex == NULL || c->c_pdumutex == NULL )
@@ -360,7 +360,7 @@ connection_table_as_entry(Connection_Table *ct, Slapi_Entry *e)
/* Can't take c_mutex if holding table_mutex; temporarily unlock */
PR_Unlock( ct->table_mutex );
- PR_Lock( ct->c[i].c_mutex );
+ PR_EnterMonitor(ct->c[i].c_mutex);
if ( ct->c[i].c_sd != SLAPD_INVALID_SOCKET )
{
char buf2[20];
@@ -420,7 +420,7 @@ connection_table_as_entry(Connection_Table *ct, Slapi_Entry *e)
attrlist_merge( &e->e_attrs, "connection", vals );
slapi_ch_free_string(&newbuf);
}
- PR_Unlock( ct->c[i].c_mutex );
+ PR_ExitMonitor(ct->c[i].c_mutex);
}
PR_snprintf( buf, sizeof(buf), "%d", nconns );
@@ -458,14 +458,15 @@ void
connection_table_dump_activity_to_errors_log(Connection_Table *ct)
{
int i;
+
for ( i = 0; i < ct->size; i++ )
{
Connection *c= &(ct->c[i]);
- if ( c->c_mutex != NULL )
+ if ( c->c_mutex )
{
/* Find the connection we are referring to */
int j= c->c_fdi;
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
if ( (c->c_sd != SLAPD_INVALID_SOCKET) &&
(j >= 0) && (c->c_prfd == ct->fd[j].fd) )
{
@@ -475,7 +476,7 @@ connection_table_dump_activity_to_errors_log(Connection_Table *ct)
LDAPDebug( LDAP_DEBUG_CONNS,"activity on %d%s\n", i, r ? "r" : "",0 );
}
}
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
}
}
}
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 8413937..3b6acfe 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -1624,7 +1624,7 @@ setup_pr_read_pds(Connection_Table *ct, PRFileDesc **n_tcps, PRFileDesc **s_tcps
}
else
{
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
if (c->c_flags & CONN_FLAG_CLOSING)
{
/* A worker thread has marked that this connection
@@ -1673,7 +1673,7 @@ setup_pr_read_pds(Connection_Table *ct, PRFileDesc **n_tcps, PRFileDesc **s_tcps
c->c_fdi = SLAPD_INVALID_SOCKET_INDEX;
}
}
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
}
c = next;
}
@@ -1692,7 +1692,7 @@ handle_timeout( void )
time_t curtime = current_time();
if (0 == prevtime) {
- prevtime = time (&housekeeping_fire_time);
+ prevtime = time (&housekeeping_fire_time);
}
if ( difftime(curtime, prevtime) >=
@@ -1752,7 +1752,7 @@ handle_pr_read_ready(Connection_Table *ct, PRIntn num_poll)
{
if ( c->c_mutex != NULL )
{
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
if ( connection_is_active_nolock (c) && c->c_gettingber == 0 )
{
PRInt16 out_flags;
@@ -1809,7 +1809,7 @@ handle_pr_read_ready(Connection_Table *ct, PRIntn num_poll)
SLAPD_DISCONNECT_IDLE_TIMEOUT, EAGAIN );
}
}
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
}
}
}
@@ -1855,12 +1855,12 @@ ns_handle_closure(struct ns_job_t *job)
return;
}
#endif
- PR_Lock(c->c_mutex);
+ PR_EnterMonitor(c->c_mutex);
connection_release_nolock_ext(c, 1); /* release ref acquired for event framework */
PR_ASSERT(c->c_ns_close_jobs == 1); /* should be exactly 1 active close job - this one */
c->c_ns_close_jobs--; /* this job is processing closure */
do_yield = ns_handle_closure_nomutex(c);
- PR_Unlock(c->c_mutex);
+ PR_ExitMonitor(c->c_mutex);
ns_job_done(job);
if (do_yield) {
/* closure not done - another reference still outstanding */
@@ -1951,7 +1951,7 @@ ns_handle_pr_read_ready(struct ns_job_t *job)
}
#endif
- PR_Lock(c->c_mutex);
+ PR_EnterMonitor(c->c_mutex);
LDAPDebug2Args(LDAP_DEBUG_CONNS, "activity on conn %" NSPRIu64 " for fd=%d\n",
c->c_connid, c->c_sd);
/* if we were called due to some i/o event, see what the state of the socket is */
@@ -1998,7 +1998,7 @@ ns_handle_pr_read_ready(struct ns_job_t *job)
LDAPDebug2Args(LDAP_DEBUG_CONNS, "queued conn %" NSPRIu64 " for fd=%d\n",
c->c_connid, c->c_sd);
}
- PR_Unlock(c->c_mutex);
+ PR_ExitMonitor(c->c_mutex);
ns_job_done(job);
return;
}
@@ -2505,7 +2505,7 @@ handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, i
PR_Close(pr_acceptfd);
return -1;
}
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/*
* Set the default idletimeout and the handle. We'll update c_idletimeout
@@ -2604,7 +2604,7 @@ handle_new_connection(Connection_Table *ct, int tcps, PRFileDesc *pr_acceptfd, i
connection_table_move_connection_on_to_active_list(the_connection_table,conn);
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
g_increment_current_conn_count();
diff --git a/ldap/servers/slapd/extendop.c b/ldap/servers/slapd/extendop.c
index 94036c6..8d0b8fb 100644
--- a/ldap/servers/slapd/extendop.c
+++ b/ldap/servers/slapd/extendop.c
@@ -61,7 +61,7 @@ static void extop_handle_import_start(Slapi_PBlock *pb, char *extoid,
send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL, NULL, 0, NULL);
return;
}
- suffix = slapi_sdn_get_dn(sdn);
+ suffix = slapi_sdn_get_dn(sdn);
/* be = slapi_be_select(sdn); */
be = slapi_mapping_tree_find_backend_for_sdn(sdn);
if (be == NULL || be == defbackend_get_backend()) {
@@ -135,10 +135,10 @@ static void extop_handle_import_start(Slapi_PBlock *pb, char *extoid,
/* okay, the import is starting now -- save the backend in the
* connection block & mark this connection as belonging to a bulk import
*/
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pb->pb_conn->c_flags |= CONN_FLAG_IMPORT;
pb->pb_conn->c_bi_backend = be;
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
slapi_pblock_set(pb, SLAPI_EXT_OP_RET_OID, EXTOP_BULK_IMPORT_START_OID);
bv.bv_val = NULL;
@@ -160,11 +160,11 @@ static void extop_handle_import_done(Slapi_PBlock *pb, char *extoid,
struct berval bv;
int ret;
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pb->pb_conn->c_flags &= ~CONN_FLAG_IMPORT;
be = pb->pb_conn->c_bi_backend;
pb->pb_conn->c_bi_backend = NULL;
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
if ((be == NULL) || (be->be_wire_import == NULL)) {
/* can this even happen? */
diff --git a/ldap/servers/slapd/operation.c b/ldap/servers/slapd/operation.c
index 869298b..6c95552 100644
--- a/ldap/servers/slapd/operation.c
+++ b/ldap/servers/slapd/operation.c
@@ -570,7 +570,7 @@ int slapi_connection_acquire(Slapi_Connection *conn)
{
int rc;
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* rc = connection_acquire_nolock(conn); */
/* connection in the closing state can't be acquired */
if (conn->c_flags & CONN_FLAG_CLOSING)
@@ -586,7 +586,7 @@ int slapi_connection_acquire(Slapi_Connection *conn)
conn->c_refcnt++;
rc = 0;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
return(rc);
}
@@ -596,7 +596,7 @@ slapi_connection_remove_operation( Slapi_PBlock *pb, Slapi_Connection *conn, Sla
int rc = 0;
Slapi_Operation **olist= &conn->c_ops;
Slapi_Operation **tmp;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/* connection_remove_operation_ext(pb, conn,op); */
for ( tmp = olist; *tmp != NULL && *tmp != op; tmp = &(*tmp)->o_next )
; /* NULL */
@@ -614,15 +614,15 @@ slapi_connection_remove_operation( Slapi_PBlock *pb, Slapi_Connection *conn, Sla
if (release) {
/* connection_release_nolock(conn); */
if (conn->c_refcnt <= 0) {
- slapi_log_error(SLAPI_LOG_FATAL, "connection",
- "conn=%" NSPRIu64 " fd=%d Attempt to release connection that is not acquired\n",
- conn->c_connid, conn->c_sd);
- rc = -1;
+ slapi_log_error(SLAPI_LOG_FATAL, "connection",
+ "conn=%" NSPRIu64 " fd=%d Attempt to release connection that is not acquired\n",
+ conn->c_connid, conn->c_sd);
+ rc = -1;
} else {
- conn->c_refcnt--;
+ conn->c_refcnt--;
rc = 0;
}
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
return (rc);
}
diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c
index 20761d5..0237264 100644
--- a/ldap/servers/slapd/opshared.c
+++ b/ldap/servers/slapd/opshared.c
@@ -675,7 +675,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
* In async paged result case, the search result might be released
* by other theads. We need to double check it in the locked region.
*/
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, 1/*locked*/, pr_idx);
if (pr_search_result) {
if (pagedresults_is_abandoned_or_notavailable(pb->pb_conn, 1/*locked*/, pr_idx)) {
@@ -683,7 +683,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
/* Previous operation was abandoned and the simplepaged object is not in use. */
send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL);
rc = LDAP_SUCCESS;
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
goto free_and_return;
} else {
slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_SET, pr_search_result );
@@ -692,7 +692,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
/* search result could be reset in the backend/dse */
slapi_pblock_get(pb, SLAPI_SEARCH_RESULT_SET, &sr);
pagedresults_set_search_result(pb->pb_conn, operation, sr, 1/*locked*/, pr_idx);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
}
} else {
pr_stat = PAGEDRESULTS_SEARCH_END;
@@ -826,10 +826,10 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
/* PAGED RESULTS */
if (op_is_pagedresults(operation)) {
/* cleanup the slot */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pagedresults_set_search_result(pb->pb_conn, operation, NULL, 1, pr_idx);
rc = pagedresults_set_current_be(pb->pb_conn, NULL, pr_idx, 1);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
}
if (1 == flag_no_such_object) {
break;
@@ -871,11 +871,11 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
slapi_pblock_get(pb, SLAPI_SEARCH_RESULT_SET, &sr);
if (PAGEDRESULTS_SEARCH_END == pr_stat) {
/* no more entries, but at least another backend */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pagedresults_set_search_result(pb->pb_conn, operation, NULL, 1, pr_idx);
be->be_search_results_release(&sr);
rc = pagedresults_set_current_be(pb->pb_conn, next_be, pr_idx, 1);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
if (NULL == next_be) {
/* no more entries && no more backends */
curr_search_count = -1;
@@ -900,9 +900,9 @@ op_shared_search (Slapi_PBlock *pb, int send_result)
next_be = NULL; /* to break the loop */
if (operation->o_status & SLAPI_OP_STATUS_ABANDONED) {
/* It turned out this search was abandoned. */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
pagedresults_free_one_msgid_nolock( pb->pb_conn, operation->o_msgid);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
/* paged-results-request was abandoned; making an empty cookie. */
pagedresults_set_response_control(pb, 0, estimate, -1, pr_idx);
send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL);
diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c
index 4458cfb..d394dab 100644
--- a/ldap/servers/slapd/pagedresults.c
+++ b/ldap/servers/slapd/pagedresults.c
@@ -98,7 +98,7 @@ pagedresults_parse_control_value( Slapi_PBlock *pb,
return LDAP_UNWILLING_TO_PERFORM;
}
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
/* the ber encoding is no longer needed */
ber_free(ber, 1);
if ( cookie.bv_len <= 0 ) {
@@ -204,7 +204,7 @@ bail:
}
}
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_parse_control_value: idx %d\n", *index);
@@ -301,7 +301,7 @@ pagedresults_free_one( Connection *conn, Operation *op, int index )
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_free_one: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (conn->c_pagedresults.prl_count <= 0) {
LDAPDebug2Args(LDAP_DEBUG_TRACE, "pagedresults_free_one: "
"conn=%d paged requests list count is %d\n",
@@ -312,7 +312,7 @@ pagedresults_free_one( Connection *conn, Operation *op, int index )
conn->c_pagedresults.prl_count--;
rc = 0;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_free_one: %d\n", rc);
@@ -364,11 +364,11 @@ pagedresults_get_current_be(Connection *conn, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_current_be: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
be = conn->c_pagedresults.prl_list[index].pr_current_be;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_current_be: %p\n", be);
@@ -382,12 +382,12 @@ pagedresults_set_current_be(Connection *conn, Slapi_Backend *be, int index, int
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_current_be: idx=%d\n", index);
if (conn && (index > -1)) {
- if (!nolock) PR_Lock(conn->c_mutex);
+ if (!nolock) PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_current_be = be;
}
rc = 0;
- if (!nolock) PR_Unlock(conn->c_mutex);
+ if (!nolock) PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_set_current_be: %d\n", rc);
@@ -406,13 +406,13 @@ pagedresults_get_search_result(Connection *conn, Operation *op, int locked, int
locked?"locked":"not locked", index);
if (conn && (index > -1)) {
if (!locked) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
if (index < conn->c_pagedresults.prl_maxlen) {
sr = conn->c_pagedresults.prl_list[index].pr_search_result_set;
}
if (!locked) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -431,7 +431,7 @@ pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int lo
"--> pagedresults_set_search_result: idx=%d, sr=%p\n",
index, sr);
if (conn && (index > -1)) {
- if (!locked) PR_Lock(conn->c_mutex);
+ if (!locked) PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
PagedResults *prp = conn->c_pagedresults.prl_list + index;
if (!(prp->pr_flags & CONN_FLAG_PAGEDRESULTS_ABANDONED) || !sr) {
@@ -440,7 +440,7 @@ pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int lo
}
rc = 0;
}
- if (!locked) PR_Unlock(conn->c_mutex);
+ if (!locked) PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_set_search_result: %d\n", rc);
@@ -457,11 +457,11 @@ pagedresults_get_search_result_count(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_search_result_count: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
count = conn->c_pagedresults.prl_list[index].pr_search_result_count;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_search_result_count: %d\n", count);
@@ -479,11 +479,11 @@ pagedresults_set_search_result_count(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_search_result_count: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_search_result_count = count;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -504,11 +504,11 @@ pagedresults_get_search_result_set_size_estimate(Connection *conn,
"--> pagedresults_get_search_result_set_size_estimate: "
"idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
count = conn->c_pagedresults.prl_list[index].pr_search_result_set_size_estimate;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_search_result_set_size_estimate: %d\n",
@@ -529,11 +529,11 @@ pagedresults_set_search_result_set_size_estimate(Connection *conn,
"--> pagedresults_set_search_result_set_size_estimate: "
"idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_search_result_set_size_estimate = count;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -552,11 +552,11 @@ pagedresults_get_with_sort(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_with_sort: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
flags = conn->c_pagedresults.prl_list[index].pr_flags&CONN_FLAG_PAGEDRESULTS_WITH_SORT;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_with_sort: %p\n", flags);
@@ -574,14 +574,14 @@ pagedresults_set_with_sort(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_with_sort: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
if (flags & OP_FLAG_SERVER_SIDE_SORTING) {
conn->c_pagedresults.prl_list[index].pr_flags |=
CONN_FLAG_PAGEDRESULTS_WITH_SORT;
}
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_set_with_sort: %d\n", rc);
@@ -598,11 +598,11 @@ pagedresults_get_unindexed(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_unindexed: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
flags = conn->c_pagedresults.prl_list[index].pr_flags&CONN_FLAG_PAGEDRESULTS_UNINDEXED;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_unindexed: %p\n", flags);
@@ -619,12 +619,12 @@ pagedresults_set_unindexed(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_unindexed: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_flags |=
CONN_FLAG_PAGEDRESULTS_UNINDEXED;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -642,11 +642,11 @@ pagedresults_get_sort_result_code(Connection *conn, Operation *op, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_get_sort_result_code: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
code = conn->c_pagedresults.prl_list[index].pr_sort_result_code;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_get_sort_result_code: %d\n", code);
@@ -664,11 +664,11 @@ pagedresults_set_sort_result_code(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_sort_result_code: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_sort_result_code = code;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
@@ -687,11 +687,11 @@ pagedresults_set_timelimit(Connection *conn, Operation *op,
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_set_timelimit: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_timelimit = timelimit;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
rc = 0;
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_set_timelimit: %d\n", rc);
@@ -749,7 +749,7 @@ pagedresults_cleanup(Connection *conn, int needlock)
}
if (needlock) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
for (i = 0; conn->c_pagedresults.prl_list &&
i < conn->c_pagedresults.prl_maxlen; i++) {
@@ -767,7 +767,7 @@ pagedresults_cleanup(Connection *conn, int needlock)
}
conn->c_pagedresults.prl_count = 0;
if (needlock) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_cleanup: %d\n", rc);
return rc;
@@ -794,7 +794,7 @@ pagedresults_cleanup_all(Connection *conn, int needlock)
}
if (needlock) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
for (i = 0; conn->c_pagedresults.prl_list &&
i < conn->c_pagedresults.prl_maxlen; i++) {
@@ -813,7 +813,7 @@ pagedresults_cleanup_all(Connection *conn, int needlock)
conn->c_pagedresults.prl_maxlen = 0;
conn->c_pagedresults.prl_count = 0;
if (needlock) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_cleanup_all: %d\n", rc);
return rc;
@@ -832,7 +832,7 @@ pagedresults_check_or_set_processing(Connection *conn, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_check_or_set_processing\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
ret = (conn->c_pagedresults.prl_list[index].pr_flags &
CONN_FLAG_PAGEDRESULTS_PROCESSING);
@@ -840,7 +840,7 @@ pagedresults_check_or_set_processing(Connection *conn, int index)
conn->c_pagedresults.prl_list[index].pr_flags |=
CONN_FLAG_PAGEDRESULTS_PROCESSING;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_check_or_set_processing: %d\n", ret);
@@ -859,7 +859,7 @@ pagedresults_reset_processing(Connection *conn, int index)
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"--> pagedresults_reset_processing: idx=%d\n", index);
if (conn && (index > -1)) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
ret = (conn->c_pagedresults.prl_list[index].pr_flags &
CONN_FLAG_PAGEDRESULTS_PROCESSING);
@@ -867,7 +867,7 @@ pagedresults_reset_processing(Connection *conn, int index)
conn->c_pagedresults.prl_list[index].pr_flags &=
~CONN_FLAG_PAGEDRESULTS_PROCESSING;
}
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_reset_processing: %d\n", ret);
@@ -981,9 +981,9 @@ pagedresults_lock( Connection *conn, int index )
if (!conn || (index < 0) || (index >= conn->c_pagedresults.prl_maxlen)) {
return;
}
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
prp = conn->c_pagedresults.prl_list + index;
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (prp->pr_mutex) {
PR_Lock(prp->pr_mutex);
}
@@ -997,9 +997,9 @@ pagedresults_unlock( Connection *conn, int index )
if (!conn || (index < 0) || (index >= conn->c_pagedresults.prl_maxlen)) {
return;
}
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
prp = conn->c_pagedresults.prl_list + index;
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
if (prp->pr_mutex) {
PR_Unlock(prp->pr_mutex);
}
@@ -1014,11 +1014,11 @@ pagedresults_is_abandoned_or_notavailable(Connection *conn, int locked, int inde
return 1; /* not abandoned, but do not want to proceed paged results op. */
}
if (!locked) {
- PR_Lock(conn->c_mutex);
+ PR_EnterMonitor(conn->c_mutex);
}
prp = conn->c_pagedresults.prl_list + index;
if (!locked) {
- PR_Unlock(conn->c_mutex);
+ PR_ExitMonitor(conn->c_mutex);
}
return prp->pr_flags & CONN_FLAG_PAGEDRESULTS_ABANDONED;
}
@@ -1042,12 +1042,12 @@ pagedresults_set_search_result_pb(Slapi_PBlock *pb, void *sr, int locked)
LDAPDebug2Args(LDAP_DEBUG_TRACE,
"--> pagedresults_set_search_result_pb: idx=%d, sr=%p\n", index, sr);
if (conn && (index > -1)) {
- if (!locked) PR_Lock(conn->c_mutex);
+ if (!locked) PR_EnterMonitor(conn->c_mutex);
if (index < conn->c_pagedresults.prl_maxlen) {
conn->c_pagedresults.prl_list[index].pr_search_result_set = sr;
rc = 0;
}
- if (!locked) PR_Unlock(conn->c_mutex);
+ if (!locked) PR_ExitMonitor(conn->c_mutex);
}
LDAPDebug1Arg(LDAP_DEBUG_TRACE,
"<-- pagedresults_set_search_result_pb: %d\n", rc);
diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c
index bf57a33..d373d99 100644
--- a/ldap/servers/slapd/pblock.c
+++ b/ldap/servers/slapd/pblock.c
@@ -117,7 +117,7 @@ if ( PBLOCK ->pb_plugin->plg_type != TYPE) return( -1 )
int
slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
{
- char *authtype;
+ char *authtype;
Slapi_Backend *be;
PR_ASSERT( NULL != pblock );
@@ -174,10 +174,10 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_DN \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(char **)value) = (NULL == pblock->pb_conn->c_dn ? NULL :
slapi_ch_strdup( pblock->pb_conn->c_dn ));
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_AUTHTYPE:/* deprecated */
if (pblock->pb_conn == NULL) {
@@ -185,9 +185,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_AUTHTYPE \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
- authtype = pblock->pb_conn->c_authtype;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
+ authtype = pblock->pb_conn->c_authtype;
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
if (authtype == NULL) {
(*(char **)value) = NULL;
} else if (strcasecmp(authtype, SLAPD_AUTH_NONE) == 0) {
@@ -212,10 +212,10 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_AUTHMETHOD \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(char **)value) = pblock->pb_conn->c_authtype ?
slapi_ch_strdup(pblock->pb_conn->c_authtype) : NULL;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_CLIENTNETADDR:
if (pblock->pb_conn == NULL)
@@ -223,14 +223,14 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( PRNetAddr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_addr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
(*(PRNetAddr *)value) =
*(pblock->pb_conn->cin_addr);
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SERVERNETADDR:
if (pblock->pb_conn == NULL)
@@ -238,14 +238,14 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( PRNetAddr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_destaddr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
(*(PRNetAddr *)value) =
*(pblock->pb_conn->cin_destaddr);
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_CLIENTIP:
if (pblock->pb_conn == NULL)
@@ -253,7 +253,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( struct in_addr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_addr == NULL ) {
memset( value, 0, sizeof( struct in_addr ));
} else {
@@ -268,7 +268,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( struct in_addr ));
}
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SERVERIP:
if (pblock->pb_conn == NULL)
@@ -276,7 +276,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( struct in_addr ));
break;
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
if ( pblock->pb_conn->cin_destaddr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
@@ -292,7 +292,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
}
}
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_IS_REPLICATION_SESSION:
if (pblock->pb_conn == NULL) {
@@ -300,9 +300,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_IS_REPLICATION_SESSION \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_isreplication_session;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_IS_SSL_SESSION:
if (pblock->pb_conn == NULL) {
@@ -310,9 +310,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_IS_SSL_SESSION \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_flags & CONN_FLAG_SSL;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SASL_SSF:
if (pblock->pb_conn == NULL) {
@@ -320,9 +320,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_SASL_SSF \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_sasl_ssf;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_SSL_SSF:
if (pblock->pb_conn == NULL) {
@@ -330,9 +330,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_SSL_SSF \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_ssl_ssf;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_LOCAL_SSF:
if (pblock->pb_conn == NULL) {
@@ -340,9 +340,9 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_LOCAL_SSF \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
(*(int *)value) = pblock->pb_conn->c_local_ssf;
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_CERT:
if (pblock->pb_conn == NULL) {
@@ -1953,7 +1953,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
int
slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
{
- char *authtype;
+ char *authtype;
PR_ASSERT( NULL != pblock );
@@ -2020,10 +2020,10 @@ slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_AUTHMETHOD \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
- slapi_ch_free((void**)&pblock->pb_conn->c_authtype);
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
+ slapi_ch_free((void**)&pblock->pb_conn->c_authtype);
pblock->pb_conn->c_authtype = slapi_ch_strdup((char *) value);
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
case SLAPI_CONN_IS_REPLICATION_SESSION:
if (pblock->pb_conn == NULL) {
@@ -2031,9 +2031,9 @@ slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
"Connection is NULL and hence cannot access SLAPI_CONN_IS_REPLICATION_SESSION \n", 0, 0, 0 );
return (-1);
}
- PR_Lock( pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(pblock->pb_conn->c_mutex);
pblock->pb_conn->c_isreplication_session = *((int *) value);
- PR_Unlock( pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(pblock->pb_conn->c_mutex);
break;
/* stuff related to config file processing */
@@ -3571,7 +3571,7 @@ bind_credentials_clear( Connection *conn, PRBool lock_conn,
PRBool clear_externalcreds )
{
if ( lock_conn ) {
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
}
if ( conn->c_dn != NULL ) { /* a non-anonymous bind has occurred */
@@ -3597,7 +3597,7 @@ bind_credentials_clear( Connection *conn, PRBool lock_conn,
}
if ( lock_conn ) {
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
}
@@ -3653,10 +3653,10 @@ void
bind_credentials_set( Connection *conn, char *authtype, char *normdn,
char *extauthtype, char *externaldn, CERTCertificate *clientcert, Slapi_Entry * bind_target_entry )
{
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
bind_credentials_set_nolock(conn, authtype, normdn,
extauthtype, externaldn, clientcert, bind_target_entry);
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
}
void
diff --git a/ldap/servers/slapd/psearch.c b/ldap/servers/slapd/psearch.c
index c9d23cf..00f13be 100644
--- a/ldap/servers/slapd/psearch.c
+++ b/ldap/servers/slapd/psearch.c
@@ -277,9 +277,9 @@ ps_send_results( void *arg )
/* need to acquire a reference to this connection so that it will not
be released or cleaned up out from under us */
- PR_Lock( ps->ps_pblock->pb_conn->c_mutex );
+ PR_EnterMonitor(ps->ps_pblock->pb_conn->c_mutex);
conn_acq_flag = connection_acquire_nolock(ps->ps_pblock->pb_conn);
- PR_Unlock( ps->ps_pblock->pb_conn->c_mutex );
+ PR_ExitMonitor(ps->ps_pblock->pb_conn->c_mutex);
if (conn_acq_flag) {
slapi_log_error(SLAPI_LOG_CONNS, "Persistent Search",
@@ -397,7 +397,7 @@ ps_send_results( void *arg )
conn = ps->ps_pblock->pb_conn; /* save to release later - connection_remove_operation_ext will NULL the pb_conn */
/* Clean up the connection structure */
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
slapi_log_error(SLAPI_LOG_CONNS, "Persistent Search",
"conn=%" NSPRIu64 " op=%d Releasing the connection and operation\n",
@@ -407,9 +407,9 @@ ps_send_results( void *arg )
/* Decrement the connection refcnt */
if (conn_acq_flag == 0) { /* we acquired it, so release it */
- connection_release_nolock (conn);
+ connection_release_nolock (conn);
}
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
conn = NULL;
PR_DestroyLock ( ps->ps_lock );
diff --git a/ldap/servers/slapd/saslbind.c b/ldap/servers/slapd/saslbind.c
index b05c7ae..76294ac 100644
--- a/ldap/servers/slapd/saslbind.c
+++ b/ldap/servers/slapd/saslbind.c
@@ -667,7 +667,7 @@ char **ids_sasl_listmech(Slapi_PBlock *pb)
if (sasl_conn == NULL) return ret;
/* sasl library mechanisms are connection dependent */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
if (sasl_listmech(sasl_conn,
NULL, /* username */
"", ",", "",
@@ -680,7 +680,7 @@ char **ids_sasl_listmech(Slapi_PBlock *pb)
charray_free(others);
slapi_ch_free((void**)&dupstr);
}
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
LDAPDebug( LDAP_DEBUG_TRACE, "<= ids_sasl_listmech\n", 0, 0, 0 );
@@ -763,13 +763,13 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
PR_ASSERT(pb);
PR_ASSERT(pb->pb_conn);
- PR_Lock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_EnterMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
continuing = pb->pb_conn->c_flags & CONN_FLAG_SASL_CONTINUE;
pb->pb_conn->c_flags &= ~CONN_FLAG_SASL_CONTINUE; /* reset flag */
sasl_conn = (sasl_conn_t*)pb->pb_conn->c_sasl_conn;
if (sasl_conn == NULL) {
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result( pb, LDAP_AUTH_METHOD_NOT_SUPPORTED, NULL,
"sasl library unavailable", 0, NULL );
return;
@@ -850,7 +850,7 @@ void ids_sasl_check_bind(Slapi_PBlock *pb)
if (sasl_conn == NULL) {
send_ldap_result( pb, LDAP_AUTH_METHOD_NOT_SUPPORTED, NULL,
"sasl library unavailable", 0, NULL );
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
return;
}
}
@@ -866,7 +866,7 @@ sasl_check_result:
/* retrieve the authenticated username */
if (sasl_getprop(sasl_conn, SASL_USERNAME,
(const void**)&username) != SASL_OK) {
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL,
"could not obtain sasl username", 0, NULL);
break;
@@ -887,7 +887,7 @@ sasl_check_result:
}
}
if (dn == NULL) {
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_OPERATIONS_ERROR, NULL,
"could not get auth dn from sasl", 0, NULL);
break;
@@ -928,7 +928,7 @@ sasl_check_result:
slapi_ch_strdup(normdn),
NULL, NULL, NULL, bind_target_entry);
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
if (plugin_call_plugins( pb, SLAPI_PLUGIN_PRE_BIND_FN ) != 0){
break;
@@ -1003,9 +1003,9 @@ sasl_check_result:
/* see if we negotiated a security layer */
if (*ssfp > 0) {
/* Enable SASL I/O on the connection */
- PR_Lock(pb->pb_conn->c_mutex);
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
connection_set_io_layer_cb(pb->pb_conn, sasl_io_enable, NULL, NULL);
- PR_Unlock(pb->pb_conn->c_mutex);
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
}
/* send successful result */
@@ -1018,7 +1018,7 @@ sasl_check_result:
case SASL_CONTINUE: /* another step needed */
pb->pb_conn->c_flags |= CONN_FLAG_SASL_CONTINUE;
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
if (plugin_call_plugins( pb, SLAPI_PLUGIN_PRE_BIND_FN ) != 0){
break;
@@ -1040,7 +1040,7 @@ sasl_check_result:
case SASL_NOMECH:
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_AUTH_METHOD_NOT_SUPPORTED, NULL,
"sasl mechanism not supported", 0, NULL);
break;
@@ -1048,7 +1048,7 @@ sasl_check_result:
default: /* other error */
errstr = sasl_errdetail(sasl_conn);
- PR_Unlock(pb->pb_conn->c_mutex); /* BIG LOCK */
+ PR_ExitMonitor(pb->pb_conn->c_mutex); /* BIG LOCK */
send_ldap_result(pb, LDAP_INVALID_CREDENTIALS, NULL,
(char*)errstr, 0, NULL);
break;
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 0474e8e..633cc45 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -1411,7 +1411,7 @@ typedef struct conn {
PRInt32 c_opscompleted; /* # ops completed */
PRInt32 c_threadnumber; /* # threads used in this conn */
int c_refcnt; /* # ops refering to this conn */
- PRLock *c_mutex; /* protect each conn structure */
+ PRMonitor *c_mutex; /* protect each conn structure; need to be re-entrant */
PRLock *c_pdumutex; /* only write one pdu at a time */
time_t c_idlesince; /* last time of activity on conn */
int c_idletimeout; /* local copy of idletimeout */
diff --git a/ldap/servers/slapd/start_tls_extop.c b/ldap/servers/slapd/start_tls_extop.c
index 69b8607..af8d8f7 100644
--- a/ldap/servers/slapd/start_tls_extop.c
+++ b/ldap/servers/slapd/start_tls_extop.c
@@ -172,7 +172,7 @@ start_tls( Slapi_PBlock *pb )
/* At least we know that the request was indeed an Start TLS one. */
conn = pb->pb_conn;
- PR_Lock( conn->c_mutex );
+ PR_EnterMonitor(conn->c_mutex);
/* cannot call slapi_send_ldap_result with mutex locked - will deadlock if ber_flush returns error */
if ( conn->c_prfd == (PRFileDesc *) NULL ) {
slapi_log_error( SLAPI_LOG_PLUGIN, "start_tls",
@@ -246,10 +246,10 @@ start_tls( Slapi_PBlock *pb )
* we send a success response back to the client. */
ldapmsg = "Start TLS request accepted.Server willing to negotiate SSL.";
unlock_and_return:
- PR_Unlock( conn->c_mutex );
+ PR_ExitMonitor(conn->c_mutex);
slapi_send_ldap_result( pb, ldaprc, NULL, ldapmsg, 0, NULL );
- return( SLAPI_PLUGIN_EXTENDED_SENT_RESULT );
+ return( SLAPI_PLUGIN_EXTENDED_SENT_RESULT );
}/* start_tls */
@@ -312,7 +312,7 @@ start_tls_graceful_closure( Connection *c, Slapi_PBlock * pb, int is_initiator )
*/
}
- PR_Lock( c->c_mutex );
+ PR_EnterMonitor(c->c_mutex);
/* "Unimport" the socket from SSL, i.e. get rid of the upper layer of the
* file descriptor stack, which represents SSL.
@@ -342,7 +342,7 @@ start_tls_graceful_closure( Connection *c, Slapi_PBlock * pb, int is_initiator )
bind_credentials_clear( c, PR_FALSE, PR_TRUE );
- PR_Unlock( c->c_mutex );
+ PR_ExitMonitor(c->c_mutex);
return ( SLAPI_PLUGIN_EXTENDED_SENT_RESULT );
}
diff --git a/ldap/servers/slapd/unbind.c b/ldap/servers/slapd/unbind.c
index 9b6a70f..c0dec9d 100644
--- a/ldap/servers/slapd/unbind.c
+++ b/ldap/servers/slapd/unbind.c
@@ -73,9 +73,9 @@ do_unbind( Slapi_PBlock *pb )
}
/* target spec is used to decide which plugins are applicable for the operation */
- PR_Lock( pb->pb_conn->c_mutex );
+ PR_EnterMonitor(pb->pb_conn->c_mutex);
operation_set_target_spec_str (operation, pb->pb_conn->c_dn);
- PR_Unlock( pb->pb_conn->c_mutex );
+ PR_ExitMonitor(pb->pb_conn->c_mutex);
/* ONREPL - plugins should be called and passed bind dn and, possibly, other data */
commit 181847863bda74c2e3d77b6a7d9278350d50d4cc
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Thu Jan 7 18:04:19 2016 -0800
Revert "Ticket #48338 - SimplePagedResults -- abandon could happen between the abandon check and sending results"
This reverts commit 79ca67d1fc5d50d8a9ae6b686b9564f3960f8592.
The commit caused the bug 1296694 - ns-slapd crash in ipa context -
c_mutex lock memory corruption and self locks
diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c
index f2017be..bf57a33 100644
--- a/ldap/servers/slapd/pblock.c
+++ b/ldap/servers/slapd/pblock.c
@@ -223,12 +223,14 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
memset( value, 0, sizeof( PRNetAddr ));
break;
}
- /* For fields with atomic access, remove the PR_Lock(c_mutex) */
+ PR_Lock( pblock->pb_conn->c_mutex );
if ( pblock->pb_conn->cin_addr == NULL ) {
memset( value, 0, sizeof( PRNetAddr ));
} else {
- (*(PRNetAddr *)value) = *(pblock->pb_conn->cin_addr);
+ (*(PRNetAddr *)value) =
+ *(pblock->pb_conn->cin_addr);
}
+ PR_Unlock( pblock->pb_conn->c_mutex );
break;
case SLAPI_CONN_SERVERNETADDR:
if (pblock->pb_conn == NULL)
1
0
Changes since 389-ds-base-1.2.6.a1:
Anupam Jain (9):
Ticket 123 - Enhancement request:"whoami" extended operation
Ticket 123 - Enhancement request:"whoami" extended operation
Ticket 123 - Enhancement request:"whoami" extended operation
Ticket #47423 - 7-bit check plugin does not work for userpassword attribute
Ticket #47363 - 7-bit checking is not necessary for userPassword
Ticket #47431 - Duplicate values for the attribute nsslapd-pluginarg are not handled correctly
Ticket #47370 - DS crashes with some 7-bit check plugin configurations
Ticket #617 - Possible to add invalid ACI value
Ticket #626 - Possible to add nonexistent target to ACI
Carsten Grzemba (2):
Ticket #555 - add fixup-memberuid.pl script
Ticket #555 - add fixup-memberuid.pl script
Charles Lopes (1):
Bug #361: Bad DNs in ACIs can segfault ns-slapd
Endi S. Dewata (168):
Bug 545620 - Password cannot start with minus sign
Bug 538525 - Ability to create instance as non-root user
Bug 570542 - Root password cannot contain matching curly braces
Bug 470684 - Pam_passthru plugin doesn't verify account activation
Bug 573375 - MODRDN operation not logged
Bug 520151 - Error when modifying userPassword with proxy user
Bug 455489 - Address compiler warnings about strict-aliasing rules
Bug 566320 - RFE: add exception to removal of attributes in cn=config for aci
Bug 566043 - startpid file is only cleaned by initscript runs
Bug 584109 - Slapd crashes while parsing DNA configuration
Bug 542570 - Directory Server port number is not validated in the beginning.
Bug 145181 - Plugin target/bind subtrees only take 1 value.
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 628096 - spurious error message from /sbin/service when doing a stop on no instances
Bug 573889 - Migration does not remove deprecated schema
Bug 606545 - core schema should include numSubordinates
Bug 643979 - Strange byte sequence for attribute with no values (nsslapd-referral)
Endi Sukma Dewata (16):
Bug 630092 - Coverity #12117: Resource leaks issues
Bug 630092 - Coverity #15478: Resource leaks issues
Bug 630092 - Coverity #15479: Resource leaks issues
Bug 630092 - Coverity #15481: Resource leaks issues
Bug 630092 - Coverity #15482: Resource leaks issues
Bug 630092 - Coverity #15483: Resource leaks issues
Bug 630092 - Coverity #15484: Resource leaks issues
Bug 630092 - Coverity #15485: Resource leaks issues
Bug 630092 - Coverity #15487: Resource leaks issues
Bug 630092 - Coverity #15490: Resource leaks issues
Bug 630092 - Coverity #15497: Resource leaks issues
Bug 630092 - Coverity #11991: Resource leaks issues
Bug 630092 - Coverity #12000: Resource leaks issues
Bug 630092 - Coverity #12003: Resource leaks issues
Bug 630092 - Coverity #11985: Resource leaks issues
Bug 630092 - Coverity #11992,11993: Resource leaks issues
Jeroen van Meeuwen (Kolab Systems) (1):
Suppress alert on unavailable port with forced setup
Jochen Schneider (1):
Fix-for-ticket-47972 - make parsing of nsslapd-changelogmaxage more fault tolerant
Jonathan \"Duke\" Leto (1):
fix for trac #173; update ds-logpipe.py docs about -t option
Ken Rossato (8):
Factorize into new isPosixGroup function
Change "return"s in modGroupMembership to "break"s to avoid leaking
Memory leaks: unmatched slapi_attr_get_valueset and slapi_value_new
Simplify program flow: eliminate unnecessary continue
Simplify program flow: make adduids/moduids/deluids action blocks all similar
Fix logic errors: del_mod should be latched (might not be last mod), and avoid skipping add-mods (int value 0)
Simplify program flow: change while loops to for
Ticket #481 - expand nested posix groups
Ludwig Krispenz (83):
Fix for ticket 510
Fix for ticket 465: cn=monitor showing stats for other db instances
Fix for ticket 504
Ticket 349 - nsViewFilter syntax issue in 389DS 1.2.5
Ticket 518 - dse.ldif is 0 length after server kill or machine kill
Ticket 505 - use lock-free access name2asi and oid2asi table
Fix optimization issue introduced with fix for ticket #561,
modify operations without values need to be written to the changelog
Reduce replication meta data stored in entry, cf ticket 569
Fix compiler warnings introduced by fix for #569
removing an unused variable, did also remove an assigment
Ticket 568 - make usage of transaction batch flush durable
fix hang related to ticket 568
Ticket 47358 - implement backend optimazation levels
Ticket 47396 - crash on modrdn of tombstone
Ticket 47395 47397 v2 correct behaviour of account policy if only stateattr
fix compiler warnings, caused by fix for 47395,47397
Ticket 47399 - RHDS denies MODRDN access if ACI list contains any DENY rule
Ticket 47369 version2 - provide default syntax plugin
Fix compiler warning
Ticket 346 - version 4 Slow ldapmodify operation time
fix compiler warnings
CVE-2013-2219 ACLs inoperative in some search scenarios
fix compiler warning
Ticket 47502 - updates to ruv entry are written to retro changelog
Fix regression from fix for 569, when the last value of an attribute was explicitely deleted
Ticket 47505 - Get rid of valueset_add_valuearray_ext
Ticket 47487 - enhance retro changelog
Ticket 314 - ChaiOnUpdate for root handling
Use defines for backend error handling
Ticket 601 - multi master replication allows schema violation
Ticket 47388 - RFE to implement RFC4533 -ver2
Fix for coverty issues 12028,12029,12030
Ticket 47577 - crash when removing entries from cache
Ticket 47521 - Complex filter in a search request doen't work as expected.
Ticket 47591 - entries with empty objectclass attribute value can be hidden
Ticket 47527 - Allow referential integrity suffixes to be configurable
Ticket 47526 - Allow memberof suffixes to be configurable
Ticket 47612 - ns-slapd eats all the memory
simplify fix for 47612
Ticket 47621 - v2 make referential integrity configuration more flexible
Ticket 47629 - random crashes related to sync repl
Ticket 47704 - invalid sizelimits in aci group evaluation
Ticket 47732 - ds logs many "SLAPI_PLUGIN_BE_TXN_POST_DELETE_FN plugin returned error" messages
Ticket 47733 - ds logs many "Operation error fetching Null DN" messages
Ticket 47667 - Allow nsDS5ReplicaBindDN to be a group DN
Ticket 47712 - betxn: retro changelog broken after cancelled transaction
fix assertion failure introduced with fix for ticket 47667
Ticket 47761 - Return all attributes in rootdse without explicit request
fix jenkins warning
Ticket 47806 - Failed deletion of aci: no such attribute
Ticket 47805 - syncrepl doesn't send notification when attribute in search filter changes
Ticket 47803 - syncrepl crash if attribute list is non-empty
fix coverity issue 12621
fix compiler error with alst coverity commit
Ticket 47821 - deref plugin cannot handle complex acis
Ticket #47750 - Creating a glue fails if one above level is a conflict or missing
Ticket 47846 - server crashes deleting a replication agreement
Ticket 47872 - Filter AND with only one clause should be optimized
Ticket 47877 - check_and_add_entry fails for changetype: add and existing entry
Ticket 47816 -v2- internal syncrepl searches are flagged as unindexed
Ticket 47866 - Errors after upgrading related to attribute "dnaremotebindmethod"
Ticket 47885 - deref plugin should not return references with noc access rights
fix for 47885 did not always return a response control
Ticket 47918 - result of dna_dn_is_shared_config is incorrectly used
ticket 47916 plugin logging parameter only triggers result logging
Additional fix for ticket 47526 v3
fix jenkins warning
Ticket 47964 - v2 - Incorrect search result after replacing an empty attribute
Ticket 47991 - upgrade script fails if /etc and /var are on different file systems
Ticket #48021 - nsDS5ReplicaBindDNGroup checkinterval not working properly
Bug 1199675 - CVE-2014-8112 CVE-2014-8105 389-ds-base: various flaws [fedora-all]
Ticket 48136 -v2v2 accept auxilliary objectclasse in replication agreements
Ticket 48149 - ns-slapd double free or corruption crash
Ticket 48175 - Avoid using regex in ACL if possible
Ticket 48141 - aci with wildcard and macro not correctly evaluated
fix coverity reports
Ticket 48195 - Slow replication when deleting large quantities of multi-valued attributes
Ticket 48258 - dna plugin needs to handle binddn groups for authorization
Ticket 48263 - allow plugins to detect tombstone operations
fix redefinition of OP_FLAG found by jenkins
Ticket 48255- total update request can be lost
Ticket 48283 - many attrlist_replace errors in connection with cleanallruv
Lukas Slebodnik (1):
Ticket 48111 - "make clean" wipes out original files
Mark Reynolds (478):
Ticket #71 - unable to delete managed entry config
Ticket #159 - Managed Entry Plugin runs against managed entries upon any update without validating
Ticket #177 - logconv.pl doesn't detect restarts
Merge branch 'ticket159'
Ticket #49 - better handling for server shutdown while long running tasks are active
Ticket #50 - server should not call a plugin after the plugin close function is calle
Updated for ticket#50
Ticket #55 - Limit of 1024 characters for nsMatchingRule
Ticket #140 - incorrect memset parameters
Revert "Ticket #140 - incorrect memset parameters"
Revert "Ticket #55 - Limit of 1024 characters for nsMatchingRule"
Ticket #38 - nisDomain schema is incorrect
Ticket #6 - protocol error from proxied auth operation
Ticket #55 - Limit of 1024 characters for nsMatchingRule
Ticket #39 - Account Policy Plugin does not work for simple binds when PAM Pass Through Auth plugin is enabled
Ticket 175 - logconv.pl improvements
Ticket 175 - minor fixes
Ticket #17 - Replication optimizations
Ticket #17 - new replication optimizations
Ticket #129 - Should only update modifyTimestamp/modifiersName on MODIFY ops
Ticket #111 - ability to control behavior of modifyTimestamp/modifiersName
Ticket #211 - dnaNextValue gets incremented even if the user addition fails
Ticket #74 - Add schema for DNA plugin (RFE)
Ticket #306 - void function cannot return value
Ticket #302 - use thread local storage for internalModifiersName & internalCreatorsName
Schema Reload crash fix
Ticket #291 - cannot use & in a sasl map search filter
Ticket #305 - Certain CMP operations hang or cause ns-slapd to crash
Ticket #191 - Implement SO_KEEPALIVE in network calls
Config changes fail because of unknown attribute "internalModifiersname"
Ticket #292 - logconv.pl reporting unindexed search with different search base than shown in access logs
Ticket #308 - Automembership plugin fails if data and config area mixed in the plugin configuration
Ticket #271 - replication code cleanup
TIcket #285 - compilation fixes for '--format-security'
Ticket #271 - Slow shutdown when you have 100+ replication agreements
Ticket #24 - Add nsTLS1 to the DS schema
Ticket #319 - ldap-agent crashes on start with signal SIGSEGV
Ticket #20 - Allow automember to work on entries that have already been added
Ticket #315 - ns-slapd exits/crashes if /var fills up
Ticket #315 - small fix to libglobs
Ticket #183 - passwordMaxFailure should lockout password one sooner - and should be configurable to avoid regressions
Coverity Fixes
Ticket #325 - logconv.pl : use of getopts to parse command line options
Ticket #183 - passwordMaxFailure should lockout password one sooner
Ticket #207 - [RFE] enable attribute that tracks when a password was last set
Ticket #214 - Adding Replication agreement should complain if required nsds5ReplicaCredentials not supplied
Ticket #337 - Improve CLEANRUV task
Ticket #356 - RFE - Track bind info
Ticket #196 - RFE: Interpret IPV6 addresses for ACIs, replication, and chaining
Ticket #218 - Make RI Plugin worked with replicated updates
Ticket 367 - Invalid chaining config triggers a disk full error and shutdown
Ticket 365 - passwords in clear text in the audit log
Ticket #321 - krbExtraData is being null modified and replicated on each ssh login
Ticket #110 - RFE limiting root DN by host, IP, time of day, day of week
Ticket 368 - Make the cleanAllRUV task one step
Ticket #28 - MOD operations with chained delete/add get back error 53 on backend config
Ticket #369 - restore of replica ldif file on second master after deleting two records shows only 1 deletion
Update the slapi-plugin documentation on new slapi functions, and added a slapi function for checking on shutdowns
Ticket #388 - Improve replication agreement status messages
COVERITY FIXES
Coverity Fix
Ticket 366 - Change DS to purge ticket from krb cache in case of authentication error
Ticket 399 - slapi_ldap_bind() doesn't check bind results
Ticket 328 - make sure all internal search filters are properly escaped
Ticket 413 - "Server is unwilling to perform" when running ldapmodify on nsds5ReplicaStripAttrs
Ticket 403 - CLEANALLRUV feature
Ticket 407 - memory leak in dna plugin
Ticket 403 - cleanallruv coverity fixes
Misc Coverity Fixes
Ticket 407 - dna memory leak
Ticket 403 - CLEANALLRUV amendment
Ticket 403 - CLEANALLRUV - revision to last amendment
Ticket 403 - fix CLEANALLRUV regression from last commit
Ticket 429 - Add nsslapd-readonly to schema
CLEANALLRUV coverity fixes
Ticket 436 - nsds5ReplicaEnabled can be set with any invalid values.
Ticket 386 - Overconsumption of memory with large cachememsize and heavy use of ldapmodify
Ticket 450 - CLEANALLRUV task gets stuck on winsync replication agreement
Ticket 452 - automember rebuild task adds users to groups that do not match the configuration scope
Ticket 408 - create a normalized dn cache
Ticket 467 - CLEANALLRUV abort task should be able to ignore down replicas
Ticket 747 - Root DN Access Control - days allowed not working correctly
Ticket 475 - Root DN Access Control - improve value checking for config
Ticket 473 - change VERSION.sh to have console version be major.minor
Coverity issue 13091
Ticket 457 - dirsrv init script returns 0 even when few or all instances fail to start
Ticket 477 - CLEANALLRUV if there are only winsync agmts task will hang
Ticket 478 - passwordTrackUpdateTime stops working with subtree password policies
Ticket #446 - anonymous limits are being applied to directory manager
Ticket 488 - Doc: DS error log messages with typo
Ticket 486 - nsslapd-enablePlugin should not be multivalued
Ticket 468 - if pam_passthru is enabled, need to AC_CHECK_HEADERS([security/pam_appl.h])
Ticket 495 - internalModifiersname not updated by DNA plugin
Revert "Ticket 495 - internalModifiersname not updated by DNA plugin"
Ticket 495 - internalModifiersname not updated by DNA plugin
Ticket 147 - Internal Password Policy usage very inefficient
Ticket 517 - crash in DNA if no dnaMagicRegen is specified
Ticket 507 - use mutex for FrontendConfig lock instead of rwlock
Ticket 394 - modify-delete userpassword
Ticket 337 - improve CLEANRUV functionality
Coverity Fixes
Ticket 20 - Allow automember to work on entries that have already been added
Ticket 393 - Change in winSyncInterval does not take immediate effect
Ticket 216 - disable replication agreements
Ticket 395 - RFE: 389-ds shouldn't advertise in the rootDSE that we can handle a sasl mech if we really can't
Ticket 527 - ns-slapd segfaults if it cannot rename the logs
Ticket 509 - lock-free access to be->be_suffixlock
Merge branch 'ticket509'
Ticket 456 - improve entry cache sizing
Ticket 509 - lock-free access to be->be_suffixlock
Ticket 511 - allow turning off vattr lookup in search entry return
Ticket 541 - RootDN Access Control plugin is missing after upgrade
Ticket 541 - need to set plugin as off in ldif template
Ticket 534 - RFE: Add SASL mappings fallback
Ticket 534 - sasl mapping fallback
Ticket 532 - RUV is not getting updated for both Master and consumer
Ticket 534 - Add SASL mappings fallback
Ticket 534 - SASL Mapping Fallback
Ticket 539 - logconv.pl should handle microsecond timing
Ticket 471 - logconv.pl tool removes the access logs contents if "-M" is not correctly used
Ticket 552 - Adding rootdn-open-time without rootdn-close-time to RootDN Acess Control results in inconsistent configuration
Ticket 551 - Multivalued rootdn-days-allowed in RootDN Access Control plugin always results in access control violation
TIcket 419 - logconv.pl - improve memory management
Ticket 419 - logconv.pl - improve memory management
Ticket 558 - Replication - make timeout for protocol shutdown configurable
Ticket 417 - RFE - forcing passwordmustchange attribute by non-cn=directory manager
Ticket 562 - Crash when deleting suffix
Merge branch 'master' of ssh://git.fedorahosted.org/git/389/ds
Ticket 532 - RUV is not getting updated for both Master and consumer
Ticket 433 - multiple bugs in start-dirsrv, stop-dirsrv, restart-dirsrv scripts
Ticket 433 - multiple bugs in start-dirsrv, stop-dirsrv, restart-dirsrv scripts
Ticket 570 - DS returns error 20 when replacing values of a multi-valued attribute (only when replication is enabled)
Ticket 528 - RFE - get rid of instance specific scripts
Coverity Fixes
Ticket 528 - RFE - get rid of instance specific scripts (part 2)
Ticket 332 - Command line perl scripts should attempt most secure connection type first
Ticket 332 - Fix usage in scripts
Ticket 332 - minor quoting issue in a few scripts.
Ticket 588 - Create MAN pages for command line scripts
Ticket 332 - wrong argument count in ldif2db
Ticket 571 - server does not accept 0 length LDAP Control sequence
Ticket 583 - dirsrv fails to start on reboot due to /var/run/dirsrv permissions
Ticket 574 - problems with dbcachesize disk space calculation
Ticket 623 - cleanAllRUV task fails to cleanup config upon completion
Ticket 574 - problems with dbcachesize disk space calculation
Ticket 458 - RFE - Make it possible for privileges to be provided to an admin user
Ticket 611 - logconv.pl missing stats for StartTLS, LDAPI, and AUTOBIND
Ticket 622 - DS logging errors "libdb: BDB0171 seek: 2147483648: (262144 * 8192) + 0: No such file or directory
Ticket 525 - Introducing a user visible configuration variable for controlling replication retry time
Ticket 632 - 389-ds-base cannot handle Kerberos tickets with PAC
Ticket 587 - Replication error messages in the DS error logs
Ticket 458 - Need to properly check if the password admin dn is set
Ticket 628 - crash in aci evaluation
Ticket 620 - Better logging of error messages for 389-ds-base
Ticket 534 - RFE: Add SASL mappings fallback
Ticket 550 - posix winsync will not create memberuid values if group entry become posix group in the same sync interval
Ticket 631 - Replication: "Incremental update started" status message without consumer initialized
Ticket 47311 - segfault in db2ldif(trigger by a cleanallruv task)
Ticket 47304 - reinitialization of a master with a disabled agreement hangs
Ticket 47315 - filter option in fixup-memberof requires more clarification
Ticket 77 - [RFE] Add ACI support for ldapi
Ticket 47317 - should set LDAP_OPT_X_SASL_NOCANON to LDAP_OPT_ON by default
Ticket 205 - Fix compiler warning
Ticket 153 - use openldap's schema parser
Ticket 47299 - fix config file and server id processing
Ticket 580 - Wrong error code return when using EXTERNAL SASL and no client certificate
Fix coverity issues
Ticket 47317 - should set LDAP_OPT_X_SASL_NOCANON to LDAP_OPT_ON by default - revision
Ticket 47355 - dse.ldif doesn't replicate update to nsslapd-sasl-mapping-fallback
Ticket 511 - Revision - allow turning off vattr lookup in search entry return
Ticket 47337 - mep_pre_op: Unable to fetch origin entry
Ticket 283 - Expose slapi_eq_* API
Ticket 47340 - Deleting a separator ',' in 7-bit check plugin arguments makes the
Ticket 47326 - idl switch does not work
Merge branch 'ticket47326'
Ticket 589 - RFE - Support RFC 4527 Read Entry Controls
Ticket 47372 - make old-idl tunable
Coverity Fixes (part 1)
Coverity Fixes (Part 2)
Coverity Fixes (Part 3)
Coverity Fixes (Part 4)
Coverity Fixes (Part 5)
Ticket 47385 - DS not shutting down when disk monitoring threshold is reached
Fri Jun 7 10:41:00 2013 -0400
Ticket 47383 - connections attribute in cn=snmp,cn=monitor is counted twice
Ticket 47376 - DESC should not be empty as per RFC 2252 (ldapv3)
Ticket 47379 - DNA plugin failed to fetch replication agreement
Coverity (Part 7) + Jenkins fix
Ticket 47389 - Non-directory manager can change the individual userPassword's storage scheme
Ticket 47329 - Improve slapi_back_transaction_begin() return code when transactions are not available
Coverity Fixes
Ticket 47381 - nsslapd-db-transaction-batch-val turns to -1
Ticket 47385 - Disk Monitoring is not triggered as expected.
Ticket 47427 - Overflow in nsslapd-disk-monitoring-threshold
Ticket 47416 - SASL encrypted packet length exceeds maximum allowed limit
Ticket 47421 - memory leaks in set_krb5_creds
Ticket 47427 - Overflow in nsslapd-disk-monitoring-threshold
Ticket 47441 - Disk Monitoring not checking filesystem with logs
Ticket 47382 - Add a warning message when a connection hits the max number of threads
Ticket 47449 - deadlock after adding and deleting entries
Ticket 47427 - Overflow in nsslapd-disk-monitoring-threshold
Ticket 47450 - Fix compiler formatting warning errors for 32/64 bit arch
Ticket 47447 - logconv.pl man page missing -m,-M,-B,-D
Ticket 47323 - resurrected entry is not correctly indexed
Ticket 47440 - Fix compilation warnings and header files
Ticket 47440 - Fix runtime errors caused by last patch.
Ticket 47411 - Replace substring search with plain search in referint plugin
Ticket 47425 - should only call windows_update_done if repl agmt type is windows
Ticket 47426 - move compute_idletimeout out of handle_pr_read_ready
Ticket47426 - Coverity issue with last commit(move compute_idletimeout out of handle_pr_read_ready)
Ticket 47473 - setup-ds.pl doesn't lookup the "root" group correctly
Ticket 47461 - logconv.pl - Use of comma-less variable list is deprecated
Ticket 47384 - Plugin path validation returntext not set correctly
Ticket 47394 - remove-ds.pl should remove /var/lock/dirsrv
Ticket 47371 - Some updates of "passwordgraceusertime" are useless when updating "userpassword"
Ticket 47306 - execute index_add_mods only for indexed attributes
Ticket 47500 - start-dirsrv/restart-dirsrv/stop-disrv do not register with systemd correctly
Ticket 411 - [RFE] mods optimizer
Ticket 47507 - automember rebuild task not working as expected
Ticket 47512 - backend txn plugin fixup tasks should be done in a txn
Coverity fix - 11952
Ticket 47401 - report unindexed internal searches
Ticket 47520 - Fix various issues with logconv.pl
Ticket 47509 - CLEANALLRUV doesnt run across all replicas
Ticket 47509 - Cleanallruv jenkins error
Ticket 47513 - tmpfiles.d references /var/lock when they should reference /run/lock
Ticket 47528 - 389-ds-base built with mozldap can crash from invalid free
Ticket 47510 - 389-ds-base does not compile against MozLDAP libraries
Ticket 47532 - 1.3.1 with mozldap crashes in new operation work_q code
Ticket 47510 - Repl Sync does not compile against MozLDAP libraries
Ticket 47510 - remove unnecessary typedef
Ticket 47513 - Refine the check for @localrundir@
Ticket 47513 - Set localrundir outside of the "with-fhs" block
Ticket 47543 - Mozldap - fix compiler warnings
Ticket 47531 - Mozldap - need to rewrite sasl_io_recv
Ticket 47510 - Additional mozldap failures with Repl Sync
Ticket 47522 - Password adminstrators should be able to voilate password policy
Ticket 47491 - Update systemd service file to use PartOf directive
Ticket 47517 - memory leak in range searches and other various leaks
Ticket 47535 - Logconv.pl - RFE - add on option for a minimum etime for unindexed search stats
Ticket 47535 - update man page
Ticket 47499 - if nsslapd-cachememsize set to the number larger than
Ticket 47436 - 389-ds-base - shebang with /usr/bin/env
Coverity Issue 12033
Ticket 47538 - RFE: repl-monitor.pl plain text output, cmdline config options
Ticket 47519 - memory leaks in access control
Ticket 47368 - IPA server dirsrv RUV entry data excluded from replication
Ticket 47368 - Fix Jenkins errors
Ticket 47368 - Fix coverity issues
Ticket 47582 - agmt_count in Replica could become (PRUint64)-1
Ticket 47541 - Replication of the schema may overwrite consumer 'attributetypes' even
Ticket 47541 - Fix Jenkins errors
Ticket 47597 - Convert retro changelog plug-in to betxn
Ticket 47598 - Convert ldbm_back_seq code to be transaction aware
Ticket 47529 - Automember plug-in should treat MODRDN operations as ADD operations
Ticket 47599 - Reduce lock scope in retro changelog plug-in
Revert "Ticket 47599 - Reduce lock scope in retro changelog plug-in"
Ticket 47599 - Reduce lock scope in retro changelog plug-in
Ticket 47525 - Allow memberOf to use an alternate config area
Ticket 47525 - Fix memory leak
Ticket 47599 - fix memory leak
Ticket 47593 - Update plugin API for OTP plugin
Ticket 47457 - default nsslapd-sasl-max-buffer-size should be 2MB
Ticket 47592 - automember plugin task memory leaks
Ticket 47525 - Need to add locking around config area access
Ticket 47613 - Impossible to configure nsslapd-allowed-sasl-mechanisms
Ticket 47614 - Possible to specify invalid SASL mechanism in nsslapd-allowed-sasl-mechanisms
Ticket 47603 - Allow RI plugin to use alternate config area
Ticket 47587 - hard coded limit of 64 masters in agreement and changelog code
Ticket 47368 - fix memory leaks
Ticket 47620 - 389-ds rejects nsds5ReplicaProtocolTimeout attribute
Ticket 47622 - Automember betxnpreoperation - transaction not aborted when group entry does not exist
Ticket 47627 - changelog iteration should ignore cleaned rids when getting the minCSN
Ticket 47601 - Plugin library path validation prevents intentional loading of out-of-tree modules
Ticket 47617 - allow configuring changelog trim interval
Ticket 47613 - Issues setting allowed mechanisms
Ticket 47603 - should not modify pre op entry during config validation
Ticket 47620 - Config value validation improvement
Ticket 47620 - Fix logically dead code.
Ticket 47627 - Fix replication logging
Ticket 47620 - Fix dereferenced NULL pointer in agmtlist_modify_callback()
Ticket 47620 - Fix missing left bracket
Ticket 47653 - Need a way to allow users to create entries assigned to themselves
Ticket 47654 - Cleanup old memory leaks reported from valgrind
Ticket 47654 - fix double free
Ticket 408 - Fix crash when disabling/enabling the setting
Ticket 47620 - Unable to delete protocol timeout attribute
Ticket 47641 - 7-bit check plugin not checking MODRDN operation
Ticket 47638 - Overflow in nsslapd-disk-monitoring-threshold on 32bit platform
Ticket 47618 - Enable normalized DN cache by default
Ticket 47437 - Some attributes in cn=config should not be multivalued
Ticket 47615 - Failed to compile the DS 389 1.3.2.3 version against Berkeley DB 4.2 version
Ticket 47552 - logconv: unindexed report should list bind dn
Ticket 525 - Replication retry time attributes cannot be added
Ticket 47453 - configure SASL/GSSAPI/Kerberos without server restart
Ticket 47727 - Updating nsds5ReplicaHost attribute in a replication agreement fails with error 53
Ticket 47637 - rsa_null_sha should not be enabled by default
Ticket 47729 - Directory Server crashes if shutdown during a replication initialization
Ticket 47700 - Fix compiler warnings
Ticket 47722 - rsearch filter error on any search filter
Ticket47722 - Fixed filter not correctly identified
Ticket 47740 - Coverity Fixes (Mark - part 1)
Ticket 47740 - Fix sync plugin resource leaks
Ticket 47640 - Fix coverity issues - part 3
Ticket 47740 - Fix coverity erorrs - Part 4
Ticket 47740 - Fix coverity issues - Part 5
Ticket 47740 - Fix coverity issues: null deferences - Part 6
Ticket 47740 - Crash caused by changes to certmap.c
Revert "Ticket 47700 - Fix compiler warnings"
Ticket 47743 - Memory leak with proxy auth control
Ticket 47451 - add/enable/disable/remove plugins without server restart
Ticket 47740 - Fix coverity issues(part 7)
Ticket 47756 - Improve import logging and abort processing
Ticket 47759 - Crash in replication when server is under write load
Ticket 47655 - Improve replication total update logging
Ticket 47766 - Tombstone purging can crash the server if the backend is stopped/disabled
Ticket 47767 - Nested tombstones become orphaned after purge
Ticket 47771 - Performing deletes during tombstone purging results in operation errors
Ticket 47782 - Parent numbordinate count can be incorrectly updated if an error occurs
Ticket 47779 - Part of DNA shared configuration is deleted after server restart
Ticket 47771 - Move parentsdn initialization to avoid crash
Ticket 477779 - Need to lock server list when removing list
Ticket 47792 - code cleanup
Ticket 47792 - database plugins need a way to call betxn
Ticket 47793 - Server crashes if uniqueMember is invalid syntax and memberOf
Ticket 47756 - fix coverity issues
Ticket 47772 - fix coverity issue
Ticket 47451 - Remove old code from linked attr plugin
Ticket 47670 - Aci warnings in error log
Ticket 47636 - errorlog-level 16384 is listed as 0 in cn=config
Ticket 47713 - Logconv.pl with an empty access log gives lots of errors
Ticket 47446 - logconv.pl memory continually grows
Ticket 47791 - Negative value of nsSaslMapPriority is not
Ticket 47644 - Managed Entry Plugin - transaction not aborted upon failure to create managed entry
Ticket 47466 - Fix coverity issue
Ticket 47813 - managed entry plugin fails to update member
Ticket 47602 - txn commit being performed too early
Ticket 47815 - Add operations rejected by betxn plugins remain in cache
Ticket 47810 - investigate betxn plugins to ensure they
Ticket 47817 - The error result text message should be obtained just prior to sending result
Ticket 47827 - online import crashes server if using verbose error logging
Ticket 47815 - add lib389 test
Ticket 47827 - Fix coverity issue 12695
Ticket 47779 - Potential deadlock after startup if a dna configuration change is made
Ticket 47781 - Server deadlock if online import started while
Ticket 47781 - Add CI test
Ticket 47781 - CI test - use predefined property name variables
Ticket 47654 - Fix regression (deadlock/crash)
Ticket 47858 - Internal searches using OP_FLAG_REVERSE_CANDIDATE_ORDER can crash the server
Ticket 47819 - Improve tombstone purging performance
Ticket 47855 - clear tmp directory at the start of each test
Ticket 47855 - Fix previous commit
Ticket 47853 - client hangs in add if memberof fails
Ticket 437853 - Missing newline at end of the error log messages in memberof
Ticket 47710 - Missing warning for invalid replica backoff configuration
Ticket 47790 - Integer config attributes accept invalid
Ticket 47812 - logconv.pl missing -U option from usage
Ticket 47861 - Certain schema files are not replaced during upgrade
Ticket 47819 - Fix memory leak
Ticket 47862 - repl-monitor fails to convert "*" to default values
Ticket 47893 - should use Sys::Hostname instead Net::Domain
Ticket 47900 - Adding an entry with an invalid password as rootDN is incorrectly rejected
Ticket 47900 - Server fails to start if password admin is set
Ticket 47892 - Fix remaining compiler warnings
Ticket 47937 - Crash in entry_add_present_values_wsi_multi_valued
Ticket 47953 - Should not check aci syntax when deleting an aci
Ticket 47953 - testcase for removing invalid aci
Ticket 47451 - Need to unregister tasks created by plugins
Ticket 47952 - PasswordAdminDN attribute is not properly returned to client
Ticket 47958 - Memory leak in password admin if the admin entry does not exist
Ticket 47950 - Bind DN tracking unable to write to internalModifiersName without special permissions
Ticket 47963 - RFE - memberOf - add option to skip nested
Ticket 47810 - RI plugin does not return result code if update fails
Ticket 47963 - skip nested groups breaks memberof fixup task
Ticket 47451 - Running a plugin task can crash the server
Ticket 47967 - cos_cache_build_definition_list does not stop during server shutdown
Ticket 47969 - COS memory leak when rebuilding the cache
Ticket 47970 - Account lockout attributes incorrectly updated after failed SASL Bind
Ticket 47970 - add lib389 testcase
Ticket 47525 - Crash if setting invalid plugin config area for MemberOf Plugin
Ticket 47949 - logconv.pl -- support parsing/showing/reporting different protocol versions
Ticket 47969 - Fix coverity issue
Ticket 47965 - Fix coverity issues (2014/11/24)
Ticket 47636 - Error log levels not displayed correctly
Ticket 47722 - Using the filter file does not work
Ticket 47750 - Need to refresh cache entry after called betxn postop plugins
Ticket 47451 - Dynamic Plugin - various fixes
Ticket 47451 - Fix jenkins errors
Ticket 47451 - Add Dynamic Plugin CI Suite
Ticket 47750 - During delete operation do not refresh cache entry if it is a tombstone
Ticket 47451 - Dynamic plugins - fixed thread synchronization
Ticket 47980 - Nested COS definitions can be incorrectly
Ticket 47981 - COS cache doesn't properly mark vattr cache as
Ticket 47973 - During schema reload sometimes the search returns no results
Ticket 47617 - replication changelog trimming setting validation
Ticket 47807 - SLAPI_REQUESTOR_ISROOT not set for extended operation plugins
Ticket 47462 - Stop using DES in the reversible password
Ticket 47738 - use PL_strcasestr instead of strcasestr
Ticket 47999 - lib389 individual tests not running correctly
Ticket 47999 - address several race conditions in tests
Ticket 48017 - add script to generate lib389 CI test script
Ticket 48019 - Remove refs to constants.py and backup/restore from lib389 tests
Ticket 48023 - replace old replication check with lib389 function
Ticket 47963 - memberof skip nested groups breaks the plugin
Ticket 47451 - dynamic plugins - fix crash caused by invalid
Ticket 48027 - revise the rootdn plugin configuration validation
Ticket 48003 - build "suite" framework
Ticket 48003 - add template scripts
Bug 1199675 - CVE-2014-8112 CVE-2014-8105 389-ds-base: various flaws [fedora-all]
Ticket 48132 - modrdn crashes server (invalid read/writes)
Ticket 48151 - Improve CleanAllRUV logging
Ticket 48154 - abort cleanAllRUV tasks should not certify-all by default
Ticket 48151 - fix coverity issues
Ticket 48177 - dynamic plugins should not return an error when modifying a critical plugin
Ticket 48035 - nunc-stans - Revise shutdown sequence
Ticket 48036 - ns_set_shutdown should call ns_job_done
Ticket 48040 - preserve the FD when disabling a listener
Ticket 48037 - ns_thrpool_new should take a config struct rather than many parameters
Ticket 48038 - logging should be pluggable
Ticket 48039 - nunc-stans malloc should be pluggable
Ticket 48043 - use nunc-stans config initializer
Ticket 48110 - Free all the nunc-stans signal jobs when shutdown is detected
Ticket 48103 - update DS for new nunc-stans header file
Ticket 48158 - Remove cleanAllRUV task limit of 4
Ticket 48026 - fix invalid write for friendly attribute names
Ticket 48026 - Fix memory leak in uniqueness plugin
Ticket 48158 - cleanAllRUV task limit not being enforced correctly
Ticket 47828 - fix testcase "import" issue
Ticket 47753 - Fix testecase
Ticket 47913 - remove-ds.pl should not remove /var/lib/dirsrv
Ticket 47640 - Linked attributes transaction not aborted when
Ticket 48170 - Parse nsIndexType correctly
Ticket 47910 - allow logconv.pl -S/-E switches to work even when timestamps not present in access log
Ticket 47921 - indirect cos does not reflect changes in the cos attribute
Ticket 48197 - error texts from preop plugins not sent to client
Ticket 47998 - cleanup WINDOWS ifdef's
Ticket 47998 - remove "windows" files
Ticket 47998 - remove remaining obsolete OS code/files
Ticket 47878 - Improve setup-ds update logging
Ticket 48119 - setup-ds.pl does not log invalid --file path errors the same way as other errors.
Ticket 48208 - CleanAllRUV should completely purge changelog
Ticket 48013 - Inconsistent behaviour of DS when LDAP Sync is used with an invalid cookie
Ticket 48217 - cleanAllRUV hangs shutdown if not all of the
Ticket 48119 - Silent install needs to properly exit when INF file is missing
Ticket 47878 - Remove warning suppression in 1.3.4
Ticket 47910 - logconv.pl - validate start and end time args
Ticket 48179 - Starting a replica agreement can lead to
Ticket 47910 - logconv.pl - check that the end time is greater than the start time
Ticket 48206 - Crash during retro changelog trimming
Ticket 48204 - Add Python 3 compatibility to ds-logpipe
Ticket 47810 - memberOf plugin not properly rejecting updates
Ticket 48215 - verify_db.pl doesn't verify DB specified by -a option
Ticket 48215 - update dbverify usage
Ticket 48215 - update dbverify usage in main.c
Ticket 47931 - memberOf & retrocl deadlocks
Ticket 47931 - Fix coverity issues
Ticket 47686 - removing chaining database links trigger valgrind read errors
Ticket 48242 - Improve dirsrvtests/create_test.py script
Ticket 48248 - Use LDIF building function in basic test suite
Ticket 48233 - Server crashes in ACL_LasFindFlush during
Ticket 47831 - remove debug logging from retro cl
Ticket 47931 - lib389 test - memberof and retrocl deadlock
Ticket 48204 - Convert all python scripts to support python3
Ticket 48267 - Add config setting to MO plugin to add objectclass
Ticket 48276 - initialize free_flags in reslimit_update_from_entry()
Ticket 48273 - Update lib389 tests for new valgrind functions
Ticket 48217 - cleanallruv - fix regression with server shutdown
Ticket 48266 - Online init crashes consumer
Ticket 48284 - free entry when internal add fails
Ticket 48266 - do not free repl keep alive entry on error
Ticket 48204 - update lib389 test scripts for python 3
Ticket 48311 - nunc-stans: Attempt to release connection that
Ticket 48325 - Replica promotion leaves RUV out of order
Ticket 48325 - Add lib389 test script
Ticket 48369 - RFE - Add config setting to always send the
Ticket 48370 - The 'eq' index does not get updated properly
Ticket 48312 - Crash when doing modrdn on managed entry
Ticket 48388 - db2ldif -r segfaults from time to time
Matthew Via (1):
Ticket #47428 - Memory leak in 389-ds-base 1.2.11.15
Nathan Kinder (212):
Bug 549554 - Trim single-valued attributes before sending to AD
Improve search for pcre header file
Bug 434735 - Allow SASL ANONYMOUS mech to work
Bug 570912 - Avoid selinux context conflict with httpd
Allow instance name to be parsed from start-slapd
Add managed entries plug-in
Bug 572355 - Label instance files and ports during upgrade.
Bug 578863 - Password modify extop needs to send referrals on replicas
Bug 584156 - Remove ldapi socket file during upgrade
Fix rsearch usage of name files for random filters
Bug 584497 - Allow DNA plugin to set same value on multiple attributes
Add replication session hooks
Correct function prototype for repl session hook
Bug 592389 - Set anonymous resource limits properly
Bug 601433 - Add man pages for start-dirsrv and related commands
Bug 604263 - Fix memory leak when password change is rejected
Bug 612242 - membership change on DS does not show on AD
Bug 613833 - Allow dirsrv_t to bind to rpc ports
Bug 594745 - Get rid of dirsrv_lib_t label
Bug 620927 - Allow multiple membership attributes in memberof plugin
Bug 612264 - ACI issue with (targetattr='userPassword')
Bug 630098 - fix coverity Defect Type: Code maintainability issues
Bug 630098 - fix coverity Defect Type: Code maintainability issues
Bug 630093 - (cov#15511) Don't use unintialized search_results in refint plugin
Bug 630093 - (cov#15518) Need to intialize fd in ldbm2ldif code
Bug 630096 - (cov#11778) check return value of ldap_parse_result
Bug 630096 - (cov#15446) check return value of ber_scanf()
Bug 630096 - (cov#15449,15450) Check return value of stat()
Bug 630096 - (cov#15448) Check return value of cache_replace()
Bug 630096 - (cov#15447) - Check return value of idl_append_extend()
Bug 630090 - (cov#11974) Remove unused ACL functions
Bug 630090 - (cov#15445) Fix illegal free in archive code
Bug 630094 - (cov#11818) Fix unreachable return in snmp subagent
Bug 630094 - (cov#15451) Get rid of unreachable free statements
Bug 630094 - (cov#15452) Remove NULL checking for op_string
Bug 630094 - (cov#15453) Eliminate NULL check for local_newentry
Bug 630094 - (cov#15454) Fix deadcode issue in mapping tree code
Bug 630094 - (cov#15455) Remove deadcode in attr_index_config()
Bug 630094 - (cov#15456) Remove NULL check for srdn in import code
Bug 630094 - (cov#15457) Remove deadcode in import code
Bug 630094 - (cov#15458) Fix deadcode issue in moddn code
Bug 630094 - (cov#15459) Remove NULL check for srdn in ldif2ldbm code
Bug 630094 - (cov#15520) Fix unreachable code issue if perfctrs code
Bug 630094 - (cov#15581) Add missing breaks in agt_mopen_stats()
Bug 690090 - (cov#11974) Remove additional unused ACL functions
Bug 630091 - (cov#15512) Fix usage of uninitialized bervals
Bug 630091 - (cov#15513) Fix usage of uninitialized bervals
Bug 630091 - (cov#15514) Initialize DBT in entryrdn_get_parent()
Bug 630091 - (cov#15515) Use of uninitialized array in index config code
Bug 630091 - (cov#15516,15517) Initialize pointers before attempting to free
Bug 630091 - (cov#15519) Initialize bervals in search_easter_egg()
Bug 630091 - (cov#15582) Free of uninitialized pointer in attr_index_config()
Bug 630097 - (cov#11933) Fix NULL dereference in schema code
Bug 630097 - (cov#11938) NULL dereference in mmldif
Bug 630097 - (cov#11946) NULL dereference in ResHashCreate()
Bug 630097 - (cov#11964) Remove dead code from libaccess
Bug 630097 - (cov#12143) NULL dereference in cos cache code
Bug 630097 - (cov#12148) NULL dereference in ruvInit()
Bug 630097 - (cov#12182,12183) NULL dereference in import code
Bug 630097 - (cov#15460) NULL deference in ACL URL code
Bug 630097 - (cov#15461) Remove unnecessary NULL check in DNA
Bug 630097 - (cov#15462) NULL dereference in mep_modrdn_post_op()
Bug 630097 - (cov#15463) Remove NULL check in referint plugin
Bug 630097 - (cov#15464) NULL dereference in repl code
Bug 630097 - (cov#15465) Null dereference in USN code
Bug 630097 - (cov#15473) NULL dereference in ResHashCreate()
Bug 630097 - (cov#15505) NULL dereference in memberOf code
Bug 630097 - (cov#15506) NULL dereference in dblayer code
Bug 630097 - (cov#15507,15508) NULL dereference in entryrdn code
Bug 630097 - (cov#15509) NULL dereference in idsktune
Bug 630097 - (cov#11938) NULL dereference in mmldif
Bug 630097 - (cov#15477) NULL dereference in ACL plug-in code
Bug 630091 - (cov#12209) Use of uninitialized pointer in libaccess
Bug 630092 - (cov#12116) Resource leak in ldclt code
Bug 630092 - (cov#12105) Resource leak in pwdscheme config code
Bug 630092 - (cov#12068) Resource leak in certmap code
Bug 630091 - (cov#11973) Array overrun in libaccess
Bug 522055 - Scope check for managed attribute fails
Bug 625335 - Self-write aci has permission to invalid attribute
Bug 631993 - Log authzid when proxy auth control is used
Cov #16300 - Unused variable in account policy plugin
Bug 544321 - remove-ds.pl should not throw error unlabelling port
Bug 555955 - Allow CoS values to be merged
Bug 643937 - Initialize replication version flags
Bug 305131 - Allow empty modify operation
Bug 619633 - Make attribute uniqueness obey requiredObjectClass
Bug 619623 - attr-unique-plugin ignores requiredObjectClass on modrdn operations
Bug 189985 - Improve attribute uniqueness error message
Bug 647932 - multiple memberOf configuration adding memberOf where there is no member
Bug 521088 - DNA should check ACLs before getting a value from the range
Bug 635009 - Add one-way AD sync capability
Bump VERSION.sh to 1.2.8.a1
Bug 648949 - Move selinux policy into base OS
Bug 648949 - Update configure
Roll back VERSION.sh for 1.2.7 release
Bug 625950 - hash nsslapd-rootpw changes in audit log
Bug 656392 - Remove calls to ber_err_print()
Bug 656515 - Allow Name and Optional UID syntax for grouping attributes
Bug 197886 - Avoid overflow of UUID generator
Bug 658312 - Allow mapped attribute types to be quoted
Bug 197886 - Initialize return value for UUID generation code
Bug 658309 - Process escaped characters in managed entry mappings
Bug 659456 - Incorrect usage of ber_printf() in winsync code
Bug 641944 - Don't normalize non-DN RDN values
Bug 658312 - Invalid free in Managed Entry plug-in
Bug 661792 - Valid managed entry config rejected
Bug 588791 - Allow anonymous rootDSE access only
Bug 606439 - Creating server instance with LDAPI takes too long
Bug 632670 - Chain-on-update logs managed-entries-plugin errors
Bug 621008 - parsing purge RUV from changelog at startup fails
Bug 663191 - Don't use $USER in DSCreate.pm
Bug 663597 - Memory leaks in normalization code
Bug 659131 - Incorrect RDN values added with multi-valued RDN
Bug 661102 - Rename of managed entries not handled correctly
Bug 193297 - Call pre-bind plug-ins for all SASL bind steps
Bug 201652 - LDAPv2 bind with expired password doesn't unbind correctly
Bug 470576 - Migration could do addition checks before commiting actions
Bug 481195 - Missing op type in log when password change required
Bug 509897 - Validate dnaScope to ensure it is a legal DN
Bug 505722 - Allow ntGroup to have mail attribute present
Bug 543633 - replication problems if supplier is killed under update load
Bug 671033 - range sharing between server breaks with SASL/GSSAPI auth
Bug 527912 - setup-ds.pl appears to hang when DNS is unreachable
Bug 252249 - Add pkg-config file for plug-in developers
Bug 670616 - Allow SSF to be set for local (ldapi) connections
Bug 668862 - init scripts return wrong error code
Bug 674430 - Improve error messages for attribute uniqueness
Bug 675853 - dirsrv crash segfault in need_new_pw()
Bug 678646 - Ignore tombstone operations in managed entry plug-in
Bug 671199 - Don't allow other to write to rundir
Bug 672468 - Don't use empty path elements in LD_LIBRARY_PATH
Bug 674852 - crash in ldap-agent when using OpenLDAP
Bug 681345 - setup-ds.pl should set SuiteSpotGroup automatically
Bug 680558 - Winsync plugin fails to restrain itself to the configured subtree
Bug 504803 - Allow maxlogsize to be set if logmaxdiskspace is -1
Bug 687974 - (cov#10715) Fix Coverity uninitialized variables issues
Bug 688341 - (cov#10709) Fix Coverity code maintainability issues
Bug 688341 - (cov#10708) Fix Coverity code maintainability issues
Bug 688341 - (cov#10706,10707) Fix Coverity code maintainability issues
Bug 688341 - (cov#10704,10705) Fix Coverity code maintainability issues
Bug 688341 - (cov#10703) Fix Coverity code maintainability issues
Bug 688341 - (cov#10702) Fix Coverity code maintainability issues
Bug 688341 - (cov#10709) Fix Coverity code maintainability issues
Bug 689537 - (cov#10699) Fix Coverity NULL pointer dereferences
Bug 689537 - (cov#10610) Fix Coverity NULL pointer dereferences
Bug 689537 - (cov#10608) Fix Coverity NULL pointer dereferences
Bug 689952 - (cov#10581) Incorrect bit check in replication connection code
Bug 690526 - (cov#10734) Double free in dse_add()
Bug 690649 - (cov#10731) Use of free'd pointer in indexing code
Bug 690882 - (cov#10571) Incorrect sizeof use in uuid code
Bug 690882 - (cov#10636,10637) Useless comparison in attrcrypt
Bug 690882 - (cov#10703) Incorrect sizeof use in vattr code
Bug 690882 - (cov#10572,10710) Incorrect sizeof use in uuid code
Bug 691574 - (cov#10579) Check return value of ber_scanf() in sort code
Bug 691574 - (cov#10577) Check return types when adding RDN CSNs
Bug 691574 - (cov#10573) check return value in GER code
Bug 691574 - (cov#10575) Check return value of ldap_get_option
Bug 691574 - (cov#10573) Fix syntax error
Bug 693868 - Add managed entry config during in-place upgrade
Add Auto Membership Plug-in
Bug 698428 - Make auto membership use Slapi_DN for DN comparisons
Bug 695779 - windows sync can lose old values when a new value is added
Bug 700557 - Linked attrs callbacks access free'd pointers after close
Bug 700557 - Leak at shutdown in DNA plug-in
Bug 703304 - Auto membership alternate config area should override default area
Bug 703304 - Auto membership alternate config area should override default area
Bug 703530 - Allow Managed Entry config to be relocated
Bug 697961 - memberOf needs to be triggered by internal operations
Bug 710377 - Import with chain-on-update crashes ns-slapd
Split automember regex rules into separate entries
Bug 713209 - Update sudo schema
Bug 691313 - Need TLS/SSL error messages in repl status and errors log
Bug 723937 - Slapi_Counter API broken on 32-bit F15
Bug 725743 - Make memberOf use PRMonitor for it's operation lock
Bug 729717 - Fatal error messages when syncing deletes from AD
Bug 728510 - Run dirsync after sending updates to AD
Bug 730387 - Add slapi_rwlock API and use POSIX rwlocks
Bug 611438 - Add Account Usability Control support
Bug 728592 - Allow ns-slapd to start with an invalid server cert
Bug 732541 - Ignore error 32 when adding automember config
Bug 722292 - Entries in DS are not updated properly when using WinSync API
Bug 722292 - (cov#11030) Leak of mapped_sdn in winsync rename code
Bug 735114 - renaming a managed entry does not update mepmanagedby
Bug 739172 - Allow separate fractional attrs for incremental and total protocols
Bug 743966 - Compiler warnings in account usability plugin
Bug 744946 - (cov#11046) NULL dereference in IDL code
Bug 752155 - Use restorecon after creating init script lock file
Ticket 284 - Remove unnecessary SNMP MIB files
ticket 304 - Fix kernel version checking in dsktune
ticket 211 - Use of uninitialized variables in ldbm_back_modify()
ticket 181 - Allow PAM passthru plug-in to have multiple config entries
coverity 12563 Read from pointer after free (fix 2)
Ticket 211 - Avoid preop range requests non-DNA operations
Ticket #503 - Improve AD version in winsync log message
Ticket 549 - DNA plugin no longer reports additional info when range is depleted
Ticket 556 - Don't overwrite certmap.conf during upgrade
Add make rpms build target
Allow rpm builds to be run without configure
Add git commit hash to developer rpm build names
Add hardened build option and correct changelog dates
Revert "Ticket #47431 - Duplicate values for the attribute nsslapd-pluginarg are not handled correctly"
Ticket 449 - Allow macro aci keywords to be case-insensitive
Ticket 47539 - Disabling DNA plug-in throws error 53
Ticket 47513 - tmpfiles.d references /var/lock when they should reference /run/lock
Ticket 47565 - Content Sync update file needs extensibleObject
Ticket 47569 - ACIs do not allow attribute subtypes in targetattr keyword
Ticket 47569 - Fix build warnings
Ticket 47588 - Compiler warnings building on F19
Ticket 47611 - Add script to build patched RPMs
Ticket 47525 - Don't modify preop entry in memberOf config
Ticket 47752 - Don't add unhashed password mod if we don't have an unhashed value
Ticket 47753 - Add switch to disable pre-hashed password checking
Noriko Hosoi (774):
544089 - Referential Integrity Plugin does not take into account the attribute
557224 - subtree rename breaks the referential integrity plug-in
247413 - Incorrect error on multiple identical value add
559016 - Attempting to rename suffix returns inappropriate errors
555577 - Syntax validation fails for "ou=NetscapeRoot" tree
Undo - 555577 - Syntax validation fails for "ou=NetscapeRoot" tree
560827 - Admin Server templates: DistinguishName validation fails
548535 - memory leak in attrcrypt
563365 - Error handling problems in the backend functions
565664 - Incorrect parameter for CACHE_RETURN()
565987 - redhat-ds-base fails to build due to undefined struct
527848 - make sure db upgrade to 4.7 and later works correctly
539618 - Replication bulk import reports Invalid read/write
567370 - dncache: assertion failure in id2entry_delete
548115 - memory leak in schema reload
555970 - missing read lock in the combination of cos and nsview
539618 - Replication bulk import reports Invalid read/write
570667 - MMR: simultaneous total updates on the masters cause
Merge branch '547503'
Revert "Merge branch '547503'"
Bug 554573 - ACIs use bind DN from bind req rather than cert mapped DN from sasl/external
199923 - subtree search fails to find items under a db
570107 - The import of LDIFs with base-64 encoded DNs fails,
572649 - DS8.2 crashes on RHEL 4 (corresponding to bob, ber_2 test case)
573060 - DN normalizer: ESC HEX HEX is not normalized (
573896 - initializing subtree with invalid syntax crashes ns-slapd
515805 - Stop "initialize Database" crashes the server
548533 - memory leak in Repl_5_Inc_Protocol_new
Fixing a syntax error
Update to New DN Format
585905 - ACL with targattrfilters error crashes the server
574167 - An escaped space at the end of the RDN value is not
590931 - rhds81 import - hardcoded pages_limit for nsslapd-import-cache-autosize
591336 - Implementing upgrade DN format tool
593453 - Creating password policy with ns-newpolicy.pl on Replicated
593110 - backup-restore does not ALWAYS work
593899 - adding specific ACI causes very large mem allocate request
588867 - entryusn plugin fails on solaris
593899 - adding specific ACI causes very large mem allocate request
595893 - Base DN in SASL mapping is not normalized
511112 - Password history limited to 25 values
597375 - Deleting LDBM database causes backup/restore problem
574101 - MODRDN request never returns - possible deadlock
606920 - anonymous resource limit - nstimelimit -
605827 - In-place upgrade: upgrade dn format should not run in setup-ds-admin.pl
578296 - Attribute type entrydn needs to be added when subtree
609256 - Selinux: pwdhash fails if called via Admin Server CGI
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
616618 - 389 v1.2.5 accepts 2 identical entries with different DN formats
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
616608 - SIGBUS in RDN index reads on platforms with strict alignments
619595 - Upgrading sub suffix under non-normalized suffix disappears
513166 - Simple Paged result doesn't provide the server's estimate
621928 - Unable to enable replica (rdn problem?) on 1.2.6 rc6
Bug 194531 - db2bak is too noisy
Bug 622628 - fix coverity Defect Type: Integer handling issues
Bug 622628 - fix coverity Defect Type: Integer handling issues
Bug 622628 - fix coverity Defect Type: Integer handling issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 623118 - Simplepaged results going in infinite loop
Bug 614511 - fix coverity Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 619122 - fix coverity Defect Type: Resource leaks issues CID 11975 - 12051
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverity Defect Type: Resource leaks issues CID 12052 - 12093
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 616500 - fix coverity Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverity Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverity Defect Type: Resource leaks issues CID 12094 - 12136
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892
Bug 616500 - fix coverity Defect Type: Resource leaks issues
Bug 623507 - fix coverity Defect Type: Incorrect expression issues
Bug 623507 - fix coverity Defect Type: Incorrect expression issues
Bug 613056 - fix coverify Defect Type: Null pointer dereferences
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Removed redundant code in agmt_new_from_entry
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 628300 - DN is not normalized in dn/entry cache when an entry is added, entrydn is not present in search results
Bug 531642 - EntryUSN: RFE: a configuration option to make entryusn "global"
Bug 627738 - The cn=monitor statistics entries for the dnentry cache do not change or change very rarely
DN normalizer should check the invalid type
Bug 627738 - The cn=monitor statistics entries for the dnentry cache
Bug 629710 - escape_string does not check '\<HEX><HEX>'
agmtlist_shutdown (repl5_agmtlist.c) had an illegal access defect.
Bug 633168 - Share backend dbEnv with the replication changelog
Bug 633168 - Share backend dbEnv with the replication changelog
Bug 631862 - crash - delete entries not in cache + referint
Bug 625014 - SubTree Renames: ModRDN operation fails and the server hangs if the entry is moved to "under" the same DN.
Bug 558099 - Enhancement request: Log more information about the search result being a paged one
Bug 635987 - Incorrect sub scope search result with
Bug 606920 - anonymous resource limit- nstimelimit -
Bug 635987 - Incorrect sub scope search result with ACL containing ldap:///self
Bug 639289 - Adding a new CN entry with UpperCase UTF-8 Character
Bug 640027 - Naming attribute with a special char sequence parsing bug
Bug 640854 - changelog db: _cl5WriteOperation: failed to
Bug 637852 - sasl_io_start_packet: failed - read only 3 bytes
Bug 586966 - Sample update script has syntax errors
Bug 586973 - Sample update ldif points to non-existent directory
Bug 602456 - Allow to add any cn=config attributes;
Bug 244229 - targetattr not verified against schema when setting an aci
Bug 643532 - Incorrect DNs sometimes returned on searches
Bug 592397 - Upgrade tool dn2rdn: it does not clean up
Bug 645061 - Upgrade: 06inetorgperson.ldif and 05rfc4524.ldif
Bug 629681 - Retro Changelog trimming does not behave as expected
Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs
Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs
Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs
Bug 638773 - permissions too loose on pid and lock files
Bug 491733 - dbtest crashes
Bug 329751 - "nested" filtered roles searches candidates more
Bug 567282 - server can not abandon searchRequest of "simple paged results"
Bug 572018 - Upgrading from 1.2.5 to 1.2.6.a2 deletes userRoot
Bug 651571 - When attrcrypt is on, entrydn is stored in the backend db
Bug 661918 - 389-ds MMR plugin's changelogdb path logic is incorrect
Bug 182507 - clear-password mod from replica is discarded before changelogged
Bug 602456 - Allow to add any cn=config attributes;
Bug 489379 - passwordExpirationTime in entry being added
Bug 663484 - Entry usn plugin fails to properly tag entries on initialization
Bug 664563 - GER: ger for non-present entry is not correct
Bug 653007 - db2ldif export of clear text passwords lacks storage scheme
Bug 667488 - Cannot recreate numsubordinates index with db2index
Bug 663752 - Cert renewal for attrcrypt and encchangelog
Bug 615100 - log rotationinfo always recreated at startup,
Bug 624442 - MMR: duplicate replica ID
Bug 669205 - db2bak: backed up changelog should include RUVs
Bug 616850 - ldapmodify failed to reject the replace operation
Bug 627993 - Inconsistent storage of password expiry times
Bug 627993 - Inconsistent storage of password expiry times
dn2rdn should respect the DB version info
Bug 646381 - Faulty password for nsmultiplexorcredentials does not give any error message in logs
Bug 624547 - attrcrypt should query the given slot/token for
Bug 668619 - slapd stops responding
Bug 151705 - Need to update Console Cipher Preferences with new ciphers
Bug 615052 - intrinsics and 64-bit atomics code fails to compile
Bug 616213 - insufficient stack size for HP-UX on PA-RISC
Bug 675265 - preventryusn gets added to entries on a failed delete
Bug 604881 - admin server log files have incorrect permissions/ownerships
Bug 676053 - export task followed by import task causes cache assertion
Bug 676053 - export task followed by import task causes cache assertion
Bug 676053 - export task followed by import task causes cache assertion
Bug 450016 - RFE- Console display values in KB/MB/GB
Cancelling commit aef19508c4f618285116d2068655183658f564d9
Bug 625424 - repl-monitor.pl doesn't work in hub node
Bug 679978 - modifying attr value crashes the server, which is supposed to
Bug 681015 - RFE: allow fine grained password policy duration attributes in days, hours, minutes, as well
Bug 668909 - Can't modify replication agreement in some cases
Bug 684996 - Exported tombstone cannot be imported correctly
Bug 681015 - RFE: allow fine grained password policy duration attributes in days, hours, minutes, as well
Bug 689866 - ns-newpwpolicy.pl needs to use the new DN format
Bug 690955 - Mrclone fails due to the replica generation id mismatch
Bug 696407 - If an entry with a mixed case RDN is turned to be
Bug 697027 - 1 - minor memory leaks found by Valgrind + TET
Bug 697027 - 2 - minor memory leaks found by Valgrind + TET
Bug 697027 - 3 - minor memory leaks found by Valgrind + TET
Bug 697027 - 4 - minor memory leaks found by Valgrind + TET
Bug 697027 - 5 - minor memory leaks found by Valgrind + TET
Bug 697027 - 6 - minor memory leaks found by Valgrind + TET
Bug 697027 - 7 - minor memory leaks found by Valgrind + TET
Bug 697027 - 8 - minor memory leaks found by Valgrind + TET
Bug 697027 - 9 - minor memory leaks found by Valgrind + TET
Bug 697027 - 10 - minor memory leaks found by Valgrind + TET
Bug 697027 - 11 - minor memory leaks found by Valgrind + TET
Bug 697027 - 12 - minor memory leaks found by Valgrind + TET
Bug 697027 - 13 - minor memory leaks found by Valgrind + TET
Bug 697027 - 14 - minor memory leaks found by Valgrind + TET
Bug 697027 - 15 - minor memory leaks found by Valgrind + TET
Bug 697027 - 16 - minor memory leaks found by Valgrind + TET
Bug 697027 - 3 - minor memory leaks found by Valgrind + TET
Bug 697027 - 3 - minor memory leaks found by Valgrind + TET
Bug 700215 - ldclt core dumps
Bug 668619 - slapd stops responding
Bug 709826 - Memory leak: when extra referrals configured
Bug 706179 - DS can not restart after create a new objectClass has entryusn attribute
Bug 663752 - Cert renewal for attrcrypt and encchangelog
Bug 663752 - Cert renewal for attrcrypt and encchangelog
Bug 711679 - unresponsive LDAP service when deleting vlv on replica
Bug 711679 - unresponsive LDAP service when deleting vlv on replica
Bug 718303 - Intensive updates on masters could break the consumer's cache
Merge branch '718303'
Bug 719069 - clean up compiler warnings in 389-ds-base 1.2.9
Bug 712855 - Directory Server 8.2 logs "Netscape Portable
Bug 663752 - Cert renewal for attrcrypt and encchangelog
Bug 732153 - subtree and user account lockout policies implemented?
Introducing an environment variable USE_VALGRIND to clean up the entry cache and dn cache on exit.
Bug 744945 - nsslapd-counters attribute value cannot be set to "off"
Keep unhashed password psuedo-attribute in the adding entry
Reduce the number of DN normalization
Bug 745259 - Incorrect entryUSN index under high load
Bug 750622 - Fix Coverity (11104) Resource leak:
Bug 750624 - Fix Coverity (11053) Explicit null dereferenced:
Bug 750625 - Fix Coverity (11066) Unused pointer value
Bug 750625 - Fix Coverity (11065) Uninitialized pointer read
Bug 750625 - Fix Coverity (11064) Dereference before null check
Bug 750625 - Fix Coverity (11061) Resource leak
Bug 750625 - Fix Coverity (11060) Dereference null return value
Bug 750625 - Fix Coverity (11058, 11059) Dereference null return value
Bug 750625 - Fix Coverity (11057) Dereference null return value
Bug 750625 - Fix Coverity (11055) Explicit null dereferenced
Bug 750625 - Fix Coverity (11054) Dereference after null check
Bug 750625 - Fix Coverity (11117) Uninitialized pointer read
Bug 750625 - Fix Coverity (11116) Uninitialized pointer read
Bug 750625 - Fix Coverity (11114, 11115) Uninitialized value use
Bug 750625 - Fix Coverity (11113) Uninitialized pointer read
Bug 750625 - Fix Coverity (11112) Uninitialized pointer read
Bug 750625 - Fix Coverity (11109, 11110, 11111) Uninitialized pointer read
Bug 750625 - Fix Coverity (11108) Sizeof not portable
Bug 750625 - Fix Coverity (11107) Dereference before null check
Bug 750625 - Fix Coverity (11096) Explicit null dereferenced
Bug 750625 - Fix Coverity (11095) Explicit null dereferenced
Bug 750625 - Fix Coverity (11094) Dereference after null check
Bug 750625 - Fix Coverity (11091) Unchecked return value
Bug 750625 - Fix Coverity (11055-2) Explicit null dereferenced
Bug 750625 - Fix Coverity (11062) Resource leak
Bug 750625 - Fix Coverity (11066-2) Unused pointer value
Bug 750625 - Fix Coverity (12195) Dereference after null check
Bug 750625 - Fix Coverity (12196) Dereference before null check
Bug 750625 - Fix Coverity (11066-3) Unused pointer value
Bug 745259 - Incorrect entryUSN index under high load in
Trac Ticket 2 - If node entries are tombstone'd,
Trac Ticket 2 - If node entries are tombstone'd,
Trac Ticket 26 - Please support setting
Trac Ticket 75 - Unconfigure plugin opperations are being called.
Trac Ticket 168 - minssf should not apply to rootdse
Trac Ticket #18 - Data inconsitency during replication
Trac Ticket #52 - FQDN set to nsslapd-listenhost
Trac Ticket 139 - eliminate the use of char *dn in favor of Slapi_DN *dn
Trac Ticket 35 - Log not clear enough on schema errors
Trac Ticket #274 - Reindexing entryrdn fails if
Trac Ticket #275 - Invalid read reported by valgrind
Trac Ticket 51 - memory leaks in 389-ds-base-1.2.8.2-1.el5?
Trac Ticket #27 - SASL/PLAIN binds do not work
Trac Ticket #84 - 389 Directory Server Unnecessary Checkpoints
Trac Ticket #169 - allow 389 to use db5
Trac Ticket #34 - remove-ds.pl does not remove everything
Trac Ticket #26 - Please support setting defaultNamingContext in the rootdse.
Trac Ticket #298 - crash when replicating orphaned tombstone entry
Trac Ticket #290 - server hangs during shutdown if betxn pre/post op fails
Trac Ticket #290 - server hangs during shutdown if betxn pre/post op fails
Minor bug fix introcuded by commit 69c9f3bf7dd9fe2cadd5eae0ab72ce218b78820e
Trac Ticket #260 - 389 DS does not support multiple
Fixing compiler warnings
Trac Ticket #303 - make DNA range requests work with transactions
coverity 12606 Logically dead code
Trac Ticket #46 - setup-ds-admin.pl does not like ipv6 only hostnames
Trac Ticket #46 (revised) - setup-ds-admin.pl does not like ipv6 only hostnames
Trac Ticket #46 - (take 3) setup-ds-admin.pl does not like ipv6 only hostnames
Trac Ticket #46 - (additional) setup-ds-admin.pl does not
Trac Ticket #45 - Fine Grained Password policy:
Trac Ticket #46 - (additional 2) setup-ds-admin.pl does not like ipv6 only hostnames
Trac Ticket #335 - transaction retries need to be cache aware
Trac Ticket #338 - letters in object's cn get converted to
Trac Ticket #310 - Avoid calling escape_string() for logged DNs
Trac Ticket #19 - Convert entryUSN plugin to transaction aware type
Trac Ticket #345 - db deadlock return should not log error
Trac Ticket #359 - Database RUV could mismatch the one in changelog under the stress
Trac Ticket #359 - Database RUV could mismatch the one
Trac Ticket #338 - letters in object's cn get converted to
Trac Ticket #335 - transaction retries need to be cache aware
Bug 829213 - unhashed#user#password visible after changing password https://bugzilla.redhat.com/show_bug.cgi?id=829213
Bug 829213 - unhashed#user#password visible after changing password https://bugzilla.redhat.com/show_bug.cgi?id=829213
Bug 829213 - unhashed#user#password visible after changing password https://bugzilla.redhat.com/show_bug.cgi?id=829213
audit log does not log unhashed password: enabled, by default.
Trac Ticket 396 - Account Usability Control Not Working [Bug 835238]
Trac Ticket #402 - nhashed#user#password in entry extension
Trac Ticket #346 - Slow ldapmodify operation time for large
Trac Ticket #346 - Slow ldapmodify operation time for large
Coverity defects
Conflict definition in SLAPI_ATTR_FLAG macros
Trac Ticket #412 - memberof performance enhancement
Trac Ticket #409 - Report during startup if nsslapd-cachememsize is too small
Ticket 328 - make sure all internal search filters are properly escaped
Ticket 328 - make sure all internal search filters are properly escaped
Trac Ticket #346 - Slow ldapmodify operation time for large
Trac Ticket #437 - variable dn should not be used in ldbm_back_delete
Coverity defects
Trac Ticket #340 - Change on SLAPI_MODRDN_NEWSUPERIOR is not
Trac Ticket #466 - entry_apply_mod - ADD: Failed to set
Coverity defects
Trac Ticket #470 - 389 prevents from adding a posixaccount
Coverity defects
Trac Ticket #453 - db2index with -tattrname:type,type fails
Trac Ticket #351 - use betxn plugins by default
Bug 863576 - Dirsrv deadlock locking up IPA
Trac Ticket #455 - Insufficient rights to unhashed#user#password
Trac Ticket #451 - Allow db2ldif to be quiet
Coverity defects
Fixing compiler warnings in the posix-winsync plugin
Trac Ticket #494 - slapd entered to infinite loop during new index addition
Coverity defects
Trac Ticket #498 - Cannot abaondon simple paged result search
Trac Ticket #448 - Possible to set invalid macros in Macro ACIs
Trac Ticket #391 - Slapd crashes when deleting backends
Coverity fixes
Trac Ticket #190 - Un-resolvable server in replication
Trac Ticket #443 - Deleting attribute present in
Trac Ticket #447 - Possible to add invalid attribute
Trac Ticket #311 - IP lookup failing with multiple DNS
Trac Ticket #500 - Newly created users with
Trac Ticket #519 - Search with a complex filter including range search is slow
Trac Ticket #520 - RedHat Directory Server crashes (segfaults) when moving ldap entry
Coverity defect: Resource leak 13110
Trac Ticket #276 - Multiple threads simultaneously working on
Trac Ticket #531 - loading an entry from the database should use str2entry_fast
Trac Ticket #536 - Clean up compiler warnings for 1.3
Trac Ticket #531 - loading an entry from the database should use str2entry_f
Trac Ticket #499 - Handling URP results is not corrrect
bump version to 1.3.0.rc1
Trac Ticket #522 - betxn: upgrade is not implemented yet
Ticket 509 - lock-free access to be->be_suffixlock
Trac Ticket #497 - Escaped character cannot be used in the substring search filter
Ticket #422 - 389-ds-base - Can't call method "getText"
Ticket #547 - Incorrect assumption in ndn cache
Ticket #545 - Segfault during initial LDIF import: str2entry_dupcheck()
Ticket #542 - Cannot dynamically set nsslapd-maxbersize
Ticket #537 - Improvement of range search
Ticket #342 - better error message when cache overflows
Ticket #505 - use lock-free access name2asi and oid2asi tables (additional)
Ticket #529 - dn normalization must handle multiple space characters in attributes
Ticket #502 - setup-ds.pl script should wait if "semanage.trans.LOCK" presen
Ticket #563 - DSCreate.pm: Error messages cannot be used in the if expression since they could be localized.
Ticket #533 - only scan for attributes to decrypt if there are encrypted attrs configured
Ticket #543 - Sorting with attributes in ldapsearch gives incorrect result
Ticket #572 - PamConfig schema not updated during upgrade
Ticket #576 - DNA: use event queue for config update only at the start up
Ticket #579 - Error messages encountered when using POSIX winsync
Ticket #584 - Existence of an entry is not checked when its password is to be deleted
bump version to 1.3.1.pre.a1
Ticket #561 - disable writing unhashed#user#password to changelog
Coverity Fix
Ticket #490 - Slow role performance when using a lot of roles
Ticket #603 - A logic error in str2simple
Ticket #604 - Required attribute not checked during search operation
Ticket #585 - Behaviours of "db2ldif -a <filename>" and "db2ldif.pl -a <filename>" are inconsistent
Fixing a compiler warning introduced by Ticket #561 - disable writing unhashed#user#password to changelog
Ticket #634 - Deadlock in DNA plug-in
Ticket #627 - ns-slapd crashes sporadically with segmentation fault in libslapd.so
Ticket #47308 - unintended information exposure when anonymous access is set to rootdse
Ticket 623 - cleanAllRUV task fails to cleanup config upon completion
Ticket #618 - Crash at shutdown while stopping replica agreements
Ticket 458 - Need to properly check if the password admin dn is set
Ticket #529 - dn normalization must handle multiple space characters in attributes
Ticket #608 - Posix Winsync plugin throws "posix_winsync_end_update_cb: failed to add task entry" error message
Ticket #529 - dn normalization must handle multiple space characters in attributes
Ticket 623 - cleanAllRUV task fails to cleanup config upon completion
bump version to 1.3.2.pre.a1
Ticket #529 - dn normalization must handle multiple space characters in attributes
Ticket 528 - RFE - get rid of instance specific scripts
Ticket #47330 - changelog db extension / upgrade is obsolete
Ticket #529 - dn normalization must handle multiple space characters in attributes
Ticket #47313 - Indexed search with filter containing '&' and "!" with attribute subtypes gives wrong result
Ticket #47330 - changelog db extension / upgrade is obsolete
Ticket #47347 - Simple paged results should support async search
Ticket #529 - dn normalization must handle multiple space characters in attributes
Ticket #47320 - put conn on work_q not poll list if conn has buffered more_data
Ticket 47331 - Self entry access ACI not working properly
Ticket #529 - dn normalization must handle multiple space characters in attributes
Coverity fix -- 13164: Logically dead code
Ticket #47343 - 389-ds-base: Does not support aarch64 in f19 and rawhide
Ticket #47327 - error syncing group if group member user is not synced
Ticket #428 - posix winsync should support ADD user/group entries from DS to AD
Trac Ticket #402 - nhashed#user#password in entry extension
Ticket #569 - examine replication code to reduce amount of stored state information
Ticket 47379 - DNA plugin failed to fetch replication agreement
Ticket #47391 - deleting and adding userpassword fails to update the password
Ticket #47391 - deleting and adding userpassword fails to update the password (additional fix)
Ticket #47400 - MMR stress test with dna enabled causes a deadlock
Ticket #47384 - Plugin library path validation
Ticket #47374 - flush.pl is not included in perl5
Ticket #47420 - An upgrade script 80upgradednformat.pl fails to handle a server instance name incuding '-'
Ticket #47419 - Unhashed userpassword can accidentally get removed from mods
Ticket #47384 - Plugin library path validation
Ticket #47367 - (phase 1) ldapdelete returns non-leaf entry error while trying to remove a leaf entry
Ticket #47367 - (phase 2) ldapdelete returns non-leaf entry error while trying to remove a leaf entry
Ticket #47435 - Very large entryusn values after enabling the USN plugin and the lastusn value is negative.
Ticket #521 - modrdn + NSMMReplicationPlugin - Consumer failed to replay change
Ticket #47378 - fix recent compiler warnings
Ticket #630 - The backend name provided to bak2db is not validated
Ticket #415 - winsync doesn't sync DN valued attributes if DS DN value doesn't exist
Ticket #47314 - Winsync should support range retrieval
Ticket #47310 - Attribute "dsOnlyMemberUid" not allowed when syncing nested posix groups from AD with posixWinsync
Ticket #48 - Active Directory has certain uids which are reserved and will cause a Directory Server replica initialization of an AD server to abort.
Ticket #609 - nsDS5BeginReplicaRefresh attribute accepts any value and it doesn't throw any error when server restarts.
Ticket #197 - BDB backend - clear free page files to reduce changelog size
Ticket #48 - Active Directory has certain uids which are reserved and will cause a Directory Server replica initialization of an AD server to abort.
Ticket #460 - support multiple subtrees and filters
coverity 11956 - Dereference after null check
Ticket #47492 - PassSync removes User must change password flag on the Windows side
Ticket #47523 - Set up replcation/agreement before initializing the sub suffix, the sub suffix is not found by ldapsearch
Ticket #47534 - RUV tombstone search with scope "one" doesn`t work
Ticket #47463 - IDL-style can become mismatched during partial restoration
Coverity fixes - 12023, 12024, and 12025
Ticket #54 - locale "nl" not supported by collation plugin
Ticket #53 - Need to update supported locales
Ticket #53 - Need to update supported locales
Ticket #53 - Need to update supported locales
Ticket #47530 - dbscan on entryrdn should show all matching values
Ticket #47422 - With 1.3.04 and subtree-renaming OFF, when a user is deleted after restarting the server, the same entry can't be added
Ticket #47530 - dbscan on entryrdn should show all matching values
Ticket #538 - hardcoded sasl2 plugin path in ldaputil.c, saslbind.c
Ticket #47555 - db2bak.pl issue when specifying non-default directory
Ticket #47581 - Winsync plugin segfault during incremental backoff
Ticket #47581 - Winsync plugin segfault during incremental backoff (phase 2)
Ticket #605 - support TLS 1.1
Ticket #605 - support TLS 1.1 - adding backward compatibility
Ticket #342 - better error message when cache overflows (phase 2)
Ticket #605 - support TLS 1.1 - lower the log level for the supported NSS version range
Ticket #605 - support TLS 1.1 - Fixing "Coverity 12415 - Logically dead code"
Ticket #47313 - Indexed search with filter containing '&' and "!" with attribute subtypes gives wrong result
Ticket #47606 - replica init/bulk import errors should be more verbose
Ticket #447 - Possible to add invalid attribute to nsslapd-allowed-to-delete-attrs
Ticket #47571 - targetattr ACIs ignore subtype
Revert "Ticket 47653 - Need a way to allow users to create entries assigned to themselves"
Ticket #47660 - config_set_allowed_to_delete_attrs: Valgrind reports Invalid read
Ticket #47571 - targetattr ACIs ignore subtype
Ticket #342 - better error message when cache overflows
Ticket #443 - Deleting attribute present in nsslapd-allowed-to-delete-attrs returns Operations error
Ticket #47649 - Server hangs in cos_cache when adding a user entry
Ticket #47659 - ldbm_usn_init: Valgrind reports Invalid read / SIGSEGV
Ticket #47570 - slapi_ldap_init unusable during independent plugin development
Ticket #47693 - Environment variables are not passed when DS is started via service
Ticket #47677 - Size returned by slapi_entry_size is not accurate
Ticket #47608 - change slapi_entry_attr_get_bool to handle "on"/"off" values, support default value
Ticket #47602 - Make ldbm_back_seq independently support transactions
Ticket #47642 - Windows Sync group issues
Ticket #47701 - Make retro changelog trim interval programmable
Ticket #47701 - Make retro changelog trim interval programmable
Ticket #47700 - Unresolved external symbol references break loading of the ACL plugin
Ticket #47709 - package issue in 389-ds-base
Ticket #47709 - package issue in 389-ds-base
Ticket #47709 - package issue in 389-ds-base
Ticket #47701 - Make retro changelog trim interval programmable
Ticket 525 - Replication retry time attributes cannot be added
Ticket 408 - create a normalized dn cache
Ticket 571 (dup 47361) - Empty control list causes LDAP protocol error is thrown
Ticket 408 - create a normalized dn cache
Ticket #47725 - compiler error on daemon.c
Ticket #47735 - e_uniqueid fails to set if an entry is a conflict entry
Ticket #47737 - Under heavy stress, failure of turning a tombstone into glue makes the server hung
Ticket #47739 - directory server is insecurely misinterpreting authzid on a SASL/GSSAPI bind
Ticket #47734 - Change made in resolving ticket #346 fails on Debian SPARC64
Ticket #47740 - Coverity issue in 1.3.3
Ticket #47735 - e_uniqueid fails to set if an entry is a conflict entry
Ticket #47748 - Simultaneous adding a user and binding as the user could fail in the password policy check
Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values
Ticket #47707 - 389 DS Server crashes and dies while handles paged searches from clients
Ticket #47750 - Creating a glue fails if one above level is a conflict or missing;
Ticket #47764 - Problem with deletion while replicated
Ticket #47780 - Some VLV search request causes memory leaks
Ticket #47804 - db2bak.pl error with changelogdb
Ticket #47720 - Normalization from old DN format to New DN format doesnt handel condition properly when there is space in a suffix after the seperator operator.
Ticket #47770 - #481 breaks possibility to reassemble memberuid list
Ticket #47808 - If be_txn plugin fails in ldbm_back_add, adding entry is double freed.
Ticket 47313 - CI test: add test case for ticket 47313
Ticket 47808 - CI test: add test case for ticket 47808
Ticket #47809 - find a way to remove replication plugin errors messages "changelog iteration code returned a dummy entry with csn %s, skipping ..."
Ticket #555 - add fixup-memberuid.pl script
Ticket #47750 - Creating a glue fails if one above level is a conflict or missing
Ticket #47750 - Creating a glue fails if one above level is a conflict or missing
Ticket #47763 - winsync plugin modify is broken
Ticket #47835 - Coverity: 12687..12692
Ticket #47835 - Coverity: 12687..12692
Ticket #47835 - Coverity: 12687..12692
Ticket #47835 - Coverity: 12687..12692
Ticket #47835 - Coverity: 12687..12692
Ticket #47835 - Coverity: 12687..12692
Ticket #47835 - Coverity: 12687..12692
Ticket #47839 - 389-ds production segfault: __memcpy_sse2_unaligned...
Revert "Ticket #47835 - Coverity: 12687..12692"
Revert "Ticket #47835 - Coverity: 12687..12692"
Revert "Ticket #47835 - Coverity: 12687..12692"
Revert "Ticket #47835 - Coverity: 12687..12692"
Revert "Ticket #47835 - Coverity: 12687..12692"
Revert "Ticket #47835 - Coverity: 12687..12692"
Revert "Ticket #47835 - Coverity: 12687..12692"
Ticket #47852 - Updating winsync one-way sync does not affect the behaviour dynamically
Ticket #47832 - attrcrypt_generate_key calls slapd_pk11_TokenKeyGenWithFlags with improper macro
Ticket #47843 - Fix various typos in manpages & code
Ticket #47844 - Fix hyphens used as minus signed and other manpage mistakes
Ticket #47834 - Tombstone_to_glue: if parents are also converted to glue, the target entry's DN must be adjusted.
Ticket #47834 - Tombstone_to_glue: if parents are also converted to glue, the target entry's DN must be adjusted.
Revert "Revert "Ticket #47835 - Coverity: 12687..12692""
Ticket #47859 - Coverity: 12692 & 12717
Ticket #47859 - Coverity: 12692 & 12717
Ticket #47711 - improve dbgen rdn generation, output and man page.
Ticket #47746 - ldap/servers/slapd/back-ldbm/dblayer.c: possible minor problem with sscanf
Ticket #47824 - paged results control is not working in some cases when we have a subsuffix.
Ticket 47824 - CI test: add test case for ticket 47824
Ticket #47664 - Page control does not work if effective rights control is specified
Ticket 47664 - CI test: add test case for ticket 47664
Ticket #47714 - [RFE] Update lastLoginTime also in Account Policy plugin if account lockout is based on passwordExpirationTime.
Ticket 47714 - CI test: add test case for ticket 47713
Ticket 47714 - CI test: add test case for ticket 47714
Ticket #346 - Fixing memory leaks
Ticket #47579 - add dbmon.sh
Ticket #47579 - add dbmon.sh
Ticket #47869 - unauthenticated information disclosure (Bug 1123477)
Ticket #47834 - Tombstone_to_glue: if parents are also converted to glue, the target entry's DN must be adjusted.
Ticket 47824 - CI test: add test case for ticket 47824
Ticket 47664 - CI test: add test case for ticket 47664
Ticket #47838 - harden the list of ciphers available by default
Ticket 47838 - CI test: add test case for ticket 47838
Ticket #47838 - harden the list of ciphers available by default
Ticket 47869 - CI test: add test case for ticket 47869
Ticket #47838 - harden the list of ciphers available by default
Ticket #47574 - start dirsrv after ntpd
Ticket #47874 - Performance degradation with scope ONE after some load
Ticket #47875 - dirsrv not running with old openldap
Ticket #47875 - dirsrv not running with old openldap
Ticket #47875 - dirsrv not running with old openldap
Ticket #47875 - dirsrv not running with old openldap
Revert "Ticket #47875 - dirsrv not running with old openldap"
Ticket #47834 - Tombstone_to_glue: if parents are also converted to glue, the target entry's DN must be adjusted.
Ticket #47876 - coverity defects in slapd/tools/mmldif.c
Ticket #47879 - coverity defects in plugins/replication/windows_protocol_util.c
Ticket #47875 - dirsrv not running with old openldap
Ticket #47875 - dirsrv not running with old openldap
bump version to 1.3.4.a1
Ticket #47748 - Simultaneous adding a user and binding as the user could fail in the password policy check
Ticket #47834 - Tombstone_to_glue: if parents are also converted to glue, the target entry's DN must be adjusted.
Ticket #47890 - minor memory leaks in utilities
Ticket #47838 - harden the list of ciphers available by default
Ticket 47838,47895 - CI test: add test cases for ticket 47838 and 47895
Ticket #47895 - If no effective ciphers are available, disable security setting.
Ticket #47750 - Creating a glue fails if one above level is a conflict or missing
Ticket #47907 - ldclt: assertion failure with -e "add,counteach" -e "object=<ldif file>,rdn=uid:test[A=INCRNNOLOOP(0;24
Ticket #47908 - 389-ds 1.3.3.0 does not adjust cipher suite configuration on upgrade, breaks itself and pki-server
Ticket #47838 - harden the list of ciphers available by default (phase 2)
Ticket 47838 - CI test: adjusted test cases based on the phase 2 fixes for ticket 47838
Ticket #47880 - provide enabled ciphers as search result
Ticket 47880 - CI test: added test cases for ticket 47880
Ticket #47892 - coverity defects found in 1.3.3.x
Ticket #47919 - ldbm_back_modify SLAPI_PLUGIN_BE_PRE_MODIFY_FN does not return even if one of the preop plugins fails.
Ticket #47912 - Proper handling of "No original_tombstone for changenumber" errors
Ticket #47897 - Need to move slapi_pblock_set(pb, SLAPI_MODRDN_EXISTING_ENTRY, original_entry->ep_entry) prior to original_entry overwritten
Ticket #47922 - dynamically added macro aci is not evaluated on the fly
Ticket #47553 - Enhance ACIs to have more control over MODRDN operations
Ticket #47928 - Disable SSL v3, by default.
Ticket 47928 - CI test: added test cases for ticket 47928
Ticket #47928 - Disable SSL v3, by default.
Ticket #47939 - Malformed cookie for LDAP Sync makes DS crash
Ticket #47945 - Add SSL/TLS version info to the access log
Ticket #47948 - ldap_sasl_bind fails assertion (ld != NULL) if it is called from chainingdb_bind over SSL/startTLS
Ticket #47928 - Disable SSL v3, by default.
Ticket #47960 - cookie_change_info returns random negative number if there was no change in a tree
Ticket #47960 - cookie_change_info returns random negative number if there was no change in a tree
Ticket #47935 - Error: failed to open an LDAP connection to host 'example.org' port '389' as user 'cn=Directory Manager'. Error: unknown.
Ticket 47965 - Fix coverity issues (2014/12/16)
Ticket #47947 - start dirsrv after chrony on RHEL7 and Fedora
Ticket #47966 - slapd crashes during Dogtag clone reinstallation
Ticket #47905 - Bad manipulation of passwordhistory
Ticket #47934 - nsslapd-db-locks modify not taking into account.
Ticket #47989 - Windows Sync accidentally cleared raw_entry
Ticket #47996 - ldclt needs to support SSL Version range
Ticket 47988: Schema learning mechanism, in replication, unable to extend an existing definition
Coverity 12970 - Explicit null dereference
Ticket #48001 - ns-activate.pl fails to activate account if it was disabled on AD
Ticket #48001 - ns-activate.pl fails to activate account if it was disabled on AD
Ticket #48025 - add an option '-u' to dbgen.pl for adding group entries with uniquemembers
Ticket #47728 - compilation failed with ' incomplete struct/union/enum' if not set USE_POSIX_RWLOCKS
Ticket #47836 - Do not return '0' as empty fallback value of nsds5replicalastupdatestart and nsds5replicalastupdatestart
Ticket #47742 - 64bit problem on big endian: auth method not supported
Ticket #48005 - ns-slapd crash in shutdown phase
Ticket 48005 - CI test: added test cases for ticket 48005
Ticket #48030 - spec file should run "systemctl stop" against each running instance instead of dirsrv.target
Ticket #48026 - Support for uniqueness plugin to enforce uniqueness on a set of attributes.
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48048 - Fix coverity issues - 2015/2/24
Ticket #48109 - substring index with nssubstrbegin: 1 is not being used with filters like (attr=x*)
Ticket 48109 - CI test: added test cases for ticket 48109
Ticket #48109 - substring index with nssubstrbegin: 1 is not being used with filters like (attr=x*)
Ticket #48048 - Fix coverity issues - 2015/3/1
Ticket #47431 - Duplicate values for the attribute nsslapd-pluginarg are not handled correctly
Ticket 47431 - CI test: added test cases for ticket 47431
Ticket #47957 - Make ReplicaWaitForAsyncResults configurable
Ticket #47801 - RHDS keeps on logging write_changelog_and_ruv: failed to update RUV for unknown
Ticket #48133 - Non tombstone entry which dn starting with "nsuniqueid=...," cannot be deleted
Ticket #47723 - winsync sets AccountUserControl in AD to 544
Ticket #48143 - Password is not correctly passed to perl command line tools if it contains shell special characters.
Ticket 47966 - CI test: added test cases for ticket 47966
Ticket #48169 - support NSS 3.18
Ticket #48146 - async simple paged results issue
Ticket #48109 - substring index with nssubstrbegin: 1 is not being used with filters like (attr=x*)
Ticket #48146 - async simple paged results issue; log pr index
Ticket #48146 - async simple paged results issue; need to close a small window for a pr index competed among multiple threads.
Ticket #48146 - async simple paged results issue
Ticket #48183 - bind on db chained to AD returns err=32
Ticket #48146 - async simple paged results issue
Ticket #48146 - async simple paged results issue
Ticket #48190 - idm/ipa 389-ds-base entry cache converges to 500 KB in dblayer_is_cachesize_sane
Revert "Ticket 48149 - ns-slapd double free or corruption crash"
Ticket #48192 - Individual abandoned simple paged results request has no chance to be cleaned up
Ticket #48192 - Individual abandoned simple paged results request has no chance to be cleaned up
Ticket #48192 - Individual abandoned simple paged results request has no chance to be cleaned up
Ticket #47972 - make parsing of nsslapd-changelogmaxage more fool proof
Ticket #48191 - RFE: Adding nsslapd-maxsimplepaged-per-conn
Ticket #48191 - CI test: added test cases for ticket 48191
Ticket #48191 - RFE: Adding nsslapd-maxsimplepaged-per-conn Adding nsslapd-maxsimplepaged-per-conn
Ticket #48008 - db2bak.pl man page should be improved.
Ticket #48194 - nsSSL3Ciphers preference not enforced server side
Ticket #48194 - CI test: added test cases for ticket 48194
Ticket #47669 - Retro Changelog Plugin accepts invalid value in nsslapd-changelogmaxage attribute
Ticket #47669 - CI test: added test cases for ticket 47669
Spec file changes for nunc-stans
Ticket #48032,48033 - change C code license to GPLv3; change C code license to allow openssl
Ticket #48032,48033 - change C code license to GPLv3; change C code license to allow openssl
bump version to 1.3.4.0
Ticket #48203 - Fix coverity issues - 06/22/2015
Updating 389-ds-base.spec.in for the better nunc-stans support.
bump version to 1.3.4.1
Ticket #48212 - Dynamic nsMatchingRule changes had no effect on the attrinfo thus following reindexing, as well.
Ticket #48212 - CI test: added test cases for ticket 48212
Ticket #48214 - ldapsearch on nsslapd-maxbersize returns 0 instead of current value
Ticket #48214 - CI test: added test cases for ticket 48213
Ticket #48192 - Individual abandoned simple paged results request has no chance to be cleaned up
Ticket #48203 - Fix coverity issues - 07/07/2015
Ticket #47799 - Any negative LDAP error code number reported as Illegal error by ldclt.
Ticket #48216 - crash in ns-slapd when deleting winSyncSubtreePair from sync agreement
Ticket #48223 - Winsync fails when AD users have multiple spaces (two)inside the value of the rdn attribute
Ticket #48194 - CI test: fixing test cases for ticket 48194
Ticket #48203 - Fix coverity issues - 07/14/2015
Ticket #48226 - In MMR, double free coould occur under some special condition
Ticket #48226 - CI test: added test cases for ticket 48226
Ticket #48010 - winsync range retrieval gets only 5000 values upon initialization
bump version to 1.3.4.2
bump version to 1.3.4.3
Ticket #48232 - winsync lastlogon attribute not syncing between DS and AD.
Ticket #48231 - logconv autobind handling regression caused by 47446
Ticket #48228 - wrong password check if passwordInHistory is decreased.
Ticket #48228 - CI test: added test cases for ticket 48228
Ticket #47511 - bashisms in 389-ds-base admin scripts
Ticket #48245 - Man pages and help for remove-ds.pl doesn't display "-a" option
Ticket #48250 - Slapd crashes reported from latest build
Ticket #48243 - replica upgrade failed in starting dirsrv service due to upgrade scripts did not run
Ticket #48254 - CLI db2index fails with usage errors
Ticket #48254 - Shell CLI fails with usage errors if an argument containing white spaces is given
Ticket #47757 - Unable to dereference unqiemember attribute because it is dn [#UID] not dn syntax
Ticket #48252 - db2index creates index entry from deleted records
Ticket #48252 - CI test: added test cases for ticket 48252
Ticket #48228 - wrong password check if passwordInHistory is decreased.
Ticket #48252 - db2index creates index entry from deleted records
Ticket #47981 - COS cache doesn't properly mark vattr cache as invalid when there are multiple suffixes
Ticket #48265 - Complex filter in a search request doen't work as expected. (regression)
Ticket #48265 - CI test: added test cases for ticket 48265
bump version to 1.3.4.4
Revert "Ticket #48254 - Shell CLI fails with usage errors if an argument containing white spaces is given"
Revert "Ticket #47511 - bashisms in 389-ds-base admin scripts"
Ticket #47511 - bashisms in 389-ds-base admin scripts
Ticket #48254 - Shell CLI fails with usage errors if an argument containing white spaces is given
Ticket #48226 - In MMR, double free coould occur under some special condition
Ticket #48279 - Check NULL reference in nssasl_mutex_lock etc. (saslbind.c)
Ticket #48188 - segfault in ns-slapd due to accessing Slapi_DN freed in pre bind plug-in
Ticket #48299 - pagedresults - when timed out, search results could have been already freed.
Ticket #48192 - Individual abandoned simple paged results request has no chance to be cleaned up
Ticket #48298 - ns-slapd crash during ipa-replica-manage del
Ticket #48304 - ns-slapd - LOGINFO:Unable to remove file
Ticket #48305 - perl module conditional test is not conditional when checking SELinux policies
Ticket #48338 - SimplePagedResults -- abandon could happen between the abandon check and sending results
Ticket #48344 - acl - regression - trailing ', (comma)' in macro matched value is not removed.
Ticket #48339 - Share nsslapd-threadnumber in the case nunc-stans is enabled, as well.
Ticket #48348 - Running /usr/sbin/setup-ds.pl fails with Can't locate bigint.pm, plus two warnings
Ticket #48316 - Perl-5.20.3-328: Use of literal control characters in variable names is deprecated
Ticket #48338 - SimplePagedResults -- abandon could happen between the abandon check and sending results
bump version to 1.3.4.5
Ticket #48305 - perl module conditional test is not conditional when checking SELinux policies
Ticket #48375 - SimplePagedResults -- in the search error case, simple paged results slot was not released.
bump version to 1.3.4.6
Petr Viktorin (1):
Ticket 47899: Fix slapi_td_plugin_lock_init prototype
Rich Megginson (479):
Net::LDAP password modify extop breaks; msgid in response is 0xFF
Clean up assert for entrydn
Bug 543080 - Bitwise plugin fails to return the exact matched entries for Bitwise search filter
Bug 537466 - nsslapd-distribution-plugin should not require plugin name to begin with "lib"
bump version to 1.2.6.a2
Do not use syntax plugins directly for filters, indexing
wrap new style matching rule plugins for use in old style indexing code
change extensible filter code to use new syntax function style mr funcs
change syntax plugins to register required matching rule plugins
crash looking up compat syntax; numeric string syntax using integer; make octet string ordering work correctly
fix memory leak in attr replace when replacement fails
fix dso linking issues found by fedora 13 linking
problems linking with -z defs
389 DS segfaults on libsyntax-plugin.so - part 1
389 DS segfaults on libsyntax-plugin.so - part 2
389 DS segfaults on libsyntax-plugin.so - part 3
Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location on non-RHEL/Fedora OS
Bug 568196 - Install DS8.2 on Solaris fails
Bug 568196 - Install DS8.2 on Solaris fails - part 2
Bug 551198 - LDAPI: incorrect logging to access log
bump version to 1.2.6.a3
fix various memory leaks
Bug 551198 - LDAPI: incorrect logging to access log - part 2
Bug 554573 - ACIs use bind DN from bind req rather than cert mapped DN from sasl/external
cleanup build warnings
Bug 571514 - upgrade to 1.2.6 should upgrade 05rfc4523.ldif (cert schema)
Bug 570905 - postalAddress syntax should allow empty lines (should allow $$)
Add support for additional schema/matching rules included with 389
Bug 572677 - Memory leak in searches including GER control
Bug 571677 - Busy replica on consumers when directly deleting a replication conflict
Bug 576074 - search filters with parentheses fail
Bug 567429 - slapd didn't close connection and get into CLOSE_WAIT state
Bug 578167 - repl. of mod/replace deletes multi-valued attrs
Bug 561575 - setup-ds-admin fails to supply nsds5ReplicaName when configuring via ConfigFile
Bug 572162 - the string "|*" within a search filter on a non-indexed attribute returns all elements.
Bug 576644 - segfault while multimaster replication (paired node won't find deleted entries)
start of 1.2.6.a4
Bug 572018 - Upgrading from 1.2.5 to 1.2.6.a2 deletes userRoot
Fix too few args for format warning in acllas
Bug 586571 - DS Console shows escaped DNs
Bug 591685 - Server instances Fail to Start on Solaris due to Library Path and pcre
bump console version to 1.2.3
Repl Session API needs to check for NULL api before init
Bug 593392 - setup-ds-admin.pl -k creates world readable file
Bug 595874 - 99user.ldif getting overpopulated
bump version to 1.2.6.a5
bump version to 1.2.6.rc1
bump version to 1.2.6.rc2
bump version to 1.2.6.rc3
Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll
Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll
Bug 603942 - null deref in _ger_parse_control() for subjectdn
bump version to 1.2.6.rc4
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 602530 - coverity: op_shared_modify: compare pre, post and original entries before freeing them
Bug 602531 - coverity: op_shared_delete: compare preop entry and GLUE_PARENT_ENTRY before freeing them
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 610177 - fix coverity Defect Type: Uninitialized variables issues
Bug 610276 - fix coverity Defect Type: API usage errors issues
Bug 611850 - fix coverity Defect Type: Error handling issues
Bug 614242 - C99/ANSI C++ related compile errors on HP-UX
Bug 547503 - replication broken again, with 389 MMR replication and TCP errors
Bug 617013 - repl-monitor.pl use cpu upto 90%
fix build failures due to libtool problems
Bug 617629 - Missing aliases in new schema files
Bug 617862 - Replication: Unable to delete tombstone errors
bump version to 1.2.7.a1
Bug 610281 - fix coverity Defect Type: Control flow issues - daemon.c:write_function()
Bug 610281 - fix coverity Defect Type: Control flow issues - last repl init status
postalAddress syntax does not accept empty values
ger should support both "dn" and "distinguishedName"
openldap - ldap_url_parse_ext is not part of the public api
fix memleak in ldbm_config_read_instance_entries
Add -x option to ldap tools when using openldap
openldap - add support for missing controls, add ldif api, fix NSS usage
port client tools to use openldap API
use the mozldap versions of the proxy auth control create function
document slapi wrappers for openldap/mozldap functions that differ
fix some compiler warnings
use strcasecmp with ptype and type->bv_val
ber_printf 'o' cannot handle NULL bv_val
fix the url_parse logic when looking for a missing suffix DN
openldap ldapsearch uses -LLL to suppress # version: N
add ldaptool_opts for the non BUNDLE case in Makefile.am
openldap ldapsearch returns empty line at end of LDIF output
have to use LDAP_OPT_X_TLS_NEVER to defeat cert hostname checking
openldap_read_function needs to set EWOULDBLOCK if the buffer is empty
do not terminate unwrapped LDIF line with another newline
slapi_ldap_url_parse must handle multiple host:port in url
convert mozldap host list to openldap uri list
move the out pointer back if continuation lines were removed
check src < *out only; only check for \nspace if src < *out - 2
use slapi_ldap_url_parse in the acl code
do not un-null-terminate normalized DN until new url is constructed
implement slapi_ldap_explode_dn and slapi_ldap_explode_rdn
use slapi_pblock_set to set the ldap result code for the be postop plugins
pass the string copy to slapi_dn_normalize_original
bug 614511 - fix coverity null reference - revert macro aci $dn logic
fix compiler warnings - unused vars/funcs, invalid casts
use slapi_mods_init_passin/get_ldapmods_passout if modifying the smods
Have to explicitly set protocol version to 3
Only check modrdn ops for backend/suffix correctness if not the default backend
Bug 634561 - Server crushes when using Windows Sync Agreement
openldap ber_init will assert if the bv->bv_val is NULL
add the account policy plugin and related server code, schema, and config
fix pblock memory leak
do not register pre/post op plugins if disabled
add support for global inactivity limit
fix typos in Makefile.am, acctpolicy schema
bump version to 1.2.7.a2
remove extra format argument; use %lu for size_t printf format
Bug 644013 - uniqueness plugin segfault bug
bump version to 1.2.7.a3
bump to 1.2.7.a4
bump version to 1.2.7.a5
put replication config entries in separate file
bump version to 1.2.7.a6
bump version to 1.2.7.1
bump version to 1.2.7.2
bump version to 1.2.7.3
bump version to 1.2.7.4
Bug 515329 - Multiple mods in one operation can result in an inconsistent replica
bump version to 1.2.8.a1
Bug 642046 - Segfault when using SASL/GSSAPI multimaster replication, possible krb5_creds doublefree
Bug 624485 - setup dsktune check step should default to "yes" if no problems found
Bug 622907 - support piped passwords to perl-based maintenance commands
Bug 624485 - setup dsktune check step should default to "yes" if no problems found
Bug 576534 - Password displayed on console when entered in command-line utilities
Bug 667935 - DS pipe log script's logregex.py plugin is not redirecting the log output to the text file
bump version to 1.2.8.a2
Bug 668385 - DS pipe log script is executed as many times as the dirsrv service is restarted
Bug 676689 - crash while adding a new user to be synced to windows
Bug 675113 - ns-slapd core dump in windows_tot_run if oneway sync is used
Bug 677440 - clean up compiler warnings in 389-ds-base 1.2.8
Bug 677774 - DS fails to start after reboot
Bug 666076 - dirsrv crash (1.2.7.5) with multiple simple paged result searches
Bug 675320 - empty modify operation with repl on or lastmod off will crash server
bump version to 1.2.9.a1 - console version to 1.2.4
Bug 677705 - ds-logpipe.py script is failing to validate "-s" and "--serverpid" options with "-t".
Bug 676655 - winsync stops working after server restart
Bug 680555 - ns-slapd segfaults if I have more than 100 DBs
Bug 514190 - setup-ds-admin.pl --debug does not log to file
Bug 518890 - setup-ds-admin.pl - improve hostname validation
Bug 644784 - Memory leak in "testbind.c" plugin
Bug 683250 - slapd crashing when traffic replayed
Bug 690584 - #10691 ldbm_back_init() - fix coverity resource leak issues
Bug 690584 - #10690 #10689 attrcrypt_get_ssl_cert_name() - fix coverity resource leak issues
Bug 690584 - #10688 - dblayer_make_env - fix coverity resource leak issues
Bug 690584 - #10669 #10668 cl5ImportLDIF - fix coverity resource leak issues
Bug 690584 - #10658 linked_attrs_pre_op - fix coverity resource leak issues
Bug 690584 - #10655 acllas__handle_group_entry - fix coverity resource leak issues
Bug 690584 - #10654 #10653 str2entry_dupcheck - fix coverity resource leak issues
Bug 690584 - #10652 #10651 #10650 #10649 #10648 #10647 send_specific_attrs send_all_attrs - fix coverity resource leak issues
Bug 690584 - #10643 hash_rootpw - fix coverity resource leak issues
Bug 690584 - #10641 reslimit_bv2int - fix coverity resource leak issues
Bug 691422 - sdt_destroy - fix coverity control flow issues
Bug 691422 - ldbm_back_upgradedb - fix coverity control flow issues
Bug 691422 - csnplFree - fix coverity control flow issues
Bug 691422 - SetUnicodeStringFromUTF_8 - fix coverity control flow issues
Bug 691422 - cl5DeleteRUV - fix coverity control flow issues
Bug 691422 - acl_read_access_allowed_on_entry - fix coverity control flow issues
Bug 691422 - search_internal_callback_pb - fix coverity control flow issues
Bug 691422 - cl5WriteRUV - fix coverity control flow issues
Bug 691422 - windows_replay_update - fix coverity control flow issues
Bug 690584 - #10691 ldbm_back_init() - fix coverity resource leak issues
Bug 690584 - #10652 #10651 #10650 #10649 #10648 #10647 send_specific_attrs send_all_attrs - fix coverity resource leak issues
Bug 668385 - DS pipe log script is executed as many times as the dirsrv service is restarted
Bug 692937 - Replica install fails after step for "enable GSSAPI for replication"
Bug 692331 - Segfault on index update during full replication push on 1.2.7.5
Bug 693451 - cannot use localized matching rules
Bug 693455 - nsMatchingRule does not work with multiple values
Bug 693503 - matching rules do not inherit from superior attribute type
Bug 693466 - Unable to change schema online
Bug 692991 - rhds82 - windows_tot_run: failed to obtain data to send to the consumer; LDAP error - -1
Bug 693473 - rhds82 rfe - windows_tot_run to log Sizelimit exceeded instead of LDAP error - -1
Bug 693962 - Full replica push loses some entries with multi-valued RDNs
Bug 694336 - Group sync hangs Windows initial Sync
Bug 700145 - userpasswd not replicating
Bug 703990 - Support upgrade from Red Hat Directory Server
bump console version to 1.2.5
Bug 703990 - Support upgrade from Red Hat Directory Server
Bug 703990 - Support upgrade from Red Hat Directory Server
Bug 707015 - Cannot disable SSLv3 and use TLS only
bump version to 1.2.9.a2
Bug 707384 - only allow FIPS approved cipher suites in FIPS mode
Bug 711906 - ns-slapd segfaults using suffix referrals
Bug 706209 - LEGAL: RHEL6.1 License issue for 389-ds-base package
Bug 703703 - setup-ds-admin.pl asks for legal agreement to a non-existant file
Bug 711679 - unresponsive LDAP service when deleting vlv on replica
bump console version to 1.2.6
Bug 697694 - rhds82 - incr update state stop_fatal_error "requires administrator action", with extop_result: 9
Bug 716980 - winsync uses old AD entry if new one not found
add support for ldif files with changetype: add
writing Inf file shows SchemaFile = ARRAY(0xhexnum)
look for separate openldap ldif library
bump version to 1.2.9.a3
Bug 709468 - RSA Authentication Server timeouts when using simple paged results on RHDS 8.2.
Bug 720059 - RDN with % can cause crashes or missing entries
bump version to 1.2.9.0
Bug 725542 - Instance upgrade fails when upgrading 389-ds-base package
Bug 725953 - Winsync: DS entries fail to sync to AD, if the User's CN entry contains a comma
Bug 723937 - replication failing on RUV errors
bump version to 1.2.9.1
Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error
bump version to 1.2.9.2
Bug 727511 - ldclt SSL search requests are failing with "illegal error numbe
bump version to 1.2.9.3
Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error
bump version to 1.2.9.4
Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error
bump version to 1.2.9.5
Bug 729378 - delete user subtree container in AD + modify password in DS == DS crash
Bug 723937 - replication failing on RUV errors
Bug 729369 - upgrade DB to upgrade from entrydn to entryrdn format is not working.
make sure the DBVERSION file ends in a newline
bump version to 1.2.10.a1
Bug 633803 - passwordisglobalpolicy attribute brakes TLS chaining
Bug 733103 - large targetattr list with syntax errors cause server to crash or hang
Bug 703990 - cross-platform - Support upgrade from Red Hat Directory Server
Bug 735121 - simple paged search + ip/dns based ACI hangs server
Bug 695736 - Providing native systemd file for upcoming F15 Feature Systemd
Bug 590826 - Reloading database from ldif causes changelog to emit "data no longer matches" errors
Bug 736712 - Modifying ruv entry deadlocks server
Add support for pre/post db transaction plugins
Make all backend operations transaction aware
Bug 741744 - MOD operations with chained delete/add get back error 53 on backend config
Bug 742324 - allow nsslapd-idlistscanlimit to be set dynamically and per-user
Bug 741744 - part2 - MOD operations with chained delete/add get back error 53 on backend config
Bug 740942 - allow resource limits to be set for paged searches independently of limits for other searches/operations
bump version to 1.2.10.a2
bump version to 1.2.10.a3
fix transaction support in ldbm_delete
bump version to 1.2.10.a4
set the ENTRY_POST_OP for modrdn betxnpostoperation plugins
pass the plugin config entry to the plugin init function
make memberof transaction aware and able to be a betxnpostoperation plugin
Bug 741744 - part3 - MOD operations with chained delete/add get back error 53
bump version to 1.2.10.a5
Change referential integrity to be a betxnpostoperation plugin
Use new PLUGIN_CONFIG_ENTRY feature to allow switching between txn and regular
Bug 748575 - rhds81 modrn operation and 100% cpu use in replication
Bug 748575 - part 2 - rhds81 modrdn operation and 100% cpu use in replication
Bug 751495 - 'setup-ds.pl -u' fails with undefined routine 'updateSystemD'
bump version to 1.2.10.a6
Bug 751645 - crash when simple paged fails to send entry to client
csn_as_string - use slapi_uN_to_hex instead of sprintf
uniqueid formatting - use slapi_u8_to_hex instead of sprintf
fix member variable name error in slapi_uniqueIDFormat
reduce calls to csn_as_string and slapi_log_error
csn_init_as_string should not use sscanf
use slapi_hexchar2int and slapi_str_to_u8 everywhere
Bug 755754 - Unable to start dirsrv service using systemd
Bug 755725 - 389 programs linked against openldap crash during shutdown
Ticket 1 - pre-normalize filter and pre-compile substring regex - and other optimizations
Ticket #162 - Infinite loop / spin inside strcmpi_fast, acl_read_access_allowed_on_attr, server DoS
bak2db gets stuck in infinite loop
Ticket #256 - debug build assertion in ACL_EvalDestroy()
bump version to 1.2.10.a7
Ticket #167 - Mixing transaction and non-transaction plugins can cause deadlock
fix mep sdn compiler warnings
add a hack to disable sasl hostname canonicalization - helps with testing when you don't want to set up correct host name resolution and/or cannot set the default system hostname
Ticket #12 - 389 DS DNA Plugin / Replication failing on GSSAPI
Ticket #257 - repl-monitor doesn't work if leftmost hostnames are the same
fix recent compiler warnings
Ticket #15 - Get rid of rwlock.h/rwlock.c and just use slapi_rwlock instead
fix compiler warnings
Remove redundant code - make a global into a static
Ticket #262 - pid file not removed with systemd
fix mozldap build issues
Ticket #264 - upgrade needs better check for "server is running"
Ticket #263 - add systemd include directive
bump version to 1.2.10.rc1
change version to 1.2.10.a8
Ticket #272 - add tombstonenumsubordinates to schema
bump version to 1.2.10.rc1
Ticket #161 - Review and address latest Coverity issues
Ticket #22 - RFE: Support sendmail LDAP routing schema
Ticket #29 - Samba3-schema is missing sambaTrustedDomainPassword
Ticket #273 - ruv tombstone searches don't work after reindex entryrdn
Ticket #273 - ruv tombstone searches don't work after reindex entryrdn
fix a couple of minor coverity issues
Ticket #87 - Manpages fixes
Ticket #13 - slapd process exits when put the database on read only mode while updates are coming to the server
Ticket #55 - Limit of 1024 characters for nsMatchingRule
Ticket #277 - cannot set repl referrals or state
Ticket #278 - Schema replication update failed: Invalid syntax
Ticket #277 - cannot set repl referrals or state
Ticket #279 - filter normalization does not use matching rules
Ticket #280 - extensible binary filters do not work
Ticket #281 - TLS not working with latest openldap
coverity 12488 Resource leak In attr_index_config(): Leak of memory or pointers to system resources
bump version to 1.2.10.rc2
fix compiler warning in acct policy plugin
bump version to 1.2.11.a1
Ticket #294 - 389 DS Segfaults during replica install in FreeIPA
coverity uninit var and resource leak
Revert "Ticket #111 - ability to control behavior of modifyTimestamp/modifiersName"
Revert "Ticket #167 - Mixing transaction and non-transaction plugins can cause deadlock"
Revert "Change referential integrity to be a betxnpostoperation plugin"
Revert "make memberof transaction aware and able to be a betxnpostoperation plugin"
Revert "pass the plugin config entry to the plugin init function"
coverity 12559 Uninitialized pointer read In ldbm_back_modify(): Reads an uninitialized pointer or its target
Ticket #281 - TLS not working with latest openldap
Trac Ticket #298 - crash when replicating orphaned tombstone entry
Ticket #301 - implement transaction support using thread local storage
init txn thread private data for all database modes
handle null smods
memleak in mep_parse_config_entry
memleak in normalize_mods2bvals
destroy the entry cache and dn cache in the dse post op delete callback
Ticket #289 - allow betxn plugin config changes
coverity 12563 Read from pointer after free
Ticket 317 - RHDS fractional replication with excluded password policy attributes leads to wrong error messages.
Ticket #305 - Certain CMP operations hang or cause ns-slapd to crash
Ticket #320 - allow most plugins to be betxn plugins
Ticket #324 - Sync with group attribute containing () fails
Ticket #324 - redux: Sync with group attribute containing () fails
Ticket #316 and Ticket #70 - add post add/mod and AD add callback hooks
Ticket #261 - Add Solaris i386
Ticket #331 - transaction errors with db 4.3 and db 4.2
schema def must have DESC '' - close paren must be preceded by space
Ticket #336 - [abrt] 389-ds-base-1.2.10.4-2.fc16: index_range_read_ext: Process /usr/sbin/ns-slapd was killed by signal 11 (SIGSEGV)
Ticket #336 - [abrt] 389-ds-base-1.2.10.4-2.fc16: index_range_read_ext: Process /usr/sbin/ns-slapd was killed by signal 11 (SIGSEGV)
Ticket #347 - IPA dirsvr seg-fault during system longevity test
Ticket #348 - crash in ldap_initialize with multiple threads
Ticket #351 - use betxn plugins by default
Ticket #353 - coverity 12625-12629 - leaks, dead code, unchecked return
Ticket #348 - crash in ldap_initialize with multiple threads
Ticket #351 - use betxn plugins by default
bump version to 1.3.0.a1
Ticket #358 - managed entry doesn't delete linked entry
Trac Ticket #359 - Database RUV could mismatch the one in changelog under the stress
console .2 is still compatible with 389 .3 for now
Ticket #321 - krbExtraData is being null modified and replicated on each ssh login
Ticket #360 - ldapmodify returns Operations error
Ticket #382 - DS Shuts down intermittently
Ticket #383 - usn + mmr = deletions are not replicated
Ticket #389 - ADD operations not in audit log
Ticket #360 - ldapmodify returns Operations error - fix delete caching
fix coverity issues with uninit vals, no return checking
Ticket #360 - ldapmodify returns Operations error - fix delete caching
improve txn test index handling
Ticket #387 - managed entry sometimes doesn't delete the managed entry
Ticket #387 - managed entry sometimes doesn't delete the managed entry
Ticket 378 - unhashed#user#password visible after changing password
Ticket #405 - referint modrdn not working if case is different
Ticket #406 - Impossible to rename entry (modrdn) with Attribute Uniqueness plugin enabled
Ticket #410 - Referential integrity plug-in does not work when update interval is not zero
Ticket #425 - support multiple winsync plugins
Ticket #430 - server to server ssl client auth broken with latest openldap
Ticket #426 - support posix schema for user and group sync
coverity - mbo dead code - winsync leaks, deadcode, null check, test code
Ticket #355 - winsync should not delete entry that appears to be out of scope
Ticket #440 - periodic dirsync timed event causes server to loop repeatedly
fix mem leaks with parent dn log message, setting winsync windows domain
coverity - posix winsync mem leaks, null check, deadcode, null ref, use after free
fix coverity resource leak in windows_plugin_add
Ticket #426 - support posix schema for user and group sync
Ticket #374 - consumer can go into total update mode for no reason
Ticket #461 - fix build problem with mozldap c sdk
Ticket #462 - add test for include file mntent.h
Ticket #463 - different parameters of getmntent in Solaris
add eclipse generated files to the ignore list
fix compiler warnings in ticket 374 code
Ticket #491 - multimaster_extop_cleanruv returns wrong error codes
minor fixes for bdb 4.2/4.3 and mozldap
Ticket #322 - Create DOAP description for the 389 Directory Server project
Ticket #508 - part 1 - lock-free access to FrontendConfig structure
Ticket #508 - part 2 - lock-free access to FrontendConfig structure
Ticket #612 - improve dbgen rdn generation, output
Ticket #613 - ldclt: add timestamp, interval, nozeropad, other improvements
Ticket #47299 - allow cmdline scripts to work with non-root user
Ticket #47302 - get rid of sbindir start/stop/restart slapd scripts
Ticket #47303 - start/stop/restart dirsrv scripts should report and error if no instances
Ticket #47302 - get rid of sbindir start/stop/restart slapd scripts
Ticket #565 - turbo mode and replication - allow disable of turbo mode
Ticket #633 - allow nsslapd-nagle to be disabled, and also tcp cork
Ticket #613 - ldclt: add timestamp, interval, nozeropad, other improvements
Ticket #47312 - replace PR_GetFileInfo with PR_GetFileInfo64
Ticket #574 - problems with dbcachesize disk space calculation
Ticket #47312 - replace PR_GetFileInfo with PR_GetFileInfo64
Ticket #514 - investigate connection locking
Ticket #513 - recycle operation pblocks
Ticket #47319 - make connection buffer size adjustable
Ticket #47320 - put conn on work_q not poll list if conn has buffered more_data
Ticket #47299 - allow cmdline scripts to work with non-root user
Ticket #47336 - logconv.pl -m not working for all stats
Ticket #47341 - logconv.pl -m time calculation is wrong
Ticket #47348 - add etimes to per second/minute stats
Ticket #47349 - DS instance crashes under a high load
Ticket #47362 - ipa upgrade selinuxusermap data not replicating
Ticket #47359 - new ldap connections can block ldaps and ldapi connections
Ticket #47359 - new ldap connections can block ldaps and ldapi connections
Ticket #47359 - new ldap connections can block ldaps and ldapi connections
Ticket #47378 - fix recent compiler warnings
Ticket #47387 - improve logconv.pl performance with large access logs
Ticket #47377 - make listen backlog size configurable
Ticket #47375 - flush_ber error sending back start_tls response will deadlock
Ticket #47409 - allow setting db deadlock rejection policy
Ticket #47409 - allow setting db deadlock rejection policy
Ticket #47409 - allow setting db deadlock rejection policy
Ticket #47387 - improve logconv.pl performance with large access logs
Ticket #47410 - changelog db deadlocks with DNA and replication
Ticket #47392 - ldbm errors when adding/modifying/deleting entries
Ticket 47427 - Overflow in nsslapd-disk-monitoring-threshold
Ticket #47424 - Replication problem with add-delete requests on single-valued attributes
Ticket 47427 - Overflow in nsslapd-disk-monitoring-threshold
Ticket #47448 - Segfault in 389-ds-base-1.3.1.4-1.fc19 when setting up FreeIPA replication
Ticket #47455 - valgrind - value mem leaks, uninit mem usage
Ticket #47456 - delete present values should append values to deleted values
fix coverity 11895 - null deref - caused by fix to ticket 47392
fix coverity 11915 - dead code - introduced with fix for ticket 346
Ticket #47455 - valgrind - value mem leaks, uninit mem usage
Bug 999634 - ns-slapd crash due to bogus DN
Ticket #47455 - valgrind - value mem leaks, uninit mem usage
Ticket #47516 replication stops with excessive clock skew
Ticket #47504 idlistscanlimit per index/type/value
Ticket #47504 idlistscanlimit per index/type/value
Ticket #47504 idlistscanlimit per index/type/value
Ticket #47501 logconv.pl uses /var/tmp for BDB temp files
Ticket 47533 logconv: some stats do not work across server restarts
Ticket #47515 Fedora 20: setup-ds-admin.pl
Ticket #47551 logconv: -V does not produce unindexed search report
bump autoconf to 2.69, automake to 1.13.4, libtool to 2.4.2
ticket #47550 wip
Ticket #47550 logconv: failed logins: Use of uninitialized value in numeric comparison at logconv.pl line 949
Ticket #47559 hung server - related to sasl and initialize
Ticket #47585 Replication Failures related to skipped entries due to cleaned rids
Revert "Ticket #47559 hung server - related to sasl and initialize"
Ticket #47596 attrcrypt fails to find unlocked key
Ticket #47605 CVE-2013-4485: DoS due to improper handling of ger attr searches
bump version to 1.3.3.a1
Ticket #381 Recognize compressed log files
Ticket 47599 - Reduce lock scope in retro changelog plug-in
bump version to 1.3.3.a2
Ticket #47596 attrcrypt fails to find unlocked key
Ticket #47623 fix memleak caused by 47347
Ticket #47623 fix memleak caused by 47347
Ticket #47631 objectclass may, must lists skip rest of objectclass once first is found in sup
Ticket #47645 reset stack, op fields to NULL - clean up stacks at shutdown - free unused plugin config entries
Ticket #47634 support AttributeTypeDescription USAGE userApplications distributedOperation dSAOperation
Ticket #47647 remove bogus definition in 60rfc3712.ldif
Ticket #47657 add schema test suite and tests for Ticket #47634
Ticket #47675 logconv errors when search has invalid bind dn
Ticket #47516 replication stops with excessive clock skew
Ticket #47374 - flush.pl is not included in perl5
Ticket #471 logconv.pl tool removes the access logs contents if "-M" is not correctly used
Ticket #47692 single valued attribute replicated ADD does not work
Ticket #47773 - mem leak in do_bind when there is an error
Ticket #47774 mem leak in do_search - rawbase not freed upon certain errors
Ticket #47772 empty modify returns LDAP_INVALID_DN_SYNTAX
Ticket #47772 empty modify returns LDAP_INVALID_DN_SYNTAX
Ticket #47831 - server restart wipes out index config if there is a default index
Ticket #47692 single valued attribute replicated ADD does not work
Ticket 47446 - logconv.pl memory continually grows
Ticket #47892 coverity defects found in 1.3.3.1
support nunc-stans for basic accept and read events
get rid of lfds - use nunc-stans/ subdir for nunc-stans headers
Ticket #48122 nunc-stans FD leak
fix compiler warnings when using nunc-stans
Ticket #48178 add config param to enable nunc-stans
Revert "Ticket #48178 add config param to enable nunc-stans"
Ticket #48178 add config param to enable nunc-stans
Ticket #48122 nunc-stans FD leak
fix build with nunc-stans
fix MEMPOOL_EXPERIMENTAL build
Ticket #48224 - logconv.pl should handle *.tar.xz, *.txz, *.xz log files
Ticket #48224 - redux - logconv.pl should handle *.tar.xz, *.txz, *.xz log files
Ticket #48224 - redux - logconv.pl should handle *.tar.xz, *.txz, *.xz log files
Ticket #48224 - redux 2 - logconv.pl should handle *.tar.xz, *.txz, *.xz log files
Ticket #48227 rpm.mk doesn't build srpms for 389-ds and nunc-stans
Simo Sorce (1):
Ticket #48188 - segfault in ns-slapd due to accessing Slapi_DN freed in pre bind plug-in
Simon Pichugin (6):
Ticket #47569 - Added a testcase to ACL testsuite
Ticket 48251 - Improve the basic test suite
Ticket 47761 - Added a few testcases to the basic testsuite
Ticket #47553 - Automated the verification procedure
Ticket 48264 - Ticket 47553 tests refactoring
Ticket 47957 - Add replication test suite for a wait async feature
Stanislav Zidek (1):
Ticket #48289 - 389-ds-base: ldclt-bin killed by SIGSEGV
Thierry Bordaz (9):
CVE-2015-1854 389ds-base: access control bypass with modrdn
Ticket 47927: Uniqueness plugin: should allow to exclude some subtrees from its scope
Ticket 47833: TEST CASE only (modrdn fails if renamed entry member of a group and is out of memberof scope)
Ticket 48249: sync_repl uuid may be invalid
Ticket 48266: Fractional replication evaluates several times the same CSN
Ticket 48266: coverity issue
Ticket 47978: Deadlock between two MODs on the same entry between entry cache and backend lock
Ticket 47976: deadlock in mep delete post op
Ticket 48362: With exhausted range, part of DNA shared configuration is deleted after server restart
Thierry bordaz (tbordaz) (60):
Ticket #487 - Possible to add invalid attribute values to PAM PTA plugin configuration
Ticket 600 - Server should return unavailableCriticalExtension when processing a badly formed critical control
Ticket 616 - High contention on computed attribute lock
Ticket 618 - Crash at shutdown while stopping replica agreements
Ticket 512 - improve performance of vattr code
Ticket 205 - snmp counters index strings for multiple network interfaces with ip addr and tcp port pairs
Ticket 47325 - Crash at shutdown on a replica aggrement
Ticket 47331 - Self entry access ACI not working properly
Ticket 47361 - Empty control list causes LDAP protocol error is thrown
Ticket 47354 - Indexed search are logged with 'notes=U' in the access logs
Ticket 47350 - Allow search to look up 'in memory RUV'
Compilation warnings (ticket 47350)
Ticket 47350 - (Cont.) Allow search to look up 'in memory RUV'
Ticket 564 - Is ldbm_txn_ruv_modify_context still required
Ticket 47393 - Attribute are not encrypted on a consumer after a full initialization
Ticket 208 - [RFE] Roles with explicit scoping in RHDS
Ticket 47433 - With SeLinux, setup-ds.pl and setup-ds-admin.pl fail to detect already ranged labelled ports
Ticket 512 - improve performance of vattr code
Ticket 47489 - Under specific values of nsDS5ReplicaName, replication may get broken or updates missing
Ticket 47490 - Schema replication between DS versions may overwrite newer base schema
Ticket 47398 - memberOf on a user is converted to lowercase
Ticket 47560: fixup memberof task does not work: task entry not added
Ticket 47586 - CI tests: test case for 47490
Ticket 47586 - CI tests: follow up
Ticket 47586 - Need to rebind after a stop (fix to run direct python script)
Ticket 47575 - CI test: add test case for ticket47560
Ticket 47628: port testcases to new DirSrv interface
Ticket 47651 - Finaliser to remove instances backups
Ticket 47668 - test: port ticket47490_test to Replica/Agreement interface (47600)
Ticket 47653 - Need a way to allow users to create entries assigned to themselves.
Ticket 47676 : Replication of the schema fails 'master branch' -> 1.2.11 or 1.3.1
Ticket 47676 : (cont.) Replication of the schema fails 'master branch' -> 1.2.11 or 1.3.1
Ticket 47573: schema push can be erronously prevented
Update test cases due to new modules: Schema, tasks, plugins and index
Ticket 47619: cannot reindex retrochangelog
Ticket 47699: Propagate plugin precedence to all registered function types
Ticket 47553: Enhance ACIs to have more control over MODRDN operations
Ticket 47721 - Schema Replication Issue
Ticket 47721 - Schema Replication Issue (follow up + cleanup)
Ticket 47721 - Schema Replication Issue (follow up)
Ticket 47787 - A replicated MOD fails (Unwilling to perform) if it targets a tombstone
Ticket 47808 - If be_txn plugin fails in ldbm_back_add, adding entry is double freed
Ticket 47815 - Add operations rejected by betxn plugins remain in cache
Ticket 47829: memberof scope: allow to exclude subtrees
Ticket 47823 - attribute uniqueness enforced on all subtrees
Ticket 47797 - DB deadlock when two threads (on separated backend) try to record changes in retroCL
Ticket 47797 - fix the indentation
Ticket 47871 - 389-ds-base-1.3.2.21-1.fc20 crashed over the weekend
Ticket 47889 - DS crashed during ipa-server-install on test_ava_filter
Ticket 47787: Make the test case more robust
Ticket 47920: Encoding of SearchResultEntry is missing tag
Ticket 47553: Enhance ACIs to have more control over MODRDN operations
Ticket 47490 - test case failing if 47721 is also fixed
Ticket 47942: DS hangs during online total update
Ticket 47901: After total init, nsds5replicaLastInitStatus can report an erroneous error status (like 'Referral')
Ticket 47988: Schema learning mechanism, in replication, unable to extend an existing definition
Ticket 47988: test case
Ticket 47828: DNA scope: allow to exlude some subtrees
Ticket 47936: Create a global lock to serialize write operations over several backends
Ticket 48127: Using RPM, allows non root user to create/remove DS instance
William B (1):
Ticket #48026 - Support for uniqueness plugin to enforce uniqueness on a set of attributes.
William Brown (2):
Ticket 48311 -nunc-stans: Attempt to release connection that is not acquired
Ticket 48332 - allow users to specify to relax the FQDN constraint
William E Brown (1):
Tests to support ticket 48026
amsharma (1):
Author: amsharma <amsharma(a)redhat.com> Date: Thu Aug 6 14:47:01 2015 +0530
nturpin (1):
Ticket #3: acl cache overflown problem
root (4):
Bug 480787 - Autoconf parameter --with and --without
Ticket #326 - MemberOf plugin should work on all backends
Ticket #337 - RFE - Improve CLEANRUV functionality
Ticket #216 - RFE - Disable replication agreements
---
.gitignore | 5
389-doap.rdf | 47
EXCEPTION | 16
LICENSE | 52
LICENSE.GPLv2 | 340
LICENSE.GPLv3+ | 674
LICENSE.openssl | 11
Makefile.am | 436
Makefile.in | 8393 +-
README | 11
VERSION.sh | 18
aclocal.m4 | 7490 -
autogen.sh | 108
buildnum.pl | 35
compile | 245
config.guess | 763
config.h.in | 46
config.sub | 443
configure |40564 ++++------
configure.ac | 293
depcomp | 637
dirsrv.pc.in | 7
dirsrvtests/cmd/dsadm/dsadm.py | 543
dirsrvtests/create_test.py | 669
dirsrvtests/data/README | 11
dirsrvtests/data/basic/dse.ldif.broken | 95
dirsrvtests/data/ticket47953/ticket47953.ldif | 27
dirsrvtests/data/ticket47988/schema_ipa3.3.tar.gz |binary
dirsrvtests/data/ticket47988/schema_ipa4.1.tar.gz |binary
dirsrvtests/data/ticket48212/example1k_posix.ldif |17017 ++++
dirsrvtests/suites/acct_usability_plugin/acct_usability_test.py | 93
dirsrvtests/suites/acctpolicy_plugin/acctpolicy_test.py | 93
dirsrvtests/suites/acl/acl_test.py | 1059
dirsrvtests/suites/attr_encryption/attr_encrypt_test.py | 93
dirsrvtests/suites/attr_uniqueness_plugin/attr_uniqueness_test.py | 248
dirsrvtests/suites/automember_plugin/automember_test.py | 93
dirsrvtests/suites/basic/basic_test.py | 775
dirsrvtests/suites/betxns/betxn_test.py | 258
dirsrvtests/suites/chaining_plugin/chaining_test.py | 93
dirsrvtests/suites/clu/clu_test.py | 115
dirsrvtests/suites/clu/db2ldif_test.py | 92
dirsrvtests/suites/collation_plugin/collatation_test.py | 93
dirsrvtests/suites/config/config_test.py | 198
dirsrvtests/suites/cos_plugin/cos_test.py | 93
dirsrvtests/suites/deref_plugin/deref_test.py | 93
dirsrvtests/suites/disk_monitoring/disk_monitor_test.py | 93
dirsrvtests/suites/distrib_plugin/distrib_test.py | 93
dirsrvtests/suites/dna_plugin/dna_test.py | 93
dirsrvtests/suites/ds_logs/ds_logs_test.py | 93
dirsrvtests/suites/dynamic-plugins/plugin_tests.py | 2406
dirsrvtests/suites/dynamic-plugins/stress_tests.py | 146
dirsrvtests/suites/dynamic-plugins/test_dynamic_plugins.py | 493
dirsrvtests/suites/filter/filter_test.py | 152
dirsrvtests/suites/get_effective_rights/ger_test.py | 93
dirsrvtests/suites/ldapi/ldapi_test.py | 93
dirsrvtests/suites/linkedattrs_plugin/linked_attrs_test.py | 93
dirsrvtests/suites/mapping_tree/mapping_tree_test.py | 93
dirsrvtests/suites/memberof_plugin/memberof_test.py | 176
dirsrvtests/suites/memory_leaks/range_search_test.py | 138
dirsrvtests/suites/mep_plugin/mep_test.py | 93
dirsrvtests/suites/monitor/monitor_test.py | 93
dirsrvtests/suites/paged_results/paged_results_test.py | 93
dirsrvtests/suites/pam_passthru_plugin/pam_test.py | 93
dirsrvtests/suites/passthru_plugin/passthru_test.py | 93
dirsrvtests/suites/password/password_test.py | 143
dirsrvtests/suites/password/pwdAdmin_test.py | 447
dirsrvtests/suites/password/pwdPolicy_test.py | 82
dirsrvtests/suites/posix_winsync_plugin/posix_winsync_test.py | 93
dirsrvtests/suites/psearch/psearch_test.py | 93
dirsrvtests/suites/referint_plugin/referint_test.py | 93
dirsrvtests/suites/replication/cleanallruv_test.py | 1494
dirsrvtests/suites/replication/wait_for_async_feature_test.py | 280
dirsrvtests/suites/replsync_plugin/repl_sync_test.py | 93
dirsrvtests/suites/resource_limits/res_limits_test.py | 93
dirsrvtests/suites/retrocl_plugin/retrocl_test.py | 93
dirsrvtests/suites/reverpwd_plugin/reverpwd_test.py | 93
dirsrvtests/suites/roles_plugin/roles_test.py | 93
dirsrvtests/suites/rootdn_plugin/rootdn_plugin_test.py | 778
dirsrvtests/suites/sasl/sasl_test.py | 93
dirsrvtests/suites/schema/test_schema.py | 228
dirsrvtests/suites/schema_reload_plugin/schema_reload_test.py | 93
dirsrvtests/suites/snmp/snmp_test.py | 93
dirsrvtests/suites/ssl/ssl_test.py | 93
dirsrvtests/suites/syntax_plugin/syntax_test.py | 93
dirsrvtests/suites/usn_plugin/usn_test.py | 93
dirsrvtests/suites/views_plugin/views_test.py | 93
dirsrvtests/suites/vlv/vlv_test.py | 93
dirsrvtests/suites/whoami_plugin/whoami_test.py | 93
dirsrvtests/tickets/finalizer.py | 64
dirsrvtests/tickets/ticket365_test.py | 169
dirsrvtests/tickets/ticket47313_test.py | 174
dirsrvtests/tickets/ticket47384_test.py | 167
dirsrvtests/tickets/ticket47431_test.py | 259
dirsrvtests/tickets/ticket47462_test.py | 365
dirsrvtests/tickets/ticket47490_test.py | 691
dirsrvtests/tickets/ticket47553_test.py | 166
dirsrvtests/tickets/ticket47560_test.py | 253
dirsrvtests/tickets/ticket47573_test.py | 347
dirsrvtests/tickets/ticket47619_test.py | 220
dirsrvtests/tickets/ticket47640_test.py | 130
dirsrvtests/tickets/ticket47653MMR_test.py | 473
dirsrvtests/tickets/ticket47653_test.py | 381
dirsrvtests/tickets/ticket47664_test.py | 225
dirsrvtests/tickets/ticket47669_test.py | 265
dirsrvtests/tickets/ticket47676_test.py | 406
dirsrvtests/tickets/ticket47714_test.py | 263
dirsrvtests/tickets/ticket47721_test.py | 468
dirsrvtests/tickets/ticket47781_test.py | 188
dirsrvtests/tickets/ticket47787_test.py | 561
dirsrvtests/tickets/ticket47808_test.py | 166
dirsrvtests/tickets/ticket47815_test.py | 179
dirsrvtests/tickets/ticket47819_test.py | 296
dirsrvtests/tickets/ticket47823_test.py | 1021
dirsrvtests/tickets/ticket47824_test.py | 265
dirsrvtests/tickets/ticket47828_test.py | 728
dirsrvtests/tickets/ticket47829_test.py | 656
dirsrvtests/tickets/ticket47833_test.py | 274
dirsrvtests/tickets/ticket47838_test.py | 841
dirsrvtests/tickets/ticket47869MMR_test.py | 346
dirsrvtests/tickets/ticket47871_test.py | 226
dirsrvtests/tickets/ticket47900_test.py | 344
dirsrvtests/tickets/ticket47910_test.py | 205
dirsrvtests/tickets/ticket47920_test.py | 194
dirsrvtests/tickets/ticket47921_test.py | 163
dirsrvtests/tickets/ticket47927_test.py | 313
dirsrvtests/tickets/ticket47931_test.py | 207
dirsrvtests/tickets/ticket47937_test.py | 188
dirsrvtests/tickets/ticket47950_test.py | 223
dirsrvtests/tickets/ticket47953_test.py | 128
dirsrvtests/tickets/ticket47963_test.py | 199
dirsrvtests/tickets/ticket47966_test.py | 227
dirsrvtests/tickets/ticket47970_test.py | 158
dirsrvtests/tickets/ticket47973_test.py | 185
dirsrvtests/tickets/ticket47980_test.py | 662
dirsrvtests/tickets/ticket47981_test.py | 295
dirsrvtests/tickets/ticket47988_test.py | 503
dirsrvtests/tickets/ticket48005_test.py | 415
dirsrvtests/tickets/ticket48013_test.py | 134
dirsrvtests/tickets/ticket48026_test.py | 168
dirsrvtests/tickets/ticket48109_test.py | 394
dirsrvtests/tickets/ticket48170_test.py | 96
dirsrvtests/tickets/ticket48191_test.py | 323
dirsrvtests/tickets/ticket48194_test.py | 499
dirsrvtests/tickets/ticket48212_test.py | 210
dirsrvtests/tickets/ticket48214_test.py | 171
dirsrvtests/tickets/ticket48226_test.py | 249
dirsrvtests/tickets/ticket48228_test.py | 336
dirsrvtests/tickets/ticket48233_test.py | 105
dirsrvtests/tickets/ticket48252_test.py | 178
dirsrvtests/tickets/ticket48265_test.py | 130
dirsrvtests/tickets/ticket48312_test.py | 168
dirsrvtests/tickets/ticket48325_test.py | 270
dirsrvtests/tickets/ticket48362_test.py | 278
dirsrvtests/tickets/ticket48369_test.py | 124
dirsrvtests/tickets/ticket48370_test.py | 236
dirsrvtests/tmp/README | 10
include/base/crit.h | 35
include/base/dbtbase.h | 37
include/base/ereport.h | 35
include/base/eventhandler.h | 110
include/base/eventlog.h | 71
include/base/file.h | 67
include/base/fsmutex.h | 39
include/base/lexer.h | 126
include/base/nterr.h | 58
include/base/nterrors.h | 104
include/base/plist.h | 35
include/base/pool.h | 40
include/base/rwlock.h | 91
include/base/shexp.h | 35
include/base/systems.h | 388
include/base/systhr.h | 42
include/base/util.h | 35
include/i18n.h | 156
include/ldaputil/cert.h | 39
include/ldaputil/certmap.h | 35
include/ldaputil/dbconf.h | 39
include/ldaputil/encode.h | 39
include/ldaputil/errors.h | 39
include/ldaputil/extcmap.h | 52
include/ldaputil/init.h | 35
include/ldaputil/ldapauth.h | 39
include/ldaputil/ldaputil.h | 45
include/libaccess/acl.h | 39
include/libaccess/aclerror.h | 48
include/libaccess/acleval.h | 38
include/libaccess/aclglobal.h | 35
include/libaccess/aclproto.h | 60
include/libaccess/aclstruct.h | 37
include/libaccess/attrec.h | 35
include/libaccess/authdb.h | 35
include/libaccess/dbtlibaccess.h | 38
include/libaccess/dnfstruct.h | 35
include/libaccess/ipfstruct.h | 35
include/libaccess/las.h | 41
include/libaccess/nsauth.h | 35
include/libaccess/nsautherr.h | 37
include/libaccess/nserror.h | 37
include/libaccess/symbols.h | 47
include/libaccess/userauth.h | 35
include/libaccess/usi.h | 35
include/libaccess/usrcache.h | 35
include/libadmin/dbtlibadmin.h | 35
include/libadmin/libadmin.h | 42
include/netsite.h | 65
include/public/base/systems.h | 189
include/public/netsite.h | 35
include/public/nsacl/aclapi.h | 64
include/public/nsacl/acldef.h | 37
include/public/nsacl/nserrdef.h | 37
include/public/nsacl/plistdef.h | 35
include/public/nsapi.h | 94
install-sh | 538
ldap/admin/src/base-initconfig.in | 44
ldap/admin/src/initconfig.in | 41
ldap/admin/src/logconv.pl | 3661
ldap/admin/src/makemccvlvindexes | 35
ldap/admin/src/makevlvindex | 35
ldap/admin/src/makevlvsearch | 35
ldap/admin/src/scripts/10cleanupldapi.pl | 23
ldap/admin/src/scripts/10fixrundir.pl | 11
ldap/admin/src/scripts/20betxn.pl | 74
ldap/admin/src/scripts/50AES-pbe-plugin.ldif | 16
ldap/admin/src/scripts/50acctusabilityplugin.ldif | 21
ldap/admin/src/scripts/50automemberplugin.ldif | 15
ldap/admin/src/scripts/50contentsync.ldif | 23
ldap/admin/src/scripts/50fixNsState.pl | 240
ldap/admin/src/scripts/50managedentriesplugin.ldif | 16
ldap/admin/src/scripts/50nstombstonecsn.ldif | 7
ldap/admin/src/scripts/50refintprecedence.ldif | 4
ldap/admin/src/scripts/50rootdnaccesscontrolplugin.ldif | 15
ldap/admin/src/scripts/50smd5pwdstorageplugin.ldif | 5
ldap/admin/src/scripts/50targetuniqueid.ldif | 7
ldap/admin/src/scripts/50updateconfig.ldif | 10
ldap/admin/src/scripts/52updateAESplugin.pl | 86
ldap/admin/src/scripts/60upgradeconfigfiles.pl | 69
ldap/admin/src/scripts/60upgradeschemafiles.pl | 2
ldap/admin/src/scripts/70upgradefromldif.pl | 108
ldap/admin/src/scripts/80upgradednformat.pl.in | 307
ldap/admin/src/scripts/81changelog.pl | 34
ldap/admin/src/scripts/82targetuniqueidindex.pl | 52
ldap/admin/src/scripts/90subtreerename.pl | 21
ldap/admin/src/scripts/91subtreereindex.pl | 148
ldap/admin/src/scripts/DSCreate.pm.in | 537
ldap/admin/src/scripts/DSDialogs.pm | 53
ldap/admin/src/scripts/DSMigration.pm.in | 84
ldap/admin/src/scripts/DSSharedLib.in | 223
ldap/admin/src/scripts/DSUpdate.pm.in | 114
ldap/admin/src/scripts/DSUpdateDialogs.pm | 35
ldap/admin/src/scripts/DSUtil.pm.in | 922
ldap/admin/src/scripts/Dialog.pm | 35
ldap/admin/src/scripts/DialogManager.pm | 241
ldap/admin/src/scripts/DialogManager.pm.in | 212
ldap/admin/src/scripts/FileConn.pm | 35
ldap/admin/src/scripts/Inf.pm | 117
ldap/admin/src/scripts/Migration.pm.in | 57
ldap/admin/src/scripts/Resource.pm | 35
ldap/admin/src/scripts/Setup.pm.in | 60
ldap/admin/src/scripts/SetupDialogs.pm.in | 70
ldap/admin/src/scripts/SetupLog.pm | 43
ldap/admin/src/scripts/bak2db.in | 79
ldap/admin/src/scripts/bak2db.pl.in | 120
ldap/admin/src/scripts/cl-dump.pl | 35
ldap/admin/src/scripts/cleanallruv.pl.in | 125
ldap/admin/src/scripts/db2bak.in | 75
ldap/admin/src/scripts/db2bak.pl.in | 149
ldap/admin/src/scripts/db2index.in | 83
ldap/admin/src/scripts/db2index.pl.in | 184
ldap/admin/src/scripts/db2ldif.in | 160
ldap/admin/src/scripts/db2ldif.pl.in | 264
ldap/admin/src/scripts/dbmon.sh | 192
ldap/admin/src/scripts/dbverify.in | 70
ldap/admin/src/scripts/dn2rdn.in | 58
ldap/admin/src/scripts/dnaplugindepends.ldif | 3
ldap/admin/src/scripts/ds-logpipe.py | 253
ldap/admin/src/scripts/dscreate.map.in | 35
ldap/admin/src/scripts/dsorgentries.map.in | 35
ldap/admin/src/scripts/dsupdate.map.in | 35
ldap/admin/src/scripts/exampleupdate.ldif | 37
ldap/admin/src/scripts/exampleupdate.pl | 35
ldap/admin/src/scripts/exampleupdate.sh | 45
ldap/admin/src/scripts/failedbinds.py | 12
ldap/admin/src/scripts/fixup-linkedattrs.pl.in | 111
ldap/admin/src/scripts/fixup-memberof.pl.in | 120
ldap/admin/src/scripts/ldif2db.in | 109
ldap/admin/src/scripts/ldif2db.pl.in | 214
ldap/admin/src/scripts/ldif2ldap.in | 173
ldap/admin/src/scripts/logregex.py | 18
ldap/admin/src/scripts/migrate-ds.pl.in | 48
ldap/admin/src/scripts/monitor.in | 170
ldap/admin/src/scripts/ns-accountstatus.pl.in | 679
ldap/admin/src/scripts/ns-activate.pl.in | 681
ldap/admin/src/scripts/ns-inactivate.pl.in | 683
ldap/admin/src/scripts/ns-newpwpolicy.pl.in | 188
ldap/admin/src/scripts/remove-ds.pl.in | 58
ldap/admin/src/scripts/repl-monitor.pl.in | 817
ldap/admin/src/scripts/restart-dirsrv.in | 28
ldap/admin/src/scripts/restoreconfig.in | 52
ldap/admin/src/scripts/saveconfig.in | 53
ldap/admin/src/scripts/schema-reload.pl.in | 110
ldap/admin/src/scripts/setup-ds.pl.in | 52
ldap/admin/src/scripts/setup-ds.res.in | 43
ldap/admin/src/scripts/start-dirsrv.in | 71
ldap/admin/src/scripts/stop-dirsrv.in | 71
ldap/admin/src/scripts/suffix2instance.in | 58
ldap/admin/src/scripts/syntax-validate.pl.in | 122
ldap/admin/src/scripts/template-bak2db.in | 44
ldap/admin/src/scripts/template-bak2db.pl.in | 140
ldap/admin/src/scripts/template-cleanallruv.pl.in | 28
ldap/admin/src/scripts/template-db2bak.in | 23
ldap/admin/src/scripts/template-db2bak.pl.in | 131
ldap/admin/src/scripts/template-db2index.in | 26
ldap/admin/src/scripts/template-db2index.pl.in | 228
ldap/admin/src/scripts/template-db2ldif.in | 79
ldap/admin/src/scripts/template-db2ldif.pl.in | 275
ldap/admin/src/scripts/template-dbverify.in | 41
ldap/admin/src/scripts/template-dn2rdn.in | 23
ldap/admin/src/scripts/template-fixup-linkedattrs.pl.in | 158
ldap/admin/src/scripts/template-fixup-memberof.pl.in | 169
ldap/admin/src/scripts/template-fixup-memberuid.pl.in | 154
ldap/admin/src/scripts/template-ldif2db.in | 23
ldap/admin/src/scripts/template-ldif2db.pl.in | 230
ldap/admin/src/scripts/template-ldif2ldap.in | 15
ldap/admin/src/scripts/template-monitor.in | 14
ldap/admin/src/scripts/template-ns-accountstatus.pl.in | 846
ldap/admin/src/scripts/template-ns-activate.pl.in | 846
ldap/admin/src/scripts/template-ns-inactivate.pl.in | 846
ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in | 291
ldap/admin/src/scripts/template-restart-slapd.in | 12
ldap/admin/src/scripts/template-restoreconfig.in | 16
ldap/admin/src/scripts/template-saveconfig.in | 17
ldap/admin/src/scripts/template-schema-reload.pl.in | 158
ldap/admin/src/scripts/template-start-slapd.in | 12
ldap/admin/src/scripts/template-stop-slapd.in | 11
ldap/admin/src/scripts/template-suffix2instance.in | 15
ldap/admin/src/scripts/template-syntax-validate.pl.in | 169
ldap/admin/src/scripts/template-upgradedb.in | 17
ldap/admin/src/scripts/template-upgradednformat.in | 5
ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl.in | 185
ldap/admin/src/scripts/template-verify-db.pl.in | 259
ldap/admin/src/scripts/template-vlvindex.in | 16
ldap/admin/src/scripts/upgradedb.in | 59
ldap/admin/src/scripts/upgradednformat.in | 71
ldap/admin/src/scripts/usn-tombstone-cleanup.pl.in | 126
ldap/admin/src/scripts/verify-db.pl.in | 239
ldap/admin/src/scripts/vlvindex.in | 64
ldap/admin/src/slapd.inf.in | 37
ldap/admin/src/template-initconfig.in | 18
ldap/admin/src/upgradeServer | 35
ldap/docs/LICENSE.txt | 132
ldap/docs/README.txt | 11
ldap/include/avl.h | 35
ldap/include/dblayer.h | 35
ldap/include/disptmpl.h | 47
ldap/include/ldaplog.h | 139
ldap/include/ldaprot.h | 35
ldap/include/ldbm.h | 35
ldap/include/lthread.h | 460
ldap/include/ntslapdregparms.h | 78
ldap/include/ntwatchdog.h | 105
ldap/include/portable.h | 35
ldap/include/proto-ntutil.h | 111
ldap/include/regex.h | 39
ldap/include/srchpref.h | 47
ldap/include/sysexits-compat.h | 35
ldap/ldif/50posix-winsync-plugin.ldif | 21
ldap/ldif/50replication-plugins.ldif | 27
ldap/ldif/Ace.ldif | 35
ldap/ldif/European.ldif | 35
ldap/ldif/Eurosuffix.ldif | 35
ldap/ldif/Example-roles.ldif | 35
ldap/ldif/Example-views.ldif | 35
ldap/ldif/Example.ldif | 35
ldap/ldif/template-baseacis.ldif.in | 2
ldap/ldif/template-bitwise.ldif.in | 6
ldap/ldif/template-dnaplugin.ldif.in | 2
ldap/ldif/template-dse.ldif.in | 214
ldap/ldif/template-pampta.ldif.in | 2
ldap/ldif/template-suffix-db.ldif.in | 1
ldap/ldif/template.ldif | 35
ldap/libraries/libavl/avl.c | 48
ldap/libraries/libavl/testavl.c | 38
ldap/schema/00core.ldif | 72
ldap/schema/01core389.ldif | 269
ldap/schema/02common.ldif | 61
ldap/schema/05rfc2927.ldif | 35
ldap/schema/05rfc4523.ldif | 14
ldap/schema/05rfc4524.ldif | 30
ldap/schema/06inetorgperson.ldif | 5
ldap/schema/10automember-plugin.ldif | 94
ldap/schema/10dna-plugin.ldif | 219
ldap/schema/10mep-plugin.ldif | 75
ldap/schema/10presence.ldif | 35
ldap/schema/10rfc2307.ldif | 35
ldap/schema/20subscriber.ldif | 35
ldap/schema/25java-object.ldif | 35
ldap/schema/28pilot.ldif | 35
ldap/schema/30ns-common.ldif | 39
ldap/schema/50ns-admin.ldif | 35
ldap/schema/50ns-certificate.ldif | 35
ldap/schema/50ns-directory.ldif | 39
ldap/schema/50ns-mail.ldif | 45
ldap/schema/50ns-value.ldif | 35
ldap/schema/50ns-web.ldif | 35
ldap/schema/60acctpolicy.ldif | 47
ldap/schema/60nis.ldif | 2
ldap/schema/60pam-plugin.ldif | 38
ldap/schema/60posix-winsync-plugin.ldif | 15
ldap/schema/60qmail.ldif | 24
ldap/schema/60radius.ldif | 132
ldap/schema/60rfc3712.ldif | 9
ldap/schema/60sabayon.ldif | 10
ldap/schema/60samba3.ldif | 36
ldap/schema/60sendmail.ldif | 54
ldap/schema/60sudo.ldif | 58
ldap/schema/99user.ldif | 35
ldap/schema/slapd-collations.conf | 269
ldap/servers/plugins/acct_usability/acct_usability.c | 428
ldap/servers/plugins/acct_usability/acct_usability.h | 34
ldap/servers/plugins/acctpolicy/acct_config.c | 175
ldap/servers/plugins/acctpolicy/acct_init.c | 299
ldap/servers/plugins/acctpolicy/acct_plugin.c | 497
ldap/servers/plugins/acctpolicy/acct_util.c | 277
ldap/servers/plugins/acctpolicy/acctpolicy.h | 98
ldap/servers/plugins/acctpolicy/sampleconfig.ldif | 40
ldap/servers/plugins/acctpolicy/samplepolicy.ldif | 27
ldap/servers/plugins/acl/ACL-Notes | 35
ldap/servers/plugins/acl/acl.c | 1091
ldap/servers/plugins/acl/acl.h | 161
ldap/servers/plugins/acl/acl_ext.c | 325
ldap/servers/plugins/acl/aclanom.c | 120
ldap/servers/plugins/acl/acldllmain.c | 166
ldap/servers/plugins/acl/acleffectiverights.c | 253
ldap/servers/plugins/acl/aclgroup.c | 67
ldap/servers/plugins/acl/aclinit.c | 41
ldap/servers/plugins/acl/acllas.c | 654
ldap/servers/plugins/acl/acllist.c | 239
ldap/servers/plugins/acl/aclparse.c | 993
ldap/servers/plugins/acl/aclplugin.c | 102
ldap/servers/plugins/acl/aclproxy.c | 232
ldap/servers/plugins/acl/aclutil.c | 209
ldap/servers/plugins/acl/libacl.def | 48
ldap/servers/plugins/automember/automember.c | 2738
ldap/servers/plugins/automember/automember.h | 105
ldap/servers/plugins/bitwise/bitwise.c | 58
ldap/servers/plugins/chainingdb/cb.h | 50
ldap/servers/plugins/chainingdb/cb_abandon.c | 35
ldap/servers/plugins/chainingdb/cb_acl.c | 35
ldap/servers/plugins/chainingdb/cb_add.c | 280
ldap/servers/plugins/chainingdb/cb_bind.c | 265
ldap/servers/plugins/chainingdb/cb_cleanup.c | 35
ldap/servers/plugins/chainingdb/cb_close.c | 113
ldap/servers/plugins/chainingdb/cb_compare.c | 139
ldap/servers/plugins/chainingdb/cb_config.c | 256
ldap/servers/plugins/chainingdb/cb_conn_stateless.c | 138
ldap/servers/plugins/chainingdb/cb_controls.c | 87
ldap/servers/plugins/chainingdb/cb_debug.c | 44
ldap/servers/plugins/chainingdb/cb_delete.c | 298
ldap/servers/plugins/chainingdb/cb_init.c | 45
ldap/servers/plugins/chainingdb/cb_instance.c | 681
ldap/servers/plugins/chainingdb/cb_modify.c | 340
ldap/servers/plugins/chainingdb/cb_modrdn.c | 343
ldap/servers/plugins/chainingdb/cb_monitor.c | 41
ldap/servers/plugins/chainingdb/cb_schema.c | 39
ldap/servers/plugins/chainingdb/cb_search.c | 587
ldap/servers/plugins/chainingdb/cb_size.c | 35
ldap/servers/plugins/chainingdb/cb_start.c | 35
ldap/servers/plugins/chainingdb/cb_temp.c | 35
ldap/servers/plugins/chainingdb/cb_test.c | 35
ldap/servers/plugins/chainingdb/cb_unbind.c | 35
ldap/servers/plugins/chainingdb/cb_utils.c | 95
ldap/servers/plugins/chainingdb/cbdllmain.c | 165
ldap/servers/plugins/chainingdb/libcb.def | 47
ldap/servers/plugins/collation/collate.c | 84
ldap/servers/plugins/collation/collate.h | 35
ldap/servers/plugins/collation/collation.def | 42
ldap/servers/plugins/collation/config.c | 37
ldap/servers/plugins/collation/config.h | 35
ldap/servers/plugins/collation/debug.c | 44
ldap/servers/plugins/collation/dllmain.c | 167
ldap/servers/plugins/collation/orfilter.c | 54
ldap/servers/plugins/collation/orfilter.h | 35
ldap/servers/plugins/cos/cos.c | 134
ldap/servers/plugins/cos/cos.def | 43
ldap/servers/plugins/cos/cos_cache.c | 1018
ldap/servers/plugins/cos/cos_cache.h | 36
ldap/servers/plugins/cos/dllmain.c | 133
ldap/servers/plugins/deref/deref.c | 206
ldap/servers/plugins/deref/deref.h | 35
ldap/servers/plugins/distrib/Makefile | 92
ldap/servers/plugins/distrib/Makefile.AIX | 76
ldap/servers/plugins/distrib/Makefile.BSDI | 62
ldap/servers/plugins/distrib/Makefile.HPUX | 35
ldap/servers/plugins/distrib/Makefile.HPUX64 | 35
ldap/servers/plugins/distrib/Makefile.IRIX | 62
ldap/servers/plugins/distrib/Makefile.Linux | 35
ldap/servers/plugins/distrib/Makefile.OSF1 | 61
ldap/servers/plugins/distrib/Makefile.ReliantUNIX | 62
ldap/servers/plugins/distrib/Makefile.SOLARIS | 35
ldap/servers/plugins/distrib/Makefile.SOLARIS64 | 35
ldap/servers/plugins/distrib/Makefile.SOLARISx86 | 35
ldap/servers/plugins/distrib/Makefile.UnixWare | 62
ldap/servers/plugins/distrib/Makefile.UnixWareUDK | 62
ldap/servers/plugins/distrib/Makefile.WINNT | 76
ldap/servers/plugins/distrib/README | 35
ldap/servers/plugins/distrib/distrib.c | 35
ldap/servers/plugins/distrib/distrib.dsp | 153
ldap/servers/plugins/distrib/dllmain.c | 127
ldap/servers/plugins/distrib/libdistrib.def | 41
ldap/servers/plugins/dna/dna.c | 2593
ldap/servers/plugins/dna/posix.ldif | 35
ldap/servers/plugins/dna/subtest.ldif | 35
ldap/servers/plugins/http/dllmain.c | 135
ldap/servers/plugins/http/http.def | 45
ldap/servers/plugins/http/http_client.c | 66
ldap/servers/plugins/http/http_client.h | 35
ldap/servers/plugins/http/http_impl.c | 148
ldap/servers/plugins/http/http_impl.h | 35
ldap/servers/plugins/linkedattrs/fixup_task.c | 273
ldap/servers/plugins/linkedattrs/linked_attrs.c | 487
ldap/servers/plugins/linkedattrs/linked_attrs.h | 40
ldap/servers/plugins/memberof/memberof.c | 1884
ldap/servers/plugins/memberof/memberof.h | 70
ldap/servers/plugins/memberof/memberof_config.c | 835
ldap/servers/plugins/mep/mep.c | 2864
ldap/servers/plugins/mep/mep.h | 101
ldap/servers/plugins/pam_passthru/README | 35
ldap/servers/plugins/pam_passthru/libpam_passthru.def | 45
ldap/servers/plugins/pam_passthru/pam_passthru.h | 85
ldap/servers/plugins/pam_passthru/pam_ptconfig.c | 770
ldap/servers/plugins/pam_passthru/pam_ptdebug.c | 43
ldap/servers/plugins/pam_passthru/pam_ptdllmain.c | 168
ldap/servers/plugins/pam_passthru/pam_ptimpl.c | 125
ldap/servers/plugins/pam_passthru/pam_ptpreop.c | 696
ldap/servers/plugins/passthru/PT-Notes | 35
ldap/servers/plugins/passthru/libpassthru.def | 46
ldap/servers/plugins/passthru/passthru.h | 44
ldap/servers/plugins/passthru/ptbind.c | 41
ldap/servers/plugins/passthru/ptconfig.c | 519
ldap/servers/plugins/passthru/ptconn.c | 43
ldap/servers/plugins/passthru/ptdebug.c | 43
ldap/servers/plugins/passthru/ptdllmain.c | 169
ldap/servers/plugins/passthru/ptpreop.c | 67
ldap/servers/plugins/passthru/ptutil.c | 35
ldap/servers/plugins/posix-winsync/README | 50
ldap/servers/plugins/posix-winsync/posix-group-func.c | 1027
ldap/servers/plugins/posix-winsync/posix-group-func.h | 25
ldap/servers/plugins/posix-winsync/posix-group-task.c | 520
ldap/servers/plugins/posix-winsync/posix-winsync-config.c | 301
ldap/servers/plugins/posix-winsync/posix-winsync.c | 2119
ldap/servers/plugins/posix-winsync/posix-wsp-ident.h | 58
ldap/servers/plugins/presence/dllmain.c | 133
ldap/servers/plugins/presence/presence.c | 62
ldap/servers/plugins/presence/presence.def | 43
ldap/servers/plugins/presence/presence.ldif | 35
ldap/servers/plugins/pwdstorage/clear_pwd.c | 35
ldap/servers/plugins/pwdstorage/crypt_pwd.c | 41
ldap/servers/plugins/pwdstorage/dllmain.c | 128
ldap/servers/plugins/pwdstorage/libpwdstorage.def | 56
ldap/servers/plugins/pwdstorage/md5.h | 35
ldap/servers/plugins/pwdstorage/md5_pwd.c | 35
ldap/servers/plugins/pwdstorage/md5c.c | 35
ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.bu | 35
ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.c | 35
ldap/servers/plugins/pwdstorage/pwd_init.c | 39
ldap/servers/plugins/pwdstorage/pwd_util.c | 35
ldap/servers/plugins/pwdstorage/pwdstorage.h | 37
ldap/servers/plugins/pwdstorage/sha_pwd.c | 35
ldap/servers/plugins/pwdstorage/smd5_pwd.c | 44
ldap/servers/plugins/pwdstorage/ssha_pwd.c | 35
ldap/servers/plugins/referint/dllmain.c | 132
ldap/servers/plugins/referint/referint.c | 2209
ldap/servers/plugins/referint/referint.def | 44
ldap/servers/plugins/replication/cl4.h | 35
ldap/servers/plugins/replication/cl4_api.c | 37
ldap/servers/plugins/replication/cl4_api.h | 35
ldap/servers/plugins/replication/cl4_init.c | 37
ldap/servers/plugins/replication/cl5.h | 40
ldap/servers/plugins/replication/cl5_api.c | 3639
ldap/servers/plugins/replication/cl5_api.h | 219
ldap/servers/plugins/replication/cl5_clcache.c | 215
ldap/servers/plugins/replication/cl5_clcache.h | 37
ldap/servers/plugins/replication/cl5_config.c | 403
ldap/servers/plugins/replication/cl5_init.c | 39
ldap/servers/plugins/replication/cl5_test.c | 39
ldap/servers/plugins/replication/cl5_test.h | 35
ldap/servers/plugins/replication/cl_crypt.c | 174
ldap/servers/plugins/replication/cl_crypt.h | 24
ldap/servers/plugins/replication/csnpl.c | 109
ldap/servers/plugins/replication/csnpl.h | 35
ldap/servers/plugins/replication/dllmain.c | 128
ldap/servers/plugins/replication/legacy_consumer.c | 78
ldap/servers/plugins/replication/llist.c | 43
ldap/servers/plugins/replication/llist.h | 35
ldap/servers/plugins/replication/profile.c | 35
ldap/servers/plugins/replication/repl-session-plugin.h | 86
ldap/servers/plugins/replication/repl.h | 53
ldap/servers/plugins/replication/repl5.h | 280
ldap/servers/plugins/replication/repl5_agmt.c | 1482
ldap/servers/plugins/replication/repl5_agmtlist.c | 399
ldap/servers/plugins/replication/repl5_backoff.c | 35
ldap/servers/plugins/replication/repl5_connection.c | 667
ldap/servers/plugins/replication/repl5_inc_protocol.c | 1637
ldap/servers/plugins/replication/repl5_init.c | 507
ldap/servers/plugins/replication/repl5_mtnode_ext.c | 54
ldap/servers/plugins/replication/repl5_plugins.c | 497
ldap/servers/plugins/replication/repl5_prot_private.h | 45
ldap/servers/plugins/replication/repl5_protocol.c | 226
ldap/servers/plugins/replication/repl5_protocol_util.c | 609
ldap/servers/plugins/replication/repl5_replica.c | 2046
ldap/servers/plugins/replication/repl5_replica_config.c | 3146
ldap/servers/plugins/replication/repl5_replica_dnhash.c | 61
ldap/servers/plugins/replication/repl5_replica_hash.c | 65
ldap/servers/plugins/replication/repl5_replsupplier.c | 35
ldap/servers/plugins/replication/repl5_ruv.c | 811
ldap/servers/plugins/replication/repl5_ruv.h | 67
ldap/servers/plugins/replication/repl5_schedule.c | 35
ldap/servers/plugins/replication/repl5_tot_protocol.c | 262
ldap/servers/plugins/replication/repl5_total.c | 61
ldap/servers/plugins/replication/repl5_updatedn_list.c | 161
ldap/servers/plugins/replication/repl_add.c | 35
ldap/servers/plugins/replication/repl_bind.c | 44
ldap/servers/plugins/replication/repl_compare.c | 53
ldap/servers/plugins/replication/repl_connext.c | 193
ldap/servers/plugins/replication/repl_controls.c | 37
ldap/servers/plugins/replication/repl_delete.c | 35
ldap/servers/plugins/replication/repl_entry.c | 35
ldap/servers/plugins/replication/repl_ext.c | 35
ldap/servers/plugins/replication/repl_extop.c | 965
ldap/servers/plugins/replication/repl_globals.c | 61
ldap/servers/plugins/replication/repl_helper.c | 35
ldap/servers/plugins/replication/repl_helper.h | 35
ldap/servers/plugins/replication/repl_init.c | 44
ldap/servers/plugins/replication/repl_modify.c | 35
ldap/servers/plugins/replication/repl_modrdn.c | 35
ldap/servers/plugins/replication/repl_monitor.c | 35
ldap/servers/plugins/replication/repl_objset.c | 44
ldap/servers/plugins/replication/repl_objset.h | 35
ldap/servers/plugins/replication/repl_opext.c | 35
ldap/servers/plugins/replication/repl_ops.c | 50
ldap/servers/plugins/replication/repl_rootdse.c | 35
ldap/servers/plugins/replication/repl_search.c | 35
ldap/servers/plugins/replication/repl_session_plugin.c | 173
ldap/servers/plugins/replication/repl_shared.h | 59
ldap/servers/plugins/replication/replication.def | 48
ldap/servers/plugins/replication/replutil.c | 252
ldap/servers/plugins/replication/test_repl_session_plugin.c | 306
ldap/servers/plugins/replication/tests/dnp_sim.c | 35
ldap/servers/plugins/replication/tests/dnp_sim2.c | 35
ldap/servers/plugins/replication/tests/dnp_sim3.c | 35
ldap/servers/plugins/replication/tests/makesim | 43
ldap/servers/plugins/replication/urp.c | 455
ldap/servers/plugins/replication/urp.h | 43
ldap/servers/plugins/replication/urp_glue.c | 86
ldap/servers/plugins/replication/urp_tombstone.c | 151
ldap/servers/plugins/replication/windows_connection.c | 420
ldap/servers/plugins/replication/windows_inc_protocol.c | 274
ldap/servers/plugins/replication/windows_private.c | 2865
ldap/servers/plugins/replication/windows_prot_private.h | 35
ldap/servers/plugins/replication/windows_protocol_util.c | 2681
ldap/servers/plugins/replication/windows_tot_protocol.c | 264
ldap/servers/plugins/replication/windowsrepl.h | 113
ldap/servers/plugins/replication/winsync-plugin.h | 534
ldap/servers/plugins/retrocl/dllmain.c | 127
ldap/servers/plugins/retrocl/linktest.c | 35
ldap/servers/plugins/retrocl/retrocl.c | 376
ldap/servers/plugins/retrocl/retrocl.def | 47
ldap/servers/plugins/retrocl/retrocl.h | 48
ldap/servers/plugins/retrocl/retrocl.txt | 35
ldap/servers/plugins/retrocl/retrocl_cn.c | 94
ldap/servers/plugins/retrocl/retrocl_create.c | 52
ldap/servers/plugins/retrocl/retrocl_po.c | 308
ldap/servers/plugins/retrocl/retrocl_rootdse.c | 35
ldap/servers/plugins/retrocl/retrocl_trim.c | 329
ldap/servers/plugins/rever/des.c | 521
ldap/servers/plugins/rever/dllmain.c | 128
ldap/servers/plugins/rever/libdes.def | 45
ldap/servers/plugins/rever/pbe.c | 592
ldap/servers/plugins/rever/rever.c | 157
ldap/servers/plugins/rever/rever.h | 46
ldap/servers/plugins/roles/dllmain.c | 133
ldap/servers/plugins/roles/roles.def | 42
ldap/servers/plugins/roles/roles_cache.c | 252
ldap/servers/plugins/roles/roles_cache.h | 37
ldap/servers/plugins/roles/roles_plugin.c | 117
ldap/servers/plugins/rootdn_access/rootdn_access.c | 722
ldap/servers/plugins/rootdn_access/rootdn_access.h | 26
ldap/servers/plugins/schema_reload/schema_reload.c | 148
ldap/servers/plugins/shared/plugin-utils.h | 112
ldap/servers/plugins/shared/utils.c | 508
ldap/servers/plugins/statechange/dllmain.c | 133
ldap/servers/plugins/statechange/statechange.c | 175
ldap/servers/plugins/statechange/statechange.def | 42
ldap/servers/plugins/sync/sync.h | 175
ldap/servers/plugins/sync/sync_init.c | 148
ldap/servers/plugins/sync/sync_persist.c | 695
ldap/servers/plugins/sync/sync_refresh.c | 743
ldap/servers/plugins/sync/sync_util.c | 715
ldap/servers/plugins/syntaxes/bin.c | 177
ldap/servers/plugins/syntaxes/bitstring.c | 103
ldap/servers/plugins/syntaxes/ces.c | 207
ldap/servers/plugins/syntaxes/cis.c | 356
ldap/servers/plugins/syntaxes/debug.c | 43
ldap/servers/plugins/syntaxes/deliverymethod.c | 67
ldap/servers/plugins/syntaxes/dllmain.c | 171
ldap/servers/plugins/syntaxes/dn.c | 107
ldap/servers/plugins/syntaxes/facsimile.c | 73
ldap/servers/plugins/syntaxes/guide.c | 67
ldap/servers/plugins/syntaxes/int.c | 131
ldap/servers/plugins/syntaxes/libsyntax.def | 56
ldap/servers/plugins/syntaxes/nameoptuid.c | 108
ldap/servers/plugins/syntaxes/numericstring.c | 183
ldap/servers/plugins/syntaxes/phonetic.c | 35
ldap/servers/plugins/syntaxes/sicis.c | 67
ldap/servers/plugins/syntaxes/string.c | 490
ldap/servers/plugins/syntaxes/syntax.h | 96
ldap/servers/plugins/syntaxes/syntax_common.c | 89
ldap/servers/plugins/syntaxes/tel.c | 129
ldap/servers/plugins/syntaxes/teletex.c | 67
ldap/servers/plugins/syntaxes/telex.c | 66
ldap/servers/plugins/syntaxes/validate.c | 52
ldap/servers/plugins/syntaxes/validate_task.c | 79
ldap/servers/plugins/syntaxes/value.c | 169
ldap/servers/plugins/uiduniq/7bit.c | 209
ldap/servers/plugins/uiduniq/UID-Notes | 35
ldap/servers/plugins/uiduniq/libuiduniq.def | 47
ldap/servers/plugins/uiduniq/plugin-utils.h | 63
ldap/servers/plugins/uiduniq/uid.c | 1100
ldap/servers/plugins/uiduniq/utils.c | 220
ldap/servers/plugins/usn/usn.c | 463
ldap/servers/plugins/usn/usn.h | 38
ldap/servers/plugins/usn/usn_cleanup.c | 136
ldap/servers/plugins/vattrsp_template/dllmain.c | 133
ldap/servers/plugins/vattrsp_template/vattrsp.c | 52
ldap/servers/plugins/vattrsp_template/vattrsp.def | 42
ldap/servers/plugins/views/dllmain.c | 133
ldap/servers/plugins/views/views.c | 232
ldap/servers/plugins/views/views.def | 42
ldap/servers/plugins/whoami/whoami.c | 119
ldap/servers/slapd/abandon.c | 50
ldap/servers/slapd/add.c | 483
ldap/servers/slapd/agtmmap.c | 265
ldap/servers/slapd/agtmmap.h | 53
ldap/servers/slapd/apibroker.c | 95
ldap/servers/slapd/attr.c | 449
ldap/servers/slapd/attrlist.c | 85
ldap/servers/slapd/attrsyntax.c | 1065
ldap/servers/slapd/auditlog.c | 122
ldap/servers/slapd/auth.c | 191
ldap/servers/slapd/auth.h | 35
ldap/servers/slapd/ava.c | 39
ldap/servers/slapd/back-ldbm/ancestorid.c | 263
ldap/servers/slapd/back-ldbm/archive.c | 176
ldap/servers/slapd/back-ldbm/attrcrypt.h | 35
ldap/servers/slapd/back-ldbm/back-ldbm.h | 218
ldap/servers/slapd/back-ldbm/backentry.c | 42
ldap/servers/slapd/back-ldbm/cache.c | 548
ldap/servers/slapd/back-ldbm/cleanup.c | 35
ldap/servers/slapd/back-ldbm/close.c | 35
ldap/servers/slapd/back-ldbm/dbhelp.c | 112
ldap/servers/slapd/back-ldbm/dblayer.c | 3370
ldap/servers/slapd/back-ldbm/dblayer.h | 55
ldap/servers/slapd/back-ldbm/dbsize.c | 42
ldap/servers/slapd/back-ldbm/dbtest.c | 349
ldap/servers/slapd/back-ldbm/dbverify.c | 53
ldap/servers/slapd/back-ldbm/dbversion.c | 117
ldap/servers/slapd/back-ldbm/dllmain.c | 166
ldap/servers/slapd/back-ldbm/dn2entry.c | 98
ldap/servers/slapd/back-ldbm/entrystore.c | 35
ldap/servers/slapd/back-ldbm/filterindex.c | 383
ldap/servers/slapd/back-ldbm/findentry.c | 182
ldap/servers/slapd/back-ldbm/haschildren.c | 35
ldap/servers/slapd/back-ldbm/id2entry.c | 234
ldap/servers/slapd/back-ldbm/idl.c | 207
ldap/servers/slapd/back-ldbm/idl_common.c | 77
ldap/servers/slapd/back-ldbm/idl_new.c | 589
ldap/servers/slapd/back-ldbm/idl_shim.c | 52
ldap/servers/slapd/back-ldbm/idlapi.h | 35
ldap/servers/slapd/back-ldbm/import-merge.c | 79
ldap/servers/slapd/back-ldbm/import-threads.c | 1946
ldap/servers/slapd/back-ldbm/import.c | 528
ldap/servers/slapd/back-ldbm/import.h | 92
ldap/servers/slapd/back-ldbm/index.c | 865
ldap/servers/slapd/back-ldbm/init.c | 134
ldap/servers/slapd/back-ldbm/instance.c | 213
ldap/servers/slapd/back-ldbm/ldbm_abandon.c | 35
ldap/servers/slapd/back-ldbm/ldbm_add.c | 1640
ldap/servers/slapd/back-ldbm/ldbm_attr.c | 997
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 1069
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c | 39
ldap/servers/slapd/back-ldbm/ldbm_bind.c | 243
ldap/servers/slapd/back-ldbm/ldbm_compare.c | 62
ldap/servers/slapd/back-ldbm/ldbm_config.c | 596
ldap/servers/slapd/back-ldbm/ldbm_config.h | 54
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 1453
ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c | 1879
ldap/servers/slapd/back-ldbm/ldbm_index_config.c | 743
ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 328
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 870
ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 1849
ldap/servers/slapd/back-ldbm/ldbm_search.c | 938
ldap/servers/slapd/back-ldbm/ldbm_unbind.c | 35
ldap/servers/slapd/back-ldbm/ldbm_usn.c | 118
ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 1103
ldap/servers/slapd/back-ldbm/libback-ldbm.def | 45
ldap/servers/slapd/back-ldbm/matchrule.c | 95
ldap/servers/slapd/back-ldbm/misc.c | 357
ldap/servers/slapd/back-ldbm/monitor.c | 129
ldap/servers/slapd/back-ldbm/nextid.c | 52
ldap/servers/slapd/back-ldbm/parents.c | 183
ldap/servers/slapd/back-ldbm/perfctrs.c | 190
ldap/servers/slapd/back-ldbm/perfctrs.h | 35
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 152
ldap/servers/slapd/back-ldbm/rmdb.c | 35
ldap/servers/slapd/back-ldbm/seq.c | 150
ldap/servers/slapd/back-ldbm/sort.c | 231
ldap/servers/slapd/back-ldbm/start.c | 144
ldap/servers/slapd/back-ldbm/tools/index_dump/index_dump.c | 35
ldap/servers/slapd/back-ldbm/uniqueid2entry.c | 35
ldap/servers/slapd/back-ldbm/upgrade.c | 107
ldap/servers/slapd/back-ldbm/vlv.c | 465
ldap/servers/slapd/back-ldbm/vlv_key.c | 35
ldap/servers/slapd/back-ldbm/vlv_key.h | 35
ldap/servers/slapd/back-ldbm/vlv_srch.c | 69
ldap/servers/slapd/back-ldbm/vlv_srch.h | 38
ldap/servers/slapd/back-ldif/add.c | 35
ldap/servers/slapd/back-ldif/back-ldif.h | 47
ldap/servers/slapd/back-ldif/bind.c | 39
ldap/servers/slapd/back-ldif/close.c | 35
ldap/servers/slapd/back-ldif/compare.c | 35
ldap/servers/slapd/back-ldif/config.c | 35
ldap/servers/slapd/back-ldif/delete.c | 35
ldap/servers/slapd/back-ldif/dllmain.c | 170
ldap/servers/slapd/back-ldif/init.c | 43
ldap/servers/slapd/back-ldif/libback-ldif.def | 44
ldap/servers/slapd/back-ldif/modify.c | 37
ldap/servers/slapd/back-ldif/modrdn.c | 47
ldap/servers/slapd/back-ldif/monitor.c | 35
ldap/servers/slapd/back-ldif/search.c | 35
ldap/servers/slapd/back-ldif/start.c | 35
ldap/servers/slapd/back-ldif/unbind.c | 35
ldap/servers/slapd/backend.c | 287
ldap/servers/slapd/backend_manager.c | 94
ldap/servers/slapd/bind.c | 559
ldap/servers/slapd/bitset.c | 35
ldap/servers/slapd/bulk_import.c | 74
ldap/servers/slapd/ch_malloc.c | 399
ldap/servers/slapd/charray.c | 78
ldap/servers/slapd/compare.c | 80
ldap/servers/slapd/computed.c | 219
ldap/servers/slapd/config.c | 145
ldap/servers/slapd/configdse.c | 152
ldap/servers/slapd/connection.c | 2448
ldap/servers/slapd/conntable.c | 147
ldap/servers/slapd/control.c | 99
ldap/servers/slapd/counters.c | 35
ldap/servers/slapd/csn.c | 124
ldap/servers/slapd/csngen.c | 128
ldap/servers/slapd/csngen.h | 35
ldap/servers/slapd/csnset.c | 39
ldap/servers/slapd/daemon.c | 2757
ldap/servers/slapd/defbackend.c | 38
ldap/servers/slapd/delete.c | 169
ldap/servers/slapd/detach.c | 54
ldap/servers/slapd/disconnect_error_strings.h | 35
ldap/servers/slapd/disconnect_errors.h | 35
ldap/servers/slapd/dl.c | 37
ldap/servers/slapd/dn.c | 2274
ldap/servers/slapd/dse.c | 1253
ldap/servers/slapd/dynalib.c | 71
ldap/servers/slapd/entry.c | 2245
ldap/servers/slapd/entrywsi.c | 847
ldap/servers/slapd/errormap.c | 53
ldap/servers/slapd/eventq.c | 39
ldap/servers/slapd/extendop.c | 72
ldap/servers/slapd/factory.c | 246
ldap/servers/slapd/fe.h | 104
ldap/servers/slapd/fedse.c | 289
ldap/servers/slapd/fileio.c | 303
ldap/servers/slapd/filter.c | 292
ldap/servers/slapd/filter.h | 36
ldap/servers/slapd/filtercmp.c | 61
ldap/servers/slapd/filterentry.c | 87
ldap/servers/slapd/generation.c | 43
ldap/servers/slapd/getfilelist.c | 39
ldap/servers/slapd/getopt_ext.c | 35
ldap/servers/slapd/getopt_ext.h | 46
ldap/servers/slapd/getsocketpeer.c | 29
ldap/servers/slapd/getsocketpeer.h | 29
ldap/servers/slapd/globals.c | 112
ldap/servers/slapd/house.c | 35
ldap/servers/slapd/http.h | 35
ldap/servers/slapd/index_subsys.h | 35
ldap/servers/slapd/index_subsystem.c | 73
ldap/servers/slapd/init.c | 51
ldap/servers/slapd/intrinsics.h | 79
ldap/servers/slapd/ldaputil.c | 1405
ldap/servers/slapd/ldbmlinktest.c | 35
ldap/servers/slapd/lenstr.c | 41
ldap/servers/slapd/libglobs.c | 3857
ldap/servers/slapd/libmakefile | 95
ldap/servers/slapd/libslapd.def | 1200
ldap/servers/slapd/listConfigAttrs.pl | 35
ldap/servers/slapd/localhost.c | 175
ldap/servers/slapd/lock.c | 51
ldap/servers/slapd/log.c | 660
ldap/servers/slapd/log.h | 61
ldap/servers/slapd/main.c | 739
ldap/servers/slapd/mapping_tree.c | 736
ldap/servers/slapd/match.c | 131
ldap/servers/slapd/mempool.c | 69
ldap/servers/slapd/mkDBErrStrs.pl | 35
ldap/servers/slapd/modify.c | 888
ldap/servers/slapd/modrdn.c | 434
ldap/servers/slapd/modutil.c | 114
ldap/servers/slapd/monitor.c | 53
ldap/servers/slapd/mozldap.h | 45
ldap/servers/slapd/ntmsgdll/ntslapdmessages.c | 53
ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc | 315
ldap/servers/slapd/ntperfdll/exports.def | 41
ldap/servers/slapd/ntperfdll/nsldapctr.cpp | 1022
ldap/servers/slapd/ntperfdll/nsldapctrdef.h | 70
ldap/servers/slapd/ntperfdll/nsldapctrmc.h | 159
ldap/servers/slapd/ntperfdll/nsldapctrmc.mc | 106
ldap/servers/slapd/ntperfdll/nsldapctrmsg.h | 97
ldap/servers/slapd/ntperfdll/nsldapctrs.h | 104
ldap/servers/slapd/ntperfdll/nsldapctrs.ini | 89
ldap/servers/slapd/ntperfdll/nsldapctrutil.cpp | 401
ldap/servers/slapd/ntperfdll/nsldapctrutil.h | 157
ldap/servers/slapd/ntperfdll/nsldapreg.ini | 50
ldap/servers/slapd/ntuserpin.c | 214
ldap/servers/slapd/ntwdog/cron_conf.c | 691
ldap/servers/slapd/ntwdog/cron_conf.h | 122
ldap/servers/slapd/ntwdog/ntcron.c | 193
ldap/servers/slapd/ntwdog/ntwatchdog.c | 1194
ldap/servers/slapd/object.c | 35
ldap/servers/slapd/objset.c | 35
ldap/servers/slapd/openldapber.h | 25
ldap/servers/slapd/operation.c | 254
ldap/servers/slapd/opshared.c | 782
ldap/servers/slapd/pagedresults.c | 944
ldap/servers/slapd/passwd_extop.c | 249
ldap/servers/slapd/pblock.c | 777
ldap/servers/slapd/plugin.c | 2340
ldap/servers/slapd/plugin_acl.c | 87
ldap/servers/slapd/plugin_internal_op.c | 239
ldap/servers/slapd/plugin_mr.c | 509
ldap/servers/slapd/plugin_role.c | 35
ldap/servers/slapd/plugin_syntax.c | 542
ldap/servers/slapd/poll_using_select.c | 35
ldap/servers/slapd/poll_using_select.h | 35
ldap/servers/slapd/prerrstrs.h | 35
ldap/servers/slapd/protect_db.c | 311
ldap/servers/slapd/protect_db.h | 42
ldap/servers/slapd/proto-slap.h | 359
ldap/servers/slapd/proxyauth.c | 224
ldap/servers/slapd/psearch.c | 152
ldap/servers/slapd/pw.c | 1530
ldap/servers/slapd/pw.h | 66
ldap/servers/slapd/pw_mgmt.c | 217
ldap/servers/slapd/pw_retry.c | 159
ldap/servers/slapd/rdn.c | 328
ldap/servers/slapd/referral.c | 64
ldap/servers/slapd/regex.c | 70
ldap/servers/slapd/resourcelimit.c | 132
ldap/servers/slapd/result.c | 1027
ldap/servers/slapd/rootdse.c | 47
ldap/servers/slapd/rwlock.c | 257
ldap/servers/slapd/rwlock.h | 65
ldap/servers/slapd/sasl_io.c | 387
ldap/servers/slapd/sasl_map.c | 313
ldap/servers/slapd/saslbind.c | 355
ldap/servers/slapd/schema.c | 6272 +
ldap/servers/slapd/schemaparse.c | 52
ldap/servers/slapd/search.c | 262
ldap/servers/slapd/secerrstrs.h | 104
ldap/servers/slapd/security_wrappers.c | 77
ldap/servers/slapd/slap.h | 818
ldap/servers/slapd/slapd.lite.key | 35
ldap/servers/slapd/slapd.normal.key | 35
ldap/servers/slapd/slapd_plhash.c | 35
ldap/servers/slapd/slapi-plugin-compat4.h | 41
ldap/servers/slapd/slapi-plugin.h | 2342
ldap/servers/slapd/slapi-private.h | 285
ldap/servers/slapd/slapi2nspr.c | 128
ldap/servers/slapd/slapi_counter.c | 61
ldap/servers/slapd/slapi_counter_sunos_sparcv9.S | 34
ldap/servers/slapd/snmp_collator.c | 304
ldap/servers/slapd/snmp_collator.h | 35
ldap/servers/slapd/snoop.c | 35
ldap/servers/slapd/sort.c | 46
ldap/servers/slapd/ssl.c | 1790
ldap/servers/slapd/sslerrstrs.h | 86
ldap/servers/slapd/start_tls_extop.c | 297
ldap/servers/slapd/statechange.h | 35
ldap/servers/slapd/str2filter.c | 44
ldap/servers/slapd/strdup.c | 35
ldap/servers/slapd/stubrepl.c | 35
ldap/servers/slapd/stubs.c | 44
ldap/servers/slapd/subentry.c | 35
ldap/servers/slapd/task.c | 858
ldap/servers/slapd/tempnam.c | 35
ldap/servers/slapd/test-plugins/Makefile | 35
ldap/servers/slapd/test-plugins/Makefile.AIX | 35
ldap/servers/slapd/test-plugins/Makefile.BSDI | 35
ldap/servers/slapd/test-plugins/Makefile.HPUX | 35
ldap/servers/slapd/test-plugins/Makefile.HPUX64 | 35
ldap/servers/slapd/test-plugins/Makefile.IRIX | 35
ldap/servers/slapd/test-plugins/Makefile.Linux | 35
ldap/servers/slapd/test-plugins/Makefile.OSF1 | 35
ldap/servers/slapd/test-plugins/Makefile.ReliantUNIX | 35
ldap/servers/slapd/test-plugins/Makefile.SOLARIS | 35
ldap/servers/slapd/test-plugins/Makefile.SOLARIS64 | 35
ldap/servers/slapd/test-plugins/Makefile.SOLARISx86 | 35
ldap/servers/slapd/test-plugins/Makefile.UnixWare | 35
ldap/servers/slapd/test-plugins/Makefile.UnixWareUDK | 35
ldap/servers/slapd/test-plugins/Makefile.WINNT | 77
ldap/servers/slapd/test-plugins/Makefile.server | 91
ldap/servers/slapd/test-plugins/README | 35
ldap/servers/slapd/test-plugins/clients/README | 35
ldap/servers/slapd/test-plugins/clients/ReqExtOp.java | 35
ldap/servers/slapd/test-plugins/clients/reqextop.c | 35
ldap/servers/slapd/test-plugins/dllmain.c | 146
ldap/servers/slapd/test-plugins/installDse.pl | 35
ldap/servers/slapd/test-plugins/nicknames | 35
ldap/servers/slapd/test-plugins/sampletask.c | 34
ldap/servers/slapd/test-plugins/testbind.c | 39
ldap/servers/slapd/test-plugins/testdatainterop.c | 38
ldap/servers/slapd/test-plugins/testdbinterop.c | 41
ldap/servers/slapd/test-plugins/testdbinterop.h | 35
ldap/servers/slapd/test-plugins/testentry.c | 41
ldap/servers/slapd/test-plugins/testextendedop.c | 38
ldap/servers/slapd/test-plugins/testgetip.c | 40
ldap/servers/slapd/test-plugins/testplugin.def | 48
ldap/servers/slapd/test-plugins/testplugin.dsp | 175
ldap/servers/slapd/test-plugins/testplugin.mak | 463
ldap/servers/slapd/test-plugins/testpostop.c | 58
ldap/servers/slapd/test-plugins/testpreop.c | 38
ldap/servers/slapd/test-plugins/testsaslbind.c | 38
ldap/servers/slapd/thread_data.c | 214
ldap/servers/slapd/time.c | 236
ldap/servers/slapd/tools/dbscan.c | 190
ldap/servers/slapd/tools/eggencode.c | 35
ldap/servers/slapd/tools/ldaptool-sasl.c | 33
ldap/servers/slapd/tools/ldaptool.h | 24
ldap/servers/slapd/tools/ldclt/data.c | 212
ldap/servers/slapd/tools/ldclt/examples/001/add.ksh | 35
ldap/servers/slapd/tools/ldclt/examples/001/add_incr.ksh | 35
ldap/servers/slapd/tools/ldclt/examples/001/config.ksh | 35
ldap/servers/slapd/tools/ldclt/examples/001/delete.ksh | 35
ldap/servers/slapd/tools/ldclt/examples/001/env.ksh | 35
ldap/servers/slapd/tools/ldclt/examples/001/search.ksh | 35
ldap/servers/slapd/tools/ldclt/examples/002/add.ksh | 35
ldap/servers/slapd/tools/ldclt/examples/002/config.ksh | 35
ldap/servers/slapd/tools/ldclt/examples/002/env.ksh | 35
ldap/servers/slapd/tools/ldclt/examples/002/ldif01.ksh | 35
ldap/servers/slapd/tools/ldclt/examples/002/ldif02.ksh | 35
ldap/servers/slapd/tools/ldclt/examples/002/ldif03.ksh | 35
ldap/servers/slapd/tools/ldclt/ldap-private.h | 35
ldap/servers/slapd/tools/ldclt/ldapfct.c | 1650
ldap/servers/slapd/tools/ldclt/ldclt.c | 548
ldap/servers/slapd/tools/ldclt/ldclt.h | 68
ldap/servers/slapd/tools/ldclt/ldclt.man | 2
ldap/servers/slapd/tools/ldclt/ldclt.use | 2
ldap/servers/slapd/tools/ldclt/ldcltU.c | 63
ldap/servers/slapd/tools/ldclt/opCheck.c | 158
ldap/servers/slapd/tools/ldclt/parser.c | 113
ldap/servers/slapd/tools/ldclt/port.c | 247
ldap/servers/slapd/tools/ldclt/port.h | 79
ldap/servers/slapd/tools/ldclt/remote.h | 53
ldap/servers/slapd/tools/ldclt/repcheck.c | 35
ldap/servers/slapd/tools/ldclt/repslave.c | 35
ldap/servers/slapd/tools/ldclt/scalab01.c | 301
ldap/servers/slapd/tools/ldclt/scalab01.h | 35
ldap/servers/slapd/tools/ldclt/srv.c | 35
ldap/servers/slapd/tools/ldclt/threadMain.c | 208
ldap/servers/slapd/tools/ldclt/utils.c | 146
ldap/servers/slapd/tools/ldclt/utils.h | 36
ldap/servers/slapd/tools/ldclt/workarounds.c | 41
ldap/servers/slapd/tools/ldif.c | 53
ldap/servers/slapd/tools/migratecred.c | 93
ldap/servers/slapd/tools/mkdep.c | 109
ldap/servers/slapd/tools/mmldif.c | 99
ldap/servers/slapd/tools/pwenc.c | 76
ldap/servers/slapd/tools/rsearch/addthread.c | 88
ldap/servers/slapd/tools/rsearch/addthread.h | 35
ldap/servers/slapd/tools/rsearch/infadd.c | 42
ldap/servers/slapd/tools/rsearch/infadd.h | 35
ldap/servers/slapd/tools/rsearch/main.c | 38
ldap/servers/slapd/tools/rsearch/nametable.c | 62
ldap/servers/slapd/tools/rsearch/nametable.h | 35
ldap/servers/slapd/tools/rsearch/rsearch.c | 48
ldap/servers/slapd/tools/rsearch/rsearch.h | 35
ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl.in | 283
ldap/servers/slapd/tools/rsearch/sdattable.c | 99
ldap/servers/slapd/tools/rsearch/sdattable.h | 35
ldap/servers/slapd/tools/rsearch/searchthread.c | 167
ldap/servers/slapd/tools/rsearch/searchthread.h | 35
ldap/servers/slapd/unbind.c | 39
ldap/servers/slapd/uniqueid.c | 134
ldap/servers/slapd/uniqueidgen.c | 39
ldap/servers/slapd/utf8.c | 34
ldap/servers/slapd/utf8compare.c | 99
ldap/servers/slapd/util.c | 902
ldap/servers/slapd/uuid.c | 66
ldap/servers/slapd/uuid.h | 40
ldap/servers/slapd/value.c | 97
ldap/servers/slapd/valueset.c | 1258
ldap/servers/slapd/vattr.c | 204
ldap/servers/slapd/vattr_spi.h | 35
ldap/servers/slapd/views.h | 35
ldap/servers/snmp/NETWORK-SERVICES-MIB.txt | 650
ldap/servers/snmp/RFC-1215.txt | 38
ldap/servers/snmp/RFC1155-SMI.txt | 119
ldap/servers/snmp/SNMPv2-CONF.txt | 322
ldap/servers/snmp/SNMPv2-SMI.txt | 344
ldap/servers/snmp/SNMPv2-TC.txt | 772
ldap/servers/snmp/ldap-agent.c | 73
ldap/servers/snmp/ldap-agent.h | 40
ldap/servers/snmp/main.c | 89
ldap/servers/snmp/netscape-ldap.mib | 759
ldap/servers/snmp/ntagt/msrvdefs.mak | 524
ldap/servers/snmp/ntagt/nslagtcom_nt.h | 69
ldap/servers/snmp/ntagt/nsldapagt_nt.c | 1776
ldap/servers/snmp/ntagt/nsldapagt_nt.def | 56
ldap/servers/snmp/ntagt/nsldapagt_nt.h | 266
ldap/servers/snmp/ntagt/nsldapmib_nt.c | 1078
ldap/servers/snmp/ntagt/nsldapmib_nt.h | 167
ldap/servers/snmp/redhat-directory.mib | 76
ldap/systools/getHPPatches.pl | 35
ldap/systools/getSolPatches.pl | 35
ldap/systools/hp_patches.c | 35
ldap/systools/idsktune.c | 1003
ldap/systools/mergeSolPatches.pl | 35
ldap/systools/pio.c | 35
ldap/systools/pio.h | 35
ldap/systools/viewcore.c | 43
lib/base/crit.cpp | 41
lib/base/dns.cpp | 41
lib/base/dnsdmain.cpp | 48
lib/base/ereport.cpp | 37
lib/base/eventlog.cpp | 106
lib/base/file.cpp | 365
lib/base/fsmutex.cpp | 79
lib/base/lexer.cpp | 1015
lib/base/lexer_pvt.h | 35
lib/base/net.cpp | 41
lib/base/nscperror.c | 35
lib/base/nterrors.cpp | 120
lib/base/plist.cpp | 38
lib/base/plist_pvt.h | 35
lib/base/pool.cpp | 91
lib/base/rwlock.cpp | 168
lib/base/shexp.cpp | 43
lib/base/system.cpp | 47
lib/base/systhr.cpp | 133
lib/base/util.cpp | 68
lib/ldaputil/cert.c | 51
lib/ldaputil/certmap.c | 607
lib/ldaputil/certmap.conf | 35
lib/ldaputil/dbconf.c | 93
lib/ldaputil/encode.c | 35
lib/ldaputil/errors.c | 35
lib/ldaputil/examples/Certmap.mak | 286
lib/ldaputil/examples/Makefile | 40
lib/ldaputil/examples/README | 35
lib/ldaputil/examples/init.c | 42
lib/ldaputil/examples/plugin.c | 39
lib/ldaputil/examples/plugin.h | 35
lib/ldaputil/init.c | 44
lib/ldaputil/ldapauth.c | 35
lib/ldaputil/ldapu-changes.html | 35
lib/ldaputil/ldaputili.h | 35
lib/ldaputil/utest/Makefile | 149
lib/ldaputil/utest/auth.cpp | 611
lib/ldaputil/utest/authtest | 138
lib/ldaputil/utest/certmap.conf | 68
lib/ldaputil/utest/dblist.conf | 47
lib/ldaputil/utest/example.c | 153
lib/ldaputil/utest/plugin.c | 152
lib/ldaputil/utest/plugin.h | 57
lib/ldaputil/utest/stubs.c | 144
lib/ldaputil/utest/stubs.cpp | 139
lib/ldaputil/utest/test.ref | 480
lib/ldaputil/vtable.c | 37
lib/libaccess/access_plhash.cpp | 35
lib/libaccess/access_plhash.h | 35
lib/libaccess/acl.tab.cpp | 62
lib/libaccess/acl.tab.h | 35
lib/libaccess/acl.yy.cpp | 44
lib/libaccess/aclcache.cpp | 166
lib/libaccess/aclcache.h | 35
lib/libaccess/aclerror.cpp | 39
lib/libaccess/acleval.cpp | 39
lib/libaccess/aclflush.cpp | 36
lib/libaccess/aclpriv.h | 36
lib/libaccess/aclscan.h | 36
lib/libaccess/aclscan.l | 39
lib/libaccess/aclspace.cpp | 39
lib/libaccess/acltext.y | 41
lib/libaccess/acltools.cpp | 2050
lib/libaccess/aclutil.cpp | 48
lib/libaccess/aclutil.h | 35
lib/libaccess/authdb.cpp | 147
lib/libaccess/las.h | 35
lib/libaccess/lasdns.cpp | 341
lib/libaccess/lasdns.h | 35
lib/libaccess/lasgroup.cpp | 45
lib/libaccess/lasip.cpp | 448
lib/libaccess/lasip.h | 38
lib/libaccess/lastod.cpp | 35
lib/libaccess/lasuser.cpp | 35
lib/libaccess/ldapauth.h | 35
lib/libaccess/method.cpp | 35
lib/libaccess/nsautherr.cpp | 47
lib/libaccess/nseframe.cpp | 38
lib/libaccess/oneeval.cpp | 321
lib/libaccess/oneeval.h | 35
lib/libaccess/parse.h | 35
lib/libaccess/permhash.h | 55
lib/libaccess/register.cpp | 141
lib/libaccess/symbols.cpp | 43
lib/libaccess/usi.cpp | 35
lib/libaccess/usrcache.cpp | 49
lib/libaccess/utest/.purify | 19
lib/libaccess/utest/Makefile | 147
lib/libaccess/utest/acl.dat | 44
lib/libaccess/utest/aclfile0 | 87
lib/libaccess/utest/aclfile1 | 43
lib/libaccess/utest/aclfile10 | 45
lib/libaccess/utest/aclfile11 | 43
lib/libaccess/utest/aclfile12 | 43
lib/libaccess/utest/aclfile13 | 43
lib/libaccess/utest/aclfile14 | 43
lib/libaccess/utest/aclfile15 | 43
lib/libaccess/utest/aclfile16 | 43
lib/libaccess/utest/aclfile17 | 43
lib/libaccess/utest/aclfile18 | 51
lib/libaccess/utest/aclfile19 | 46
lib/libaccess/utest/aclfile2 | 43
lib/libaccess/utest/aclfile3 | 43
lib/libaccess/utest/aclfile4 | 43
lib/libaccess/utest/aclfile5 | 43
lib/libaccess/utest/aclfile6 | 55
lib/libaccess/utest/aclfile7 | 43
lib/libaccess/utest/aclfile8 | 43
lib/libaccess/utest/aclfile9 | 43
lib/libaccess/utest/aclgrp0 | 42
lib/libaccess/utest/aclgrp1 | 42
lib/libaccess/utest/aclgrp2 | 42
lib/libaccess/utest/aclgrp3 | 42
lib/libaccess/utest/aclgrp4 | 42
lib/libaccess/utest/acltest.cpp | 794
lib/libaccess/utest/onetest.cpp | 77
lib/libaccess/utest/shexp.cpp | 331
lib/libaccess/utest/shexp.h | 168
lib/libaccess/utest/test.ref | 217
lib/libaccess/utest/testmain.cpp | 89
lib/libaccess/utest/twotest.cpp | 87
lib/libaccess/utest/ustubs.cpp | 331
lib/libaccess/yy-sed | 35
lib/libadmin/error.c | 66
lib/libadmin/template.c | 37
lib/libadmin/util.c | 96
lib/libsi18n/coreres.c | 141
lib/libsi18n/coreres.h | 52
lib/libsi18n/getlang.c | 330
lib/libsi18n/getstrmem.c | 160
lib/libsi18n/getstrmem.h | 36
lib/libsi18n/getstrprop.c | 124
lib/libsi18n/gsslapd.h | 35
lib/libsi18n/makstrdb.c | 56
lib/libsi18n/propset.c | 442
lib/libsi18n/propset.h | 80
lib/libsi18n/reshash.c | 56
lib/libsi18n/reshash.h | 35
lib/libsi18n/txtfile.c | 35
lib/libsi18n/txtfile.h | 35
ltmain.sh |14878 ++-
m4/db.m4 | 43
m4/fhs.m4 | 20
m4/icu.m4 | 41
m4/kerberos.m4 | 20
m4/mozldap.m4 | 54
m4/netsnmp.m4 | 31
m4/nspr.m4 | 33
m4/nss.m4 | 33
m4/nunc-stans.m4 | 63
m4/openldap.m4 | 46
m4/pcre.m4 | 44
m4/sasl.m4 | 41
m4/selinux.m4 | 29
m4/svrcore.m4 | 57
man/man1/cl-dump.1 | 20
man/man1/dbgen.pl.1 | 12
man/man1/dbscan.1 | 2
man/man1/ds-logpipe.py.1 | 14
man/man1/dsktune.1 | 2
man/man1/infadd.1 | 10
man/man1/ldap-agent.1 | 2
man/man1/ldclt.1 | 2
man/man1/ldif.1 | 2
man/man1/logconv.pl.1 | 47
man/man1/migratecred.1 | 8
man/man1/mmldif.1 | 6
man/man1/pwdhash.1 | 6
man/man1/repl-monitor.1 | 43
man/man1/rsearch.1 | 2
man/man8/bak2db.8 | 58
man/man8/bak2db.pl.8 | 82
man/man8/cleanallruv.pl.8 | 85
man/man8/db2bak.8 | 59
man/man8/db2bak.pl.8 | 81
man/man8/db2index.8 | 63
man/man8/db2index.pl.8 | 85
man/man8/db2ldif.8 | 102
man/man8/db2ldif.pl.8 | 124
man/man8/dbmon.sh.8 | 56
man/man8/dbverify.8 | 63
man/man8/dn2rdn.8 | 58
man/man8/fixup-linkedattrs.pl.8 | 76
man/man8/fixup-memberof.pl.8 | 80
man/man8/ldif2db.8 | 85
man/man8/ldif2db.pl.8 | 102
man/man8/ldif2ldap.8 | 62
man/man8/migrate-ds.pl.8 | 2
man/man8/monitor.8 | 67
man/man8/ns-accountstatus.pl.8 | 74
man/man8/ns-activate.pl.8 | 73
man/man8/ns-inactivate.pl.8 | 72
man/man8/ns-newpwpolicy.pl.8 | 79
man/man8/ns-slapd.8 | 12
man/man8/remove-ds.pl.8 | 13
man/man8/restart-dirsrv.8 | 50
man/man8/restoreconfig.8 | 48
man/man8/saveconfig.8 | 48
man/man8/schema-reload.pl.8 | 74
man/man8/setup-ds.pl.8 | 6
man/man8/start-dirsrv.8 | 50
man/man8/stop-dirsrv.8 | 50
man/man8/suffix2instance.8 | 51
man/man8/syntax-validate.pl.8 | 77
man/man8/upgradedb.8 | 56
man/man8/upgradednformat.8 | 55
man/man8/usn-tombstone-cleanup.pl.8 | 80
man/man8/verify-db.pl.8 | 49
man/man8/vlvindex.8 | 58
missing | 453
rpm.mk | 71
rpm/389-ds-base-devel.README | 4
rpm/389-ds-base-git.sh | 16
rpm/389-ds-base.spec.in | 1664
rpm/add_patches.sh | 55
rpm/rpmverrel.sh | 15
selinux/dirsrv.fc.in | 2
selinux/dirsrv.if | 41
selinux/dirsrv.te | 11
wrappers/cl-dump.in | 46
wrappers/dbscan.in | 10
wrappers/infadd.in | 12
wrappers/initscript.in | 267
wrappers/ldap-agent-initscript.in | 48
wrappers/ldap-agent.in | 12
wrappers/ldclt.in | 12
wrappers/ldif.in | 12
wrappers/migratecred.in | 14
wrappers/mmldif.in | 14
wrappers/pwdhash.in | 14
wrappers/repl-monitor.in | 46
wrappers/rsearch.in | 12
wrappers/systemd-snmp.service.in | 16
wrappers/systemd.group.in | 6
wrappers/systemd.template.service.in | 28
wrappers/systemd.template.sysconfig | 3
1374 files changed, 221058 insertions(+), 150995 deletions(-)
---
1
0
VERSION.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b31b6769f9732795b1ac25da218517a0fc05965a
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Jan 12 13:56:14 2016 -0800
bump version to 1.3.4.6
diff --git a/VERSION.sh b/VERSION.sh
index 320d597..5f6110e 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,7 +10,7 @@ vendor="389 Project"
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=3
-VERSION_MAINT=4.5
+VERSION_MAINT=4.6
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
1
0
ldap/servers/plugins/cos/cos_cache.c | 17 ++++++-
ldap/servers/slapd/main.c | 27 +++++++----
ldap/servers/slapd/plugin.c | 85 +++++++++++++++++++++++++++++++----
ldap/servers/slapd/proto-slap.h | 9 ++-
ldap/servers/slapd/utf8compare.c | 34 +++++++-------
5 files changed, 134 insertions(+), 38 deletions(-)
New commits:
commit 268070ea2bef973a7630c81389fa2f28ffd12d17
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Fri Dec 18 16:38:33 2015 -0500
Ticket 48388 - db2ldif -r segfaults from time to time
Bug Description: db2ldif starts all the plugins before generating
the ldif file. If the retro changelog is enabled
and it starts to trim itself the server can crash
when cos tries to process the retrocl triming
operations.
Fix Description: First, fix the NULL dereferences in COS. Then
when doing a "db2ldif -r" only startup the
plugins that "db2ldif -r" needs (which is just
the replication plugin and its dependencies).
Revised the plugin_startall() function to remove
unused parameters (start_backends & global_plugins)
Also did a little code clean up slapi_utf8casecmp.
https://fedorahosted.org/389/ticket/48388
Valgrind: passed
Reviewed by: nhosoi(Thanks!)
(cherry picked from commit c7c3d5963243574f8f8cf5f292fba27486a40d4a)
diff --git a/ldap/servers/plugins/cos/cos_cache.c b/ldap/servers/plugins/cos/cos_cache.c
index e0b841d..f3ea7db 100644
--- a/ldap/servers/plugins/cos/cos_cache.c
+++ b/ldap/servers/plugins/cos/cos_cache.c
@@ -3034,7 +3034,8 @@ static int cos_cache_attr_compare(const void *e1, const void *e2)
cosTemplates *pTemplate1 = (cosTemplates*)pAttr1->pParent;
/* Now compare the names of the attributes */
- com_Result = slapi_utf8casecmp((unsigned char*)(*(cosAttributes**)e1)->pAttrName,(unsigned char*)(*(cosAttributes**)e2)->pAttrName);
+ com_Result = slapi_utf8casecmp((unsigned char*)(*(cosAttributes**)e1)->pAttrName,
+ (unsigned char*)(*(cosAttributes**)e2)->pAttrName);
if(0 == com_Result){
/* Now compare the cosPriorities */
com_Result = pTemplate->cosPriority - pTemplate1->cosPriority;
@@ -3047,6 +3048,13 @@ static int cos_cache_attr_compare(const void *e1, const void *e2)
static int cos_cache_string_compare(const void *e1, const void *e2)
{
+ if (!e1 && e2) {
+ return 1;
+ } else if (e1 && !e2) {
+ return -1;
+ } else if (!e1 && !e2) {
+ return 0;
+ }
return slapi_utf8casecmp((*(unsigned char**)e1),(*(unsigned char**)e2));
}
@@ -3054,6 +3062,13 @@ static int cos_cache_template_index_compare(const void *e1, const void *e2)
{
int ret = 0;
+ if (!e1 && e2) {
+ return 1;
+ } else if (e1 && !e2) {
+ return -1;
+ } else if (!e1 && !e2) {
+ return 0;
+ }
if(0 == slapi_dn_issuffix((const char*)e1,*(const char**)e2))
ret = slapi_utf8casecmp(*(unsigned char**)e2,(unsigned char*)e1);
else
diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c
index 4f9fbfe..b048dc5 100644
--- a/ldap/servers/slapd/main.c
+++ b/ldap/servers/slapd/main.c
@@ -1051,7 +1051,7 @@ main( int argc, char **argv)
pw_exp_init ();
plugin_print_lists();
- plugin_startall(argc, argv, 1 /* Start Backends */, 1 /* Start Globals */);
+ plugin_startall(argc, argv, NULL /* specific plugin list */);
compute_plugins_started();
if (housekeeping_start((time_t)0, NULL) == NULL) {
return_value = 1;
@@ -2216,13 +2216,24 @@ slapd_exemode_db2ldif(int argc, char** argv)
else
pb.pb_server_running = 0;
- if (db2ldif_dump_replica) {
- eq_init(); /* must be done before plugins started */
- ps_init_psearch_system(); /* must come before plugin_startall() */
- plugin_startall(argc, argv, 1 /* Start Backends */,
- 1 /* Start Globals */);
- eq_start(); /* must be done after plugins started */
- }
+ if (db2ldif_dump_replica) {
+ char **plugin_list = NULL;
+ char *repl_plg_name = "Multimaster Replication Plugin";
+
+ /*
+ * Only start the necessary plugins for "db2ldif -r"
+ *
+ * We need replication, but replication has its own
+ * dependencies
+ */
+ plugin_get_plugin_dependencies(repl_plg_name, &plugin_list);
+
+ eq_init(); /* must be done before plugins started */
+ ps_init_psearch_system(); /* must come before plugin_startall() */
+ plugin_startall(argc, argv, plugin_list);
+ eq_start(); /* must be done after plugins started */
+ charray_free(plugin_list);
+ }
pb.pb_ldif_file = NULL;
if ( archive_name ) { /* redirect stdout to this file: */
diff --git a/ldap/servers/slapd/plugin.c b/ldap/servers/slapd/plugin.c
index 0e99095..496f9e8 100644
--- a/ldap/servers/slapd/plugin.c
+++ b/ldap/servers/slapd/plugin.c
@@ -1390,6 +1390,47 @@ plugin_free_plugin_dep_config(plugin_dep_config **cfg)
}
}
+/*
+ * Take a given plugin and recursively set all the plugin dependency names
+ */
+void
+plugin_get_plugin_dependencies(char *plugin_name, char ***names)
+{
+ entry_and_plugin_t *ep = dep_plugin_entries;
+ char **depends = NULL;
+ char *dep_attr = "nsslapd-plugin-depends-on-named";
+ int i;
+
+ /* Add the original plugin name to the list */
+ if (!charray_inlist(*names, plugin_name)){
+ charray_add(names, slapi_ch_strdup(plugin_name));
+ }
+
+ /* Find the plugin and grab its dependencies */
+ while(ep)
+ {
+ if (ep->plugin){
+ if(strcasecmp(ep->plugin->plg_name, plugin_name) == 0){
+ /* We found our plugin, now grab its dependencies */
+ depends = slapi_entry_attr_get_charray(ep->e, dep_attr);
+ break;
+ }
+ }
+ ep = ep->next;
+ }
+
+ if (depends){
+ /* Add the plugin's dependencies */
+ charray_merge_nodup(names, depends, 1);
+
+ /* Add each dependency's dependencies */
+ for (i = 0; depends[i]; i++){
+ /* recurse */
+ plugin_get_plugin_dependencies(depends[i], names);
+ }
+ slapi_ch_array_free(depends);
+ }
+}
/*
* plugin_dependency_startall()
@@ -1407,7 +1448,7 @@ plugin_free_plugin_dep_config(plugin_dep_config **cfg)
*/
static int
-plugin_dependency_startall(int argc, char** argv, char *errmsg, int operation)
+plugin_dependency_startall(int argc, char** argv, char *errmsg, int operation, char** plugin_list)
{
int ret = 0;
Slapi_PBlock pb;
@@ -1419,7 +1460,7 @@ plugin_dependency_startall(int argc, char** argv, char *errmsg, int operation)
int i = 0; /* general index iterator */
plugin_dep_type the_plugin_type;
int index = 0;
- char * value;
+ char *value = NULL;
int plugins_started;
int num_plg_started;
struct slapdplugin *plugin;
@@ -1435,25 +1476,50 @@ plugin_dependency_startall(int argc, char** argv, char *errmsg, int operation)
global_plugin_callbacks_enabled = 0;
/* Count the plugins so we can allocate memory for the config array */
- while(ep)
+ while(ep)
{
total_plugins++;
-
ep = ep->next;
}
/* allocate the config array */
config = (plugin_dep_config*)slapi_ch_calloc(total_plugins + 1, sizeof(plugin_dep_config));
-
ep = dep_plugin_entries;
+ if (plugin_list){
+ /* We have a plugin list, so we need to reset the plugin count */
+ total_plugins = 0;
+ }
/* Collect relevant config */
- while(ep)
+ while(ep)
{
plugin = ep->plugin;
- if(plugin == 0)
+ if(plugin == 0){
+ ep = ep->next;
continue;
+ }
+
+ if (plugin_list){
+ /*
+ * We have a specific list of plugins to start, skip the others...
+ */
+ int found = 0;
+ for (i = 0; plugin_list[i]; i++){
+ if (strcasecmp(plugin->plg_name, plugin_list[i]) == 0){
+ found = 1;
+ break;
+ }
+ }
+
+ if (!found){
+ /* Skip this plugin, it's not in the list */
+ ep = ep->next;
+ continue;
+ } else {
+ total_plugins++;
+ }
+ }
pblock_init(&pb);
slapi_pblock_set( &pb, SLAPI_ARGC, &argc);
@@ -1824,12 +1890,13 @@ plugin_dependency_closeall()
* stuff is done with. So this function goes through and starts all plugins
*/
void
-plugin_startall(int argc, char** argv, int start_backends, int start_global)
+plugin_startall(int argc, char** argv, char **plugin_list)
{
/* initialize special plugin structures */
default_plugin_init ();
- plugin_dependency_startall(argc, argv, "plugin startup failed\n", SLAPI_PLUGIN_START_FN);
+ plugin_dependency_startall(argc, argv, "plugin startup failed\n",
+ SLAPI_PLUGIN_START_FN, plugin_list);
}
/*
diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
index 8fcebb8..f745852 100644
--- a/ldap/servers/slapd/proto-slap.h
+++ b/ldap/servers/slapd/proto-slap.h
@@ -853,11 +853,14 @@ int plugin_setup(Slapi_Entry *plugin_entry, struct slapi_componentid *group,
int plugin_call_exop_plugins( Slapi_PBlock *pb, char *oid );
const char *plugin_extended_op_oid2string( const char *oid );
void plugin_closeall(int close_backends, int close_globals);
-void plugin_startall(int argc,char **argv,int start_backends, int start_global);
+void plugin_startall(int argc, char **argv, char **plugin_list);
+void plugin_get_plugin_dependencies(char *plugin_name, char ***names);
struct slapdplugin *get_plugin_list(int plugin_list_index);
-PRBool plugin_invoke_plugin_sdn (struct slapdplugin *plugin, int operation, Slapi_PBlock *pb, Slapi_DN *target_spec);
+PRBool plugin_invoke_plugin_sdn (struct slapdplugin *plugin, int operation,
+ Slapi_PBlock *pb, Slapi_DN *target_spec);
struct slapdplugin *plugin_get_by_name(char *name);
-struct slapdplugin *plugin_get_pwd_storage_scheme(char *name, int len, int index);
+struct slapdplugin *plugin_get_pwd_storage_scheme(char *name, int len,
+ int index);
char *plugin_get_pwd_storage_scheme_list(int index);
int plugin_add_descriptive_attributes( Slapi_Entry *e,
struct slapdplugin *plugin );
diff --git a/ldap/servers/slapd/utf8compare.c b/ldap/servers/slapd/utf8compare.c
index 3201df7..592f039 100644
--- a/ldap/servers/slapd/utf8compare.c
+++ b/ldap/servers/slapd/utf8compare.c
@@ -2115,15 +2115,15 @@ slapi_utf8casecmp(unsigned char *s0, unsigned char *s1)
d0 = d1 = NULL;
if (s0 == NULL || *s0 == '\0') {
- if (s1 == NULL || *s1 == '\0') {
- rval = 0;
- } else {
- rval = -1; /* regardless s1, s0 < s1 */
- }
- goto end;
+ if (s1 == NULL || *s1 == '\0') {
+ rval = 0;
+ } else {
+ rval = -1; /* regardless s1, s0 < s1 */
+ }
+ goto end;
} else if (s1 == NULL || *s1 == '\0') {
- rval = 1; /* regardless s0, s0 > s1 */
- goto end;
+ rval = 1; /* regardless s0, s0 > s1 */
+ goto end;
}
has8_s0 = slapi_has8thBit(s0);
@@ -2141,9 +2141,9 @@ slapi_utf8casecmp(unsigned char *s0, unsigned char *s1)
d0 = slapi_utf8StrToLower(s0);
d1 = slapi_utf8StrToLower(s1);
if (d0 == NULL || d1 == NULL || /* either is not a UTF-8 string */
- (d0 && *d0 == '\0') || (d1 && *d1 == '\0')) {
- rval = strcasecmp((char *)s0, (char *)s1);
- goto end;
+ (d0 && *d0 == '\0') || (d1 && *d1 == '\0')) {
+ rval = strcasecmp((char *)s0, (char *)s1);
+ goto end;
}
p0 = d0;
@@ -2157,25 +2157,25 @@ slapi_utf8casecmp(unsigned char *s0, unsigned char *s1)
n0 = (unsigned char *)ldap_utf8next((char *)p0);
n1 = (unsigned char *)ldap_utf8next((char *)p1);
if (n0 > t0 || n1 > t1) {
- break;
- }
+ break;
+ }
i0 = n0 - p0;
i1 = n1 - p1;
- rval = i0 - i1;
+ rval = i0 - i1;
if (rval) { /* length is different */
goto end;
- }
+ }
/* i0 == i1: same length */
for (x0 = p0, x1 = p1; x0 < n0; x0++, x1++) {
rval = *x0 - *x1;
if (rval) {
goto end;
- }
+ }
}
- p0 = n0; p1 = n1; /* goto next */
+ p0 = n0; p1 = n1; /* goto next */
}
/* finished scanning the shared part and check the leftover */
l0 = t0 - n0;
1
0