ldap/schema/01core389.ldif | 1 +
1 file changed, 1 insertion(+)
New commits:
commit fb54b6780e8d5113287f690dac579fe9b599e910
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Aug 20 12:35:53 2012 -0400
Ticket 429 - Add nsslapd-readonly to schema
Added nsslapd-readonly to DS schema
https://fedorahosted.org/389/ticket/429
Reviewed by: ?
diff --git a/ldap/schema/01core389.ldif b/ldap/schema/01core389.ldif
index 58b4b76..d9d1c33 100644
--- a/ldap/schema/01core389.ldif
+++ b/ldap/schema/01core389.ldif
@@ -138,6 +138,7 @@ attributeTypes: ( 2.16.840.1.113730.3.1.2135 NAME 'nsds5ReplicaCleanRUV' DESC 'N
attributeTypes: ( 2.16.840.1.113730.3.1.2136 NAME 'nsds5ReplicaCleanRUVNotified' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.2137 NAME 'nsds5ReplicaAbortCleanRUV' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.2111 NAME 'tombstoneNumSubordinates' DESC 'count of immediate subordinates for tombstone entries' EQUALITY integerMatch ORDERING integerOrderingMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation X-ORIGIN '389 directory server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2138 NAME 'nsslapd-readonly' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
#
# objectclasses
#
1
0
ldap/servers/plugins/replication/repl5_replica_config.c | 31 +++++++++++-----
ldap/servers/plugins/replication/repl5_ruv.c | 29 ++++++++++++++
ldap/servers/plugins/replication/repl5_ruv.h | 1
ldap/servers/plugins/replication/repl_extop.c | 4 --
4 files changed, 54 insertions(+), 11 deletions(-)
New commits:
commit 0968b3f5d5551dc75e00c9d6e9528cc062f451fa
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Aug 20 12:17:51 2012 -0400
Ticket 403 - fix CLEANALLRUV regression from last commit
Bug Description: The last commit for CLEANALLRUV caused a regression that could
hang the process when comparing maxcsn's.
Fix Description: Needed to write a new ruv_compare_csn function to handle the
unique scenarios presented by CLEANALLRUV.
Also improved settings verfication, and error handling.
https://fedorahosted.org/389/ticket/403
Reviewed by: ?
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index b408809..e222746 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -1461,19 +1461,32 @@ replica_cleanallruv_thread(void *arg)
if(data->replica == NULL && data->repl_obj == NULL){
/*
* This thread was initiated at startup because the process did not finish. Due
- * to timing issues, we need to wait to grab the replica obj until we get here.
+ * to startup timing issues, we need to wait before grabbing the replica obj, as
+ * the backends might not be online yet.
*/
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(5) );
+ PR_Unlock( notify_lock );
data->repl_obj = replica_get_replica_from_dn(data->sdn);
+ if(data->repl_obj == NULL){
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Unable to retrieve repl object from dn(%s).", data->sdn);
+ aborted = 1;
+ goto done;
+ }
data->replica = (Replica*)object_get_data(data->repl_obj);
free_obj = 1;
- }
- if(data->replica == NULL && data->repl_obj){
+ } else if(data->replica == NULL && data->repl_obj){
data->replica = (Replica*)object_get_data(data->repl_obj);
- }
- if( data->repl_obj == NULL){
+ } else if( data->repl_obj == NULL && data->replica){
data->repl_obj = object_new(data->replica, NULL);
free_obj = 1;
}
+ /* verify we have set our repl objects */
+ if(data->repl_obj == NULL || data->replica == NULL){
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Unable to set the replica objects.");
+ aborted = 1;
+ goto done;
+ }
if(data->task){
slapi_task_begin(data->task, 1);
}
@@ -1492,11 +1505,13 @@ replica_cleanallruv_thread(void *arg)
ruv_obj = replica_get_ruv(data->replica);
ruv = object_get_data (ruv_obj);
while(data->maxcsn && !is_task_aborted(data->rid) && !is_cleaned_rid(data->rid) && !slapi_is_shutting_down()){
- if(csn_get_replicaid(data->maxcsn) == 0 || ruv_covers_csn_strict(ruv,data->maxcsn)){
+ if(csn_get_replicaid(data->maxcsn) == 0 || ruv_covers_csn_cleanallruv(ruv,data->maxcsn)){
/* We are caught up, now we can clean the ruv's */
break;
}
- DS_Sleep(PR_SecondsToInterval(5));
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(5) );
+ PR_Unlock( notify_lock );
}
object_release(ruv_obj);
/*
@@ -1963,7 +1978,7 @@ add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
slapi_modify_internal_pb (pb);
slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
- if (rc != LDAP_SUCCESS){
+ if (rc != LDAP_SUCCESS && rc != LDAP_TYPE_OR_VALUE_EXISTS){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to update replica "
"config (%d), rid (%d)\n", rc, rid);
}
diff --git a/ldap/servers/plugins/replication/repl5_ruv.c b/ldap/servers/plugins/replication/repl5_ruv.c
index fb8ea09..b52dd49 100644
--- a/ldap/servers/plugins/replication/repl5_ruv.c
+++ b/ldap/servers/plugins/replication/repl5_ruv.c
@@ -920,6 +920,35 @@ ruv_covers_csn_strict(const RUV *ruv, const CSN *csn)
return rc;
}
+/*
+ * Used by the cleanallruv task
+ *
+ * We want to return TRUE if replica is NULL,
+ * and we want to use "csn_compare() <="
+ */
+PRBool
+ruv_covers_csn_cleanallruv(const RUV *ruv, const CSN *csn)
+{
+ RUVElement *replica;
+ ReplicaId rid;
+ PRBool return_value;
+
+ if (ruv == NULL || csn == NULL){
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_covers_csn_cleanallruv: NULL argument\n");
+ return_value = PR_FALSE;
+ } else {
+ rid = csn_get_replicaid(csn);
+ replica = ruvGetReplica (ruv, rid);
+ if (replica == NULL){
+ /* already cleaned */
+ return_value = PR_TRUE;
+ } else {
+ return_value = (csn_compare (csn, replica->csn) <= 0);
+ }
+ }
+
+ return return_value;
+}
/*
* The function gets min{maxcsns of all ruv elements} if get_the_max=0,
diff --git a/ldap/servers/plugins/replication/repl5_ruv.h b/ldap/servers/plugins/replication/repl5_ruv.h
index f2d96f3..944f5ed 100644
--- a/ldap/servers/plugins/replication/repl5_ruv.h
+++ b/ldap/servers/plugins/replication/repl5_ruv.h
@@ -115,6 +115,7 @@ void ruv_set_replica_generation (RUV *ruv, const char *generation);
PRBool ruv_covers_ruv(const RUV *covering_ruv, const RUV *covered_ruv);
PRBool ruv_covers_csn(const RUV *ruv, const CSN *csn);
PRBool ruv_covers_csn_strict(const RUV *ruv, const CSN *csn);
+PRBool ruv_covers_csn_cleanallruv(const RUV *ruv, const CSN *csn);
int ruv_get_min_csn(const RUV *ruv, CSN **csn);
int ruv_get_max_csn(const RUV *ruv, CSN **csn);
int ruv_get_rid_max_csn(const RUV *ruv, CSN **csn, ReplicaId rid);
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index ecf1f93..334b86b 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -1541,8 +1541,6 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
csn_free(&maxcsn);
rc = 1;
goto free_and_return;
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: cleaning rid (%d)...\n", rid);
}
/*
@@ -1618,7 +1616,7 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
break;
}
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: checking if we're caught up...\n");
- if(ruv_covers_csn_strict(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
+ if(ruv_covers_csn_cleanallruv(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
/* We are caught up */
break;
} else {
1
0
ldap/servers/plugins/replication/repl5_replica_config.c | 31 +++++++++++-----
ldap/servers/plugins/replication/repl5_ruv.c | 29 ++++++++++++++
ldap/servers/plugins/replication/repl5_ruv.h | 1
ldap/servers/plugins/replication/repl_extop.c | 4 --
4 files changed, 54 insertions(+), 11 deletions(-)
New commits:
commit 819910db80e3452edcbe42f3154eb7af4a98efd7
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Aug 20 12:51:10 2012 -0400
Ticket 403 - fix CLEANALLRUV regression from last commit
Bug Description: The last commit for CLEANALLRUV caused a regression that could
hang the process when comparing maxcsn's.
Fix Description: Needed to write a new ruv_compare_csn function to handle the
unique scenarios presented by CLEANALLRUV.
Also improved settings verfication, and error handling.
https://fedorahosted.org/389/ticket/403
Reviewed by: richm (Thanks!)
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index c8c746c..fbb0667 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -1461,19 +1461,32 @@ replica_cleanallruv_thread(void *arg)
if(data->replica == NULL && data->repl_obj == NULL){
/*
* This thread was initiated at startup because the process did not finish. Due
- * to timing issues, we need to wait to grab the replica obj until we get here.
+ * to startup timing issues, we need to wait before grabbing the replica obj, as
+ * the backends might not be online yet.
*/
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(5) );
+ PR_Unlock( notify_lock );
data->repl_obj = replica_get_replica_from_dn(data->sdn);
+ if(data->repl_obj == NULL){
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Unable to retrieve repl object from dn(%s).", data->sdn);
+ aborted = 1;
+ goto done;
+ }
data->replica = (Replica*)object_get_data(data->repl_obj);
free_obj = 1;
- }
- if(data->replica == NULL && data->repl_obj){
+ } else if(data->replica == NULL && data->repl_obj){
data->replica = (Replica*)object_get_data(data->repl_obj);
- }
- if( data->repl_obj == NULL){
+ } else if( data->repl_obj == NULL && data->replica){
data->repl_obj = object_new(data->replica, NULL);
free_obj = 1;
}
+ /* verify we have set our repl objects */
+ if(data->repl_obj == NULL || data->replica == NULL){
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Unable to set the replica objects.");
+ aborted = 1;
+ goto done;
+ }
if(data->task){
slapi_task_begin(data->task, 1);
}
@@ -1492,11 +1505,13 @@ replica_cleanallruv_thread(void *arg)
ruv_obj = replica_get_ruv(data->replica);
ruv = object_get_data (ruv_obj);
while(data->maxcsn && !is_task_aborted(data->rid) && !is_cleaned_rid(data->rid) && !slapi_is_shutting_down()){
- if(csn_get_replicaid(data->maxcsn) == 0 || ruv_covers_csn_strict(ruv,data->maxcsn)){
+ if(csn_get_replicaid(data->maxcsn) == 0 || ruv_covers_csn_cleanallruv(ruv,data->maxcsn)){
/* We are caught up, now we can clean the ruv's */
break;
}
- DS_Sleep(PR_SecondsToInterval(5));
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(5) );
+ PR_Unlock( notify_lock );
}
object_release(ruv_obj);
/*
@@ -1963,7 +1978,7 @@ add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
slapi_modify_internal_pb (pb);
slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
- if (rc != LDAP_SUCCESS){
+ if (rc != LDAP_SUCCESS && rc != LDAP_TYPE_OR_VALUE_EXISTS){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to update replica "
"config (%d), rid (%d)\n", rc, rid);
}
diff --git a/ldap/servers/plugins/replication/repl5_ruv.c b/ldap/servers/plugins/replication/repl5_ruv.c
index fb8ea09..b52dd49 100644
--- a/ldap/servers/plugins/replication/repl5_ruv.c
+++ b/ldap/servers/plugins/replication/repl5_ruv.c
@@ -920,6 +920,35 @@ ruv_covers_csn_strict(const RUV *ruv, const CSN *csn)
return rc;
}
+/*
+ * Used by the cleanallruv task
+ *
+ * We want to return TRUE if replica is NULL,
+ * and we want to use "csn_compare() <="
+ */
+PRBool
+ruv_covers_csn_cleanallruv(const RUV *ruv, const CSN *csn)
+{
+ RUVElement *replica;
+ ReplicaId rid;
+ PRBool return_value;
+
+ if (ruv == NULL || csn == NULL){
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_covers_csn_cleanallruv: NULL argument\n");
+ return_value = PR_FALSE;
+ } else {
+ rid = csn_get_replicaid(csn);
+ replica = ruvGetReplica (ruv, rid);
+ if (replica == NULL){
+ /* already cleaned */
+ return_value = PR_TRUE;
+ } else {
+ return_value = (csn_compare (csn, replica->csn) <= 0);
+ }
+ }
+
+ return return_value;
+}
/*
* The function gets min{maxcsns of all ruv elements} if get_the_max=0,
diff --git a/ldap/servers/plugins/replication/repl5_ruv.h b/ldap/servers/plugins/replication/repl5_ruv.h
index f2d96f3..944f5ed 100644
--- a/ldap/servers/plugins/replication/repl5_ruv.h
+++ b/ldap/servers/plugins/replication/repl5_ruv.h
@@ -115,6 +115,7 @@ void ruv_set_replica_generation (RUV *ruv, const char *generation);
PRBool ruv_covers_ruv(const RUV *covering_ruv, const RUV *covered_ruv);
PRBool ruv_covers_csn(const RUV *ruv, const CSN *csn);
PRBool ruv_covers_csn_strict(const RUV *ruv, const CSN *csn);
+PRBool ruv_covers_csn_cleanallruv(const RUV *ruv, const CSN *csn);
int ruv_get_min_csn(const RUV *ruv, CSN **csn);
int ruv_get_max_csn(const RUV *ruv, CSN **csn);
int ruv_get_rid_max_csn(const RUV *ruv, CSN **csn, ReplicaId rid);
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index ecf1f93..334b86b 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -1541,8 +1541,6 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
csn_free(&maxcsn);
rc = 1;
goto free_and_return;
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: cleaning rid (%d)...\n", rid);
}
/*
@@ -1618,7 +1616,7 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
break;
}
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: checking if we're caught up...\n");
- if(ruv_covers_csn_strict(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
+ if(ruv_covers_csn_cleanallruv(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
/* We are caught up */
break;
} else {
1
0
ldap/servers/plugins/referint/referint.c | 2 +-
ldap/servers/plugins/syntaxes/string.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 063e1517b4d681d0593141d2cdc742f3e7f42aae
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Wed Aug 15 14:54:42 2012 -0700
Trac Ticket #346 - Slow ldapmodify operation time for large
quantities of multi-valued attribute values
https://fedorahosted.org/389/ticket/346
Fix Description: When comparing dn syntax attribute values (e.g.,
member in a group) with filter values, filter values are case-
lowered, but the attribute values in an entry are not any more.
This patch lowers the case before the comparison in the syntax
plugin.
(cherry picked from commit 091166e8c0642380d96cb495e30471b0bb4a5c94)
diff --git a/ldap/servers/plugins/referint/referint.c b/ldap/servers/plugins/referint/referint.c
index 7aee564..8f751da 100644
--- a/ldap/servers/plugins/referint/referint.c
+++ b/ldap/servers/plugins/referint/referint.c
@@ -196,7 +196,7 @@ referint_postop_del( Slapi_PBlock *pb )
if(argv == NULL){
slapi_log_error( SLAPI_LOG_FATAL, REFERINT_PLUGIN_SUBSYSTEM,
- "referint_postop_modrdn, args are NULL\n" );
+ "referint_postop_del, args are NULL\n" );
return( -1 );
}
diff --git a/ldap/servers/plugins/syntaxes/string.c b/ldap/servers/plugins/syntaxes/string.c
index e5bdc18..54cd7c8 100644
--- a/ldap/servers/plugins/syntaxes/string.c
+++ b/ldap/servers/plugins/syntaxes/string.c
@@ -390,6 +390,8 @@ string_filter_sub( Slapi_PBlock *pb, char *initial, char **any, char *final,
/* 3rd arg: 1 - trim leading blanks */
if (!(slapi_value_get_flags(bvals[j]) & SLAPI_ATTR_FLAG_NORMALIZED)) {
value_normalize_ext( realval, syntax, 1, &alt );
+ } else if (syntax & SYNTAX_DN) {
+ slapi_dn_ignore_case(realval);
}
if (alt) {
tmprc = slapi_re_exec( re, alt, time_up );
1
0
ldap/servers/plugins/referint/referint.c | 2 +-
ldap/servers/plugins/syntaxes/string.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 62371318797c483e710e8fb779220bfbfd019040
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Wed Aug 15 14:54:42 2012 -0700
Trac Ticket #346 - Slow ldapmodify operation time for large
quantities of multi-valued attribute values
https://fedorahosted.org/389/ticket/346
Fix Description: When comparing dn syntax attribute values (e.g.,
member in a group) with filter values, filter values are case-
lowered, but the attribute values in an entry are not any more.
This patch lowers the case before the comparison in the syntax
plugin.
(cherry picked from commit 091166e8c0642380d96cb495e30471b0bb4a5c94)
diff --git a/ldap/servers/plugins/referint/referint.c b/ldap/servers/plugins/referint/referint.c
index 0d381fe..b219b6a 100644
--- a/ldap/servers/plugins/referint/referint.c
+++ b/ldap/servers/plugins/referint/referint.c
@@ -193,7 +193,7 @@ referint_postop_del( Slapi_PBlock *pb )
if(argv == NULL){
slapi_log_error( SLAPI_LOG_FATAL, REFERINT_PLUGIN_SUBSYSTEM,
- "referint_postop_modrdn, args are NULL\n" );
+ "referint_postop_del, args are NULL\n" );
return( -1 );
}
diff --git a/ldap/servers/plugins/syntaxes/string.c b/ldap/servers/plugins/syntaxes/string.c
index e5bdc18..54cd7c8 100644
--- a/ldap/servers/plugins/syntaxes/string.c
+++ b/ldap/servers/plugins/syntaxes/string.c
@@ -390,6 +390,8 @@ string_filter_sub( Slapi_PBlock *pb, char *initial, char **any, char *final,
/* 3rd arg: 1 - trim leading blanks */
if (!(slapi_value_get_flags(bvals[j]) & SLAPI_ATTR_FLAG_NORMALIZED)) {
value_normalize_ext( realval, syntax, 1, &alt );
+ } else if (syntax & SYNTAX_DN) {
+ slapi_dn_ignore_case(realval);
}
if (alt) {
tmprc = slapi_re_exec( re, alt, time_up );
1
0
Changes since 389-ds-base-1.2.6.a1:
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
Mark Reynolds (67):
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 #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
Coverity Fix
Ticket 365 - passwords in clear text in the audit log
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 #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
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
bump version to 1.2.11.8 for offical release
Ticket 407 - dna memory leak - fix crash from prev fix
Bumped version to 1.2.11.9
Ticket 403 - CLEANALLRUV revisions
bumped version to 1.2.11.10
Nathan Kinder (193):
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
Noriko Hosoi (338):
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
Trac Ticket #338 - letters in object's cn get converted to
Trac Ticket #359 - Database RUV could mismatch the one
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 #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values
Trac Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values
12813: Uninitialized pointer read
Trac Ticket #412 - memberof performance enhancement
Trac Ticket #409 - Report during startup if nsslapd-cachememsize is too small
Coverity defects
Rich Megginson (362):
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
bump version to 1.2.11.1
Ticket #348 - crash in ldap_initialize with multiple threads
Ticket #351 - use betxn plugins by default
bump version to 1.2.11.2
Ticket #358 - managed entry doesn't delete linked entry
bump version to 1.2.11.3
Trac Ticket #359 - Database RUV could mismatch the one in changelog under the stress
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
bump version to 1.2.11.4
fix coverity issues with uninit vals, no return checking
Ticket #389 - ADD operations not in audit log
Ticket #360 - ldapmodify returns Operations error - fix delete caching
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
bump version to 1.2.11.5
bump version to 1.2.11.6
Ticket 378 - unhashed#user#password visible after changing password
bump version to 1.2.11.7
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
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 | 1
Makefile.am | 279
Makefile.in | 5303 -
README | 11
VERSION.sh | 7
aclocal.m4 | 6996 --
compile | 21
config.guess | 302
config.h.in | 25
config.sub | 232
configure |41959 +++++-------
configure.ac | 196
depcomp | 172
dirsrv.pc.in | 7
include/base/dbtbase.h | 2
include/base/file.h | 3
include/base/lexer.h | 126
include/base/rwlock.h | 91
include/i18n.h | 115
include/ldaputil/ldaputil.h | 10
include/libaccess/aclerror.h | 1
include/libaccess/aclproto.h | 15
include/libaccess/aclstruct.h | 2
include/libaccess/dbtlibaccess.h | 3
include/public/nsacl/aclapi.h | 7
install-sh | 517
ldap/admin/src/base-initconfig.in | 44
ldap/admin/src/initconfig.in | 37
ldap/admin/src/logconv.pl | 809
ldap/admin/src/scripts/10cleanupldapi.pl | 23
ldap/admin/src/scripts/10fixrundir.pl | 11
ldap/admin/src/scripts/50acctusabilityplugin.ldif | 21
ldap/admin/src/scripts/50automemberplugin.ldif | 15
ldap/admin/src/scripts/50fixNsState.pl | 240
ldap/admin/src/scripts/50managedentriesplugin.ldif | 16
ldap/admin/src/scripts/50refintprecedence.ldif | 4
ldap/admin/src/scripts/50smd5pwdstorageplugin.ldif | 5
ldap/admin/src/scripts/60upgradeschemafiles.pl | 2
ldap/admin/src/scripts/70upgradefromldif.pl | 108
ldap/admin/src/scripts/80upgradednformat.pl | 206
ldap/admin/src/scripts/81changelog.pl | 34
ldap/admin/src/scripts/90subtreerename.pl | 21
ldap/admin/src/scripts/91subtreereindex.pl | 148
ldap/admin/src/scripts/DSCreate.pm.in | 338
ldap/admin/src/scripts/DSDialogs.pm | 6
ldap/admin/src/scripts/DSMigration.pm.in | 47
ldap/admin/src/scripts/DSUpdate.pm.in | 50
ldap/admin/src/scripts/DSUtil.pm.in | 329
ldap/admin/src/scripts/DialogManager.pm | 241
ldap/admin/src/scripts/DialogManager.pm.in | 241
ldap/admin/src/scripts/Inf.pm | 67
ldap/admin/src/scripts/Migration.pm.in | 20
ldap/admin/src/scripts/Setup.pm.in | 20
ldap/admin/src/scripts/SetupDialogs.pm.in | 31
ldap/admin/src/scripts/SetupLog.pm | 8
ldap/admin/src/scripts/dnaplugindepends.ldif | 3
ldap/admin/src/scripts/ds-logpipe.py | 221
ldap/admin/src/scripts/exampleupdate.ldif | 2
ldap/admin/src/scripts/exampleupdate.sh | 10
ldap/admin/src/scripts/logregex.py | 16
ldap/admin/src/scripts/migrate-ds.pl.in | 13
ldap/admin/src/scripts/remove-ds.pl.in | 30
ldap/admin/src/scripts/repl-monitor.pl.in | 86
ldap/admin/src/scripts/restart-dirsrv.in | 25
ldap/admin/src/scripts/setup-ds.pl.in | 7
ldap/admin/src/scripts/setup-ds.res.in | 35
ldap/admin/src/scripts/start-dirsrv.in | 43
ldap/admin/src/scripts/stop-dirsrv.in | 27
ldap/admin/src/scripts/template-bak2db.in | 49
ldap/admin/src/scripts/template-bak2db.pl.in | 29
ldap/admin/src/scripts/template-cleanallruv.pl.in | 186
ldap/admin/src/scripts/template-db2bak.in | 53
ldap/admin/src/scripts/template-db2bak.pl.in | 29
ldap/admin/src/scripts/template-db2index.in | 14
ldap/admin/src/scripts/template-db2index.pl.in | 33
ldap/admin/src/scripts/template-db2ldif.in | 15
ldap/admin/src/scripts/template-db2ldif.pl.in | 29
ldap/admin/src/scripts/template-dbverify.in | 15
ldap/admin/src/scripts/template-dn2rdn.in | 25
ldap/admin/src/scripts/template-fixup-linkedattrs.pl.in | 29
ldap/admin/src/scripts/template-fixup-memberof.pl.in | 29
ldap/admin/src/scripts/template-ldif2db.in | 15
ldap/admin/src/scripts/template-ldif2db.pl.in | 29
ldap/admin/src/scripts/template-ldif2ldap.in | 19
ldap/admin/src/scripts/template-monitor.in | 19
ldap/admin/src/scripts/template-ns-accountstatus.pl.in | 33
ldap/admin/src/scripts/template-ns-activate.pl.in | 33
ldap/admin/src/scripts/template-ns-inactivate.pl.in | 33
ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in | 47
ldap/admin/src/scripts/template-restart-slapd.in | 2
ldap/admin/src/scripts/template-restoreconfig.in | 15
ldap/admin/src/scripts/template-saveconfig.in | 15
ldap/admin/src/scripts/template-schema-reload.pl.in | 29
ldap/admin/src/scripts/template-start-slapd.in | 3
ldap/admin/src/scripts/template-stop-slapd.in | 2
ldap/admin/src/scripts/template-suffix2instance.in | 15
ldap/admin/src/scripts/template-syntax-validate.pl.in | 29
ldap/admin/src/scripts/template-upgradedb.in | 15
ldap/admin/src/scripts/template-upgradednformat.in | 63
ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl.in | 29
ldap/admin/src/scripts/template-verify-db.pl.in | 19
ldap/admin/src/scripts/template-vlvindex.in | 15
ldap/admin/src/slapd.inf.in | 2
ldap/admin/src/template-initconfig.in | 18
ldap/docs/LICENSE.txt | 132
ldap/docs/README.txt | 11
ldap/include/ldaplog.h | 32
ldap/ldif/50replication-plugins.ldif | 26
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 | 107
ldap/ldif/template-suffix-db.ldif.in | 1
ldap/schema/00core.ldif | 72
ldap/schema/01core389.ldif | 24
ldap/schema/02common.ldif | 12
ldap/schema/05rfc4523.ldif | 14
ldap/schema/05rfc4524.ldif | 30
ldap/schema/06inetorgperson.ldif | 5
ldap/schema/10automember-plugin.ldif | 123
ldap/schema/10dna-plugin.ldif | 204
ldap/schema/10mep-plugin.ldif | 104
ldap/schema/30ns-common.ldif | 4
ldap/schema/50ns-directory.ldif | 4
ldap/schema/60acctpolicy.ldif | 47
ldap/schema/60nis.ldif | 2
ldap/schema/60pam-plugin.ldif | 3
ldap/schema/60qmail.ldif | 24
ldap/schema/60sabayon.ldif | 10
ldap/schema/60samba3.ldif | 34
ldap/schema/60sendmail.ldif | 54
ldap/schema/60sudo.ldif | 58
ldap/servers/plugins/acct_usability/acct_usability.c | 464
ldap/servers/plugins/acct_usability/acct_usability.h | 63
ldap/servers/plugins/acctpolicy/acct_config.c | 143
ldap/servers/plugins/acctpolicy/acct_init.c | 191
ldap/servers/plugins/acctpolicy/acct_plugin.c | 313
ldap/servers/plugins/acctpolicy/acct_util.c | 257
ldap/servers/plugins/acctpolicy/acctpolicy.h | 81
ldap/servers/plugins/acctpolicy/sampleconfig.ldif | 40
ldap/servers/plugins/acctpolicy/samplepolicy.ldif | 27
ldap/servers/plugins/acl/acl.c | 247
ldap/servers/plugins/acl/acl.h | 43
ldap/servers/plugins/acl/acl_ext.c | 152
ldap/servers/plugins/acl/aclanom.c | 24
ldap/servers/plugins/acl/acleffectiverights.c | 116
ldap/servers/plugins/acl/aclgroup.c | 19
ldap/servers/plugins/acl/aclinit.c | 2
ldap/servers/plugins/acl/acllas.c | 402
ldap/servers/plugins/acl/acllist.c | 79
ldap/servers/plugins/acl/aclparse.c | 615
ldap/servers/plugins/acl/aclplugin.c | 37
ldap/servers/plugins/acl/aclproxy.c | 232
ldap/servers/plugins/acl/aclutil.c | 117
ldap/servers/plugins/automember/automember.c | 2651
ldap/servers/plugins/automember/automember.h | 134
ldap/servers/plugins/bitwise/bitwise.c | 23
ldap/servers/plugins/chainingdb/cb.h | 8
ldap/servers/plugins/chainingdb/cb_add.c | 105
ldap/servers/plugins/chainingdb/cb_bind.c | 196
ldap/servers/plugins/chainingdb/cb_compare.c | 101
ldap/servers/plugins/chainingdb/cb_config.c | 34
ldap/servers/plugins/chainingdb/cb_conn_stateless.c | 102
ldap/servers/plugins/chainingdb/cb_controls.c | 36
ldap/servers/plugins/chainingdb/cb_delete.c | 125
ldap/servers/plugins/chainingdb/cb_init.c | 6
ldap/servers/plugins/chainingdb/cb_instance.c | 325
ldap/servers/plugins/chainingdb/cb_modify.c | 133
ldap/servers/plugins/chainingdb/cb_modrdn.c | 176
ldap/servers/plugins/chainingdb/cb_monitor.c | 6
ldap/servers/plugins/chainingdb/cb_schema.c | 4
ldap/servers/plugins/chainingdb/cb_search.c | 223
ldap/servers/plugins/chainingdb/cb_utils.c | 15
ldap/servers/plugins/collation/collate.c | 24
ldap/servers/plugins/collation/orfilter.c | 19
ldap/servers/plugins/cos/cos.c | 52
ldap/servers/plugins/cos/cos_cache.c | 768
ldap/servers/plugins/deref/deref.c | 16
ldap/servers/plugins/dna/dna.c | 1785
ldap/servers/plugins/http/http_impl.c | 81
ldap/servers/plugins/linkedattrs/fixup_task.c | 119
ldap/servers/plugins/linkedattrs/linked_attrs.c | 237
ldap/servers/plugins/linkedattrs/linked_attrs.h | 7
ldap/servers/plugins/memberof/memberof.c | 1075
ldap/servers/plugins/memberof/memberof.h | 11
ldap/servers/plugins/memberof/memberof_config.c | 275
ldap/servers/plugins/mep/mep.c | 2837
ldap/servers/plugins/mep/mep.h | 130
ldap/servers/plugins/pam_passthru/pam_passthru.h | 48
ldap/servers/plugins/pam_passthru/pam_ptconfig.c | 715
ldap/servers/plugins/pam_passthru/pam_ptimpl.c | 79
ldap/servers/plugins/pam_passthru/pam_ptpreop.c | 587
ldap/servers/plugins/passthru/passthru.h | 4
ldap/servers/plugins/passthru/ptbind.c | 6
ldap/servers/plugins/passthru/ptconfig.c | 43
ldap/servers/plugins/passthru/ptconn.c | 8
ldap/servers/plugins/passthru/ptpreop.c | 17
ldap/servers/plugins/pwdstorage/smd5_pwd.c | 9
ldap/servers/plugins/referint/referint.c | 776
ldap/servers/plugins/replication/cl4_api.c | 2
ldap/servers/plugins/replication/cl5.h | 1
ldap/servers/plugins/replication/cl5_api.c | 2712
ldap/servers/plugins/replication/cl5_api.h | 122
ldap/servers/plugins/replication/cl5_clcache.c | 71
ldap/servers/plugins/replication/cl5_clcache.h | 2
ldap/servers/plugins/replication/cl5_config.c | 247
ldap/servers/plugins/replication/cl5_init.c | 2
ldap/servers/plugins/replication/cl5_test.c | 2
ldap/servers/plugins/replication/cl_crypt.c | 203
ldap/servers/plugins/replication/cl_crypt.h | 53
ldap/servers/plugins/replication/csnpl.c | 74
ldap/servers/plugins/replication/legacy_consumer.c | 31
ldap/servers/plugins/replication/llist.c | 8
ldap/servers/plugins/replication/repl-session-plugin.h | 119
ldap/servers/plugins/replication/repl.h | 2
ldap/servers/plugins/replication/repl5.h | 132
ldap/servers/plugins/replication/repl5_agmt.c | 607
ldap/servers/plugins/replication/repl5_agmtlist.c | 132
ldap/servers/plugins/replication/repl5_connection.c | 194
ldap/servers/plugins/replication/repl5_inc_protocol.c | 1315
ldap/servers/plugins/replication/repl5_init.c | 138
ldap/servers/plugins/replication/repl5_mtnode_ext.c | 13
ldap/servers/plugins/replication/repl5_plugins.c | 206
ldap/servers/plugins/replication/repl5_prot_private.h | 4
ldap/servers/plugins/replication/repl5_protocol.c | 107
ldap/servers/plugins/replication/repl5_protocol_util.c | 563
ldap/servers/plugins/replication/repl5_replica.c | 865
ldap/servers/plugins/replication/repl5_replica_config.c | 2209
ldap/servers/plugins/replication/repl5_replica_dnhash.c | 26
ldap/servers/plugins/replication/repl5_replica_hash.c | 30
ldap/servers/plugins/replication/repl5_ruv.c | 496
ldap/servers/plugins/replication/repl5_ruv.h | 19
ldap/servers/plugins/replication/repl5_tot_protocol.c | 32
ldap/servers/plugins/replication/repl5_total.c | 22
ldap/servers/plugins/replication/repl5_updatedn_list.c | 2
ldap/servers/plugins/replication/repl_bind.c | 6
ldap/servers/plugins/replication/repl_compare.c | 18
ldap/servers/plugins/replication/repl_connext.c | 2
ldap/servers/plugins/replication/repl_controls.c | 2
ldap/servers/plugins/replication/repl_extop.c | 665
ldap/servers/plugins/replication/repl_globals.c | 9
ldap/servers/plugins/replication/repl_init.c | 1
ldap/servers/plugins/replication/repl_objset.c | 9
ldap/servers/plugins/replication/repl_session_plugin.c | 188
ldap/servers/plugins/replication/repl_shared.h | 17
ldap/servers/plugins/replication/replutil.c | 112
ldap/servers/plugins/replication/test_repl_session_plugin.c | 335
ldap/servers/plugins/replication/urp.c | 182
ldap/servers/plugins/replication/urp.h | 3
ldap/servers/plugins/replication/urp_glue.c | 9
ldap/servers/plugins/replication/urp_tombstone.c | 9
ldap/servers/plugins/replication/windows_connection.c | 165
ldap/servers/plugins/replication/windows_inc_protocol.c | 55
ldap/servers/plugins/replication/windows_private.c | 1450
ldap/servers/plugins/replication/windows_protocol_util.c | 890
ldap/servers/plugins/replication/windows_tot_protocol.c | 125
ldap/servers/plugins/replication/windowsrepl.h | 50
ldap/servers/plugins/replication/winsync-plugin.h | 495
ldap/servers/plugins/retrocl/retrocl.c | 51
ldap/servers/plugins/retrocl/retrocl.h | 2
ldap/servers/plugins/retrocl/retrocl_create.c | 13
ldap/servers/plugins/retrocl/retrocl_po.c | 20
ldap/servers/plugins/retrocl/retrocl_trim.c | 20
ldap/servers/plugins/rever/des.c | 72
ldap/servers/plugins/rever/rever.c | 8
ldap/servers/plugins/roles/roles_cache.c | 128
ldap/servers/plugins/roles/roles_plugin.c | 52
ldap/servers/plugins/rootdn_access/rootdn_access.c | 669
ldap/servers/plugins/rootdn_access/rootdn_access.h | 57
ldap/servers/plugins/schema_reload/schema_reload.c | 56
ldap/servers/plugins/shared/plugin-utils.h | 112
ldap/servers/plugins/shared/utils.c | 508
ldap/servers/plugins/statechange/statechange.c | 55
ldap/servers/plugins/syntaxes/bin.c | 142
ldap/servers/plugins/syntaxes/bitstring.c | 68
ldap/servers/plugins/syntaxes/ces.c | 172
ldap/servers/plugins/syntaxes/cis.c | 321
ldap/servers/plugins/syntaxes/deliverymethod.c | 32
ldap/servers/plugins/syntaxes/dn.c | 72
ldap/servers/plugins/syntaxes/facsimile.c | 32
ldap/servers/plugins/syntaxes/guide.c | 32
ldap/servers/plugins/syntaxes/int.c | 96
ldap/servers/plugins/syntaxes/nameoptuid.c | 73
ldap/servers/plugins/syntaxes/numericstring.c | 148
ldap/servers/plugins/syntaxes/sicis.c | 32
ldap/servers/plugins/syntaxes/string.c | 441
ldap/servers/plugins/syntaxes/syntax.h | 61
ldap/servers/plugins/syntaxes/syntax_common.c | 118
ldap/servers/plugins/syntaxes/tel.c | 94
ldap/servers/plugins/syntaxes/teletex.c | 32
ldap/servers/plugins/syntaxes/telex.c | 31
ldap/servers/plugins/syntaxes/validate.c | 17
ldap/servers/plugins/syntaxes/value.c | 120
ldap/servers/plugins/uiduniq/7bit.c | 76
ldap/servers/plugins/uiduniq/plugin-utils.h | 96
ldap/servers/plugins/uiduniq/uid.c | 368
ldap/servers/plugins/uiduniq/utils.c | 249
ldap/servers/plugins/usn/usn.c | 344
ldap/servers/plugins/usn/usn.h | 3
ldap/servers/plugins/usn/usn_cleanup.c | 44
ldap/servers/plugins/views/views.c | 36
ldap/servers/slapd/abandon.c | 8
ldap/servers/slapd/add.c | 257
ldap/servers/slapd/agtmmap.c | 56
ldap/servers/slapd/apibroker.c | 58
ldap/servers/slapd/attr.c | 163
ldap/servers/slapd/attrlist.c | 9
ldap/servers/slapd/attrsyntax.c | 143
ldap/servers/slapd/auditlog.c | 85
ldap/servers/slapd/auth.c | 95
ldap/servers/slapd/ava.c | 2
ldap/servers/slapd/back-ldbm/ancestorid.c | 104
ldap/servers/slapd/back-ldbm/archive.c | 91
ldap/servers/slapd/back-ldbm/back-ldbm.h | 108
ldap/servers/slapd/back-ldbm/backentry.c | 6
ldap/servers/slapd/back-ldbm/cache.c | 158
ldap/servers/slapd/back-ldbm/dbhelp.c | 18
ldap/servers/slapd/back-ldbm/dblayer.c | 2370
ldap/servers/slapd/back-ldbm/dblayer.h | 14
ldap/servers/slapd/back-ldbm/dbtest.c | 349
ldap/servers/slapd/back-ldbm/dbversion.c | 52
ldap/servers/slapd/back-ldbm/dn2entry.c | 63
ldap/servers/slapd/back-ldbm/filterindex.c | 259
ldap/servers/slapd/back-ldbm/findentry.c | 147
ldap/servers/slapd/back-ldbm/id2entry.c | 189
ldap/servers/slapd/back-ldbm/idl.c | 35
ldap/servers/slapd/back-ldbm/idl_common.c | 7
ldap/servers/slapd/back-ldbm/idl_new.c | 111
ldap/servers/slapd/back-ldbm/idl_shim.c | 17
ldap/servers/slapd/back-ldbm/import-merge.c | 28
ldap/servers/slapd/back-ldbm/import-threads.c | 1385
ldap/servers/slapd/back-ldbm/import.c | 403
ldap/servers/slapd/back-ldbm/import.h | 32
ldap/servers/slapd/back-ldbm/index.c | 346
ldap/servers/slapd/back-ldbm/init.c | 89
ldap/servers/slapd/back-ldbm/instance.c | 174
ldap/servers/slapd/back-ldbm/ldbm_add.c | 417
ldap/servers/slapd/back-ldbm/ldbm_attr.c | 392
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 986
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c | 2
ldap/servers/slapd/back-ldbm/ldbm_bind.c | 9
ldap/servers/slapd/back-ldbm/ldbm_compare.c | 9
ldap/servers/slapd/back-ldbm/ldbm_config.c | 321
ldap/servers/slapd/back-ldbm/ldbm_config.h | 9
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 617
ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c | 1582
ldap/servers/slapd/back-ldbm/ldbm_index_config.c | 668
ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 270
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 516
ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 708
ldap/servers/slapd/back-ldbm/ldbm_search.c | 427
ldap/servers/slapd/back-ldbm/ldbm_usn.c | 74
ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 792
ldap/servers/slapd/back-ldbm/matchrule.c | 50
ldap/servers/slapd/back-ldbm/misc.c | 300
ldap/servers/slapd/back-ldbm/monitor.c | 14
ldap/servers/slapd/back-ldbm/nextid.c | 17
ldap/servers/slapd/back-ldbm/parents.c | 141
ldap/servers/slapd/back-ldbm/perfctrs.c | 26
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 56
ldap/servers/slapd/back-ldbm/seq.c | 3
ldap/servers/slapd/back-ldbm/sort.c | 38
ldap/servers/slapd/back-ldbm/start.c | 100
ldap/servers/slapd/back-ldbm/upgrade.c | 56
ldap/servers/slapd/back-ldbm/vlv.c | 388
ldap/servers/slapd/back-ldbm/vlv_srch.c | 17
ldap/servers/slapd/back-ldbm/vlv_srch.h | 3
ldap/servers/slapd/back-ldif/back-ldif.h | 2
ldap/servers/slapd/back-ldif/modrdn.c | 12
ldap/servers/slapd/backend.c | 72
ldap/servers/slapd/backend_manager.c | 18
ldap/servers/slapd/bind.c | 365
ldap/servers/slapd/bulk_import.c | 39
ldap/servers/slapd/charray.c | 32
ldap/servers/slapd/compare.c | 43
ldap/servers/slapd/computed.c | 36
ldap/servers/slapd/config.c | 19
ldap/servers/slapd/configdse.c | 68
ldap/servers/slapd/connection.c | 204
ldap/servers/slapd/conntable.c | 3
ldap/servers/slapd/control.c | 26
ldap/servers/slapd/csn.c | 77
ldap/servers/slapd/csngen.c | 54
ldap/servers/slapd/csnset.c | 4
ldap/servers/slapd/daemon.c | 694
ldap/servers/slapd/delete.c | 128
ldap/servers/slapd/dn.c | 1561
ldap/servers/slapd/dse.c | 788
ldap/servers/slapd/dynalib.c | 29
ldap/servers/slapd/entry.c | 967
ldap/servers/slapd/entrywsi.c | 140
ldap/servers/slapd/eventq.c | 4
ldap/servers/slapd/extendop.c | 35
ldap/servers/slapd/factory.c | 1
ldap/servers/slapd/fe.h | 5
ldap/servers/slapd/fedse.c | 40
ldap/servers/slapd/filter.c | 141
ldap/servers/slapd/filter.h | 1
ldap/servers/slapd/filtercmp.c | 26
ldap/servers/slapd/filterentry.c | 36
ldap/servers/slapd/generation.c | 1
ldap/servers/slapd/index_subsystem.c | 28
ldap/servers/slapd/intrinsics.h | 7
ldap/servers/slapd/ldaputil.c | 892
ldap/servers/slapd/lenstr.c | 6
ldap/servers/slapd/libglobs.c | 1046
ldap/servers/slapd/libslapd.def | 1
ldap/servers/slapd/log.c | 171
ldap/servers/slapd/log.h | 20
ldap/servers/slapd/main.c | 291
ldap/servers/slapd/mapping_tree.c | 478
ldap/servers/slapd/match.c | 96
ldap/servers/slapd/modify.c | 540
ldap/servers/slapd/modrdn.c | 379
ldap/servers/slapd/modutil.c | 77
ldap/servers/slapd/operation.c | 38
ldap/servers/slapd/opshared.c | 411
ldap/servers/slapd/pagedresults.c | 581
ldap/servers/slapd/passwd_extop.c | 203
ldap/servers/slapd/pblock.c | 649
ldap/servers/slapd/plugin.c | 350
ldap/servers/slapd/plugin_acl.c | 24
ldap/servers/slapd/plugin_internal_op.c | 204
ldap/servers/slapd/plugin_mr.c | 474
ldap/servers/slapd/plugin_syntax.c | 442
ldap/servers/slapd/protect_db.c | 24
ldap/servers/slapd/protect_db.h | 7
ldap/servers/slapd/proto-slap.h | 127
ldap/servers/slapd/proxyauth.c | 246
ldap/servers/slapd/psearch.c | 76
ldap/servers/slapd/pw.c | 552
ldap/servers/slapd/pw.h | 7
ldap/servers/slapd/pw_mgmt.c | 162
ldap/servers/slapd/pw_retry.c | 121
ldap/servers/slapd/rdn.c | 141
ldap/servers/slapd/referral.c | 29
ldap/servers/slapd/regex.c | 31
ldap/servers/slapd/resourcelimit.c | 84
ldap/servers/slapd/result.c | 103
ldap/servers/slapd/rootdse.c | 12
ldap/servers/slapd/rwlock.c | 257
ldap/servers/slapd/rwlock.h | 65
ldap/servers/slapd/sasl_io.c | 167
ldap/servers/slapd/sasl_map.c | 63
ldap/servers/slapd/saslbind.c | 172
ldap/servers/slapd/schema.c | 219
ldap/servers/slapd/schemaparse.c | 13
ldap/servers/slapd/search.c | 92
ldap/servers/slapd/security_wrappers.c | 36
ldap/servers/slapd/slap.h | 251
ldap/servers/slapd/slapi-plugin-compat4.h | 6
ldap/servers/slapd/slapi-plugin.h | 1377
ldap/servers/slapd/slapi-private.h | 59
ldap/servers/slapd/slapi2nspr.c | 79
ldap/servers/slapd/slapi_counter.c | 24
ldap/servers/slapd/snmp_collator.c | 19
ldap/servers/slapd/sort.c | 9
ldap/servers/slapd/ssl.c | 323
ldap/servers/slapd/str2filter.c | 5
ldap/servers/slapd/task.c | 184
ldap/servers/slapd/test-plugins/testbind.c | 1
ldap/servers/slapd/test-plugins/testpostop.c | 1
ldap/servers/slapd/thread_data.c | 174
ldap/servers/slapd/time.c | 91
ldap/servers/slapd/tools/dbscan.c | 76
ldap/servers/slapd/tools/ldclt/data.c | 70
ldap/servers/slapd/tools/ldclt/ldapfct.c | 1149
ldap/servers/slapd/tools/ldclt/ldclt.c | 50
ldap/servers/slapd/tools/ldclt/ldclt.h | 3
ldap/servers/slapd/tools/ldclt/ldcltU.c | 24
ldap/servers/slapd/tools/ldclt/parser.c | 19
ldap/servers/slapd/tools/ldclt/scalab01.c | 190
ldap/servers/slapd/tools/ldclt/threadMain.c | 6
ldap/servers/slapd/tools/ldif.c | 4
ldap/servers/slapd/tools/mmldif.c | 9
ldap/servers/slapd/tools/pwenc.c | 2
ldap/servers/slapd/tools/rsearch/addthread.c | 51
ldap/servers/slapd/tools/rsearch/sdattable.c | 4
ldap/servers/slapd/tools/rsearch/searchthread.c | 94
ldap/servers/slapd/uniqueid.c | 99
ldap/servers/slapd/utf8compare.c | 25
ldap/servers/slapd/util.c | 357
ldap/servers/slapd/uuid.c | 22
ldap/servers/slapd/value.c | 62
ldap/servers/slapd/valueset.c | 75
ldap/servers/slapd/vattr.c | 115
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 | 26
ldap/servers/snmp/main.c | 12
ldap/servers/snmp/netscape-ldap.mib | 759
ldap/systools/idsktune.c | 100
lib/base/crit.cpp | 6
lib/base/ereport.cpp | 2
lib/base/file.cpp | 24
lib/base/lexer.cpp | 1015
lib/base/plist.cpp | 3
lib/base/pool.cpp | 10
lib/base/rwlock.cpp | 168
lib/base/util.cpp | 13
lib/ldaputil/cert.c | 4
lib/ldaputil/certmap.c | 409
lib/ldaputil/dbconf.c | 1
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 | 2
lib/libaccess/acl.tab.cpp | 25
lib/libaccess/aclcache.cpp | 105
lib/libaccess/aclflush.cpp | 1
lib/libaccess/aclpriv.h | 1
lib/libaccess/acltext.y | 4
lib/libaccess/acltools.cpp | 1896
lib/libaccess/aclutil.cpp | 13
lib/libaccess/authdb.cpp | 112
lib/libaccess/lasdns.cpp | 23
lib/libaccess/lasgroup.cpp | 10
lib/libaccess/lasip.cpp | 20
lib/libaccess/nseframe.cpp | 1
lib/libaccess/oneeval.cpp | 19
lib/libaccess/permhash.h | 11
lib/libaccess/register.cpp | 50
lib/libaccess/usrcache.cpp | 14
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/libadmin/error.c | 2
lib/libadmin/template.c | 2
lib/libadmin/util.c | 48
lib/libsi18n/coreres.c | 141
lib/libsi18n/coreres.h | 52
lib/libsi18n/getlang.c | 330
lib/libsi18n/getstrmem.c | 160
lib/libsi18n/getstrmem.h | 1
lib/libsi18n/getstrprop.c | 85
lib/libsi18n/makstrdb.c | 21
lib/libsi18n/propset.c | 442
lib/libsi18n/propset.h | 80
lib/libsi18n/reshash.c | 21
ltmain.sh |13199 ++-
m4/db.m4 | 27
m4/fhs.m4 | 4
m4/icu.m4 | 25
m4/kerberos.m4 | 4
m4/mozldap.m4 | 38
m4/netsnmp.m4 | 15
m4/nspr.m4 | 17
m4/nss.m4 | 17
m4/openldap.m4 | 30
m4/pcre.m4 | 28
m4/sasl.m4 | 25
m4/selinux.m4 | 13
m4/svrcore.m4 | 41
man/man1/cl-dump.1 | 18
man/man1/dbgen.pl.1 | 4
man/man1/infadd.1 | 8
man/man1/migratecred.1 | 6
man/man1/mmldif.1 | 4
man/man1/pwdhash.1 | 4
man/man1/repl-monitor.1 | 16
man/man8/ns-slapd.8 | 10
man/man8/remove-ds.pl.8 | 6
man/man8/restart-dirsrv.8 | 50
man/man8/setup-ds.pl.8 | 4
man/man8/start-dirsrv.8 | 50
man/man8/stop-dirsrv.8 | 50
missing | 104
selinux/dirsrv.fc.in | 2
selinux/dirsrv.if | 41
selinux/dirsrv.te | 11
wrappers/cl-dump.in | 11
wrappers/dbscan.in | 10
wrappers/infadd.in | 12
wrappers/initscript.in | 244
wrappers/ldap-agent-initscript.in | 20
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 | 11
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
632 files changed, 94880 insertions(+), 71717 deletions(-)
---
1
0
15 Aug '12
VERSION.sh | 2 +-
ldap/servers/plugins/replication/repl5_replica_config.c | 9 +++++++--
ldap/servers/plugins/replication/repl_extop.c | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit db6b3544755a109bed20a9c680f00ff777dcd42a
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Aug 15 11:27:47 2012 -0400
bumped version to 1.2.11.10
diff --git a/VERSION.sh b/VERSION.sh
index e96107e..e724679 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=2
-VERSION_MAINT=11.9
+VERSION_MAINT=11.10
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
commit c40902c872fab29922d8dca8f32dc18dabc7d936
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Aug 15 10:54:00 2012 -0400
Ticket 403 - CLEANALLRUV revisions
Addressed two issues:
[1] Need to handle case where rid was already cleaned
[2] Needed to improve closing sequence when repl agmts are not present
Reviewed by richm and noriko(Thanks!)
https://fedorahosted.org/389/ticket/403
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index a03740b..b408809 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -1451,6 +1451,7 @@ replica_cleanallruv_thread(void *arg)
int found_dirty_rid = 1;
int agmt_not_notified = 1;
int interval = 10;
+ int aborted = 0;
int free_obj = 0;
int rc = 0;
@@ -1491,7 +1492,7 @@ replica_cleanallruv_thread(void *arg)
ruv_obj = replica_get_ruv(data->replica);
ruv = object_get_data (ruv_obj);
while(data->maxcsn && !is_task_aborted(data->rid) && !is_cleaned_rid(data->rid) && !slapi_is_shutting_down()){
- if(csn_get_replicaid(data->maxcsn) == 0 || ruv_covers_csn(ruv,data->maxcsn)){
+ if(csn_get_replicaid(data->maxcsn) == 0 || ruv_covers_csn_strict(ruv,data->maxcsn)){
/* We are caught up, now we can clean the ruv's */
break;
}
@@ -1504,6 +1505,7 @@ replica_cleanallruv_thread(void *arg)
cleanruv_log(data->task, CLEANALLRUV_ID,"Waiting for all the replicas to be online...");
if(check_agmts_are_alive(data->replica, data->rid, data->task)){
/* error, aborted or shutdown */
+ aborted = 1;
goto done;
}
/*
@@ -1512,6 +1514,7 @@ replica_cleanallruv_thread(void *arg)
cleanruv_log(data->task, CLEANALLRUV_ID,"Waiting for all the replicas to receive all the deleted replica updates...");
if(check_agmts_are_caught_up(data->replica, data->rid, csnstr, data->task)){
/* error, aborted or shutdown */
+ aborted = 1;
goto done;
}
/*
@@ -1545,6 +1548,7 @@ replica_cleanallruv_thread(void *arg)
}
if(is_task_aborted(data->rid)){
+ aborted = 1;
goto done;
}
if(agmt_not_notified == 0){
@@ -1597,6 +1601,7 @@ replica_cleanallruv_thread(void *arg)
}
/* If the task is abort or everyone is cleaned, break out */
if(is_task_aborted(data->rid)){
+ aborted = 1;
goto done;
}
if(found_dirty_rid == 0){
@@ -1622,7 +1627,7 @@ done:
/*
* If the replicas are cleaned, release the rid, and trim the changelog
*/
- if(!found_dirty_rid){
+ if(!aborted){
trigger_cl_trimming(data->rid);
delete_cleaned_rid(data->replica, data->rid, data->maxcsn);
cleanruv_log(data->task, CLEANALLRUV_ID, "Successfully cleaned rid(%d).", data->rid);
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index db94ba7..ecf1f93 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -1618,7 +1618,7 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
break;
}
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: checking if we're caught up...\n");
- if(ruv_covers_csn(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
+ if(ruv_covers_csn_strict(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
/* We are caught up */
break;
} else {
1
0
ldap/servers/plugins/replication/repl5_replica_config.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 82d2c51f287c5623d4b957eebb4ed30a746eff7a
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Aug 15 10:30:28 2012 -0400
Ticket 403 - CLEANALLRUV - revision to last amendment
Fix Description: Needed to use an abort flag to correctly handle the finishing sequence
https://fedorahosted.org/389/ticket/403
Reviewed by: richm!
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index 65b060b..c8c746c 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -1450,9 +1450,9 @@ replica_cleanallruv_thread(void *arg)
char *rid_text = NULL;
int agmt_not_notified = 1;
int found_dirty_rid = 1;
- int agmt_count = 0;
int interval = 10;
int free_obj = 0;
+ int aborted = 0;
int rc = 0;
/*
@@ -1505,6 +1505,7 @@ replica_cleanallruv_thread(void *arg)
cleanruv_log(data->task, CLEANALLRUV_ID,"Waiting for all the replicas to be online...");
if(check_agmts_are_alive(data->replica, data->rid, data->task)){
/* error, aborted or shutdown */
+ aborted = 1;
goto done;
}
/*
@@ -1513,6 +1514,7 @@ replica_cleanallruv_thread(void *arg)
cleanruv_log(data->task, CLEANALLRUV_ID,"Waiting for all the replicas to receive all the deleted replica updates...");
if(check_agmts_are_caught_up(data->replica, data->rid, csnstr, data->task)){
/* error, aborted or shutdown */
+ aborted = 1;
goto done;
}
/*
@@ -1546,6 +1548,7 @@ replica_cleanallruv_thread(void *arg)
}
if(is_task_aborted(data->rid)){
+ aborted = 1;
goto done;
}
if(agmt_not_notified == 0){
@@ -1588,7 +1591,6 @@ replica_cleanallruv_thread(void *arg)
agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
continue;
}
- agmt_count++;
if(replica_cleanallruv_check_ruv(agmt, rid_text, data->task) == 0){
found_dirty_rid = 0;
} else {
@@ -1599,6 +1601,7 @@ replica_cleanallruv_thread(void *arg)
}
/* If the task is abort or everyone is cleaned, break out */
if(is_task_aborted(data->rid)){
+ aborted = 1;
goto done;
}
if(found_dirty_rid == 0){
@@ -1624,7 +1627,7 @@ done:
/*
* If the replicas are cleaned, release the rid, and trim the changelog
*/
- if(!found_dirty_rid || agmt_count == 0){
+ if(!aborted){
trigger_cl_trimming(data->rid);
delete_cleaned_rid(data->replica, data->rid, data->maxcsn);
cleanruv_log(data->task, CLEANALLRUV_ID, "Successfully cleaned rid(%d).", data->rid);
1
0
ldap/servers/plugins/replication/repl5_replica_config.c | 8 +++++---
ldap/servers/plugins/replication/repl_extop.c | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit df3a0a2675fba52ec8bb5b9548b326f714814b56
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Aug 14 19:03:31 2012 -0400
Ticket 403 - CLEANALLRUV amendment
Bug Description: If the replica the task is run on doesn't have any agmts, it doesn't
correctly finish the task. Also, on a second pass, if the rid was
already cleaned, you could get stuck in a loop(waiting for all the
deleted replica's changes to be applied).
Fix Description: Check how many agmts we process, if its zero, exit correctly. To fix
the loop use ruv_covers_csn_strict - this correctly handles rid's
that have already been cleaned.
https://fedorahosted.org/389/ticket/403
Reviewed by: Noriko!
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index a03740b..65b060b 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -1448,8 +1448,9 @@ replica_cleanallruv_thread(void *arg)
char csnstr[CSN_STRSIZE];
char *returntext = NULL;
char *rid_text = NULL;
- int found_dirty_rid = 1;
int agmt_not_notified = 1;
+ int found_dirty_rid = 1;
+ int agmt_count = 0;
int interval = 10;
int free_obj = 0;
int rc = 0;
@@ -1491,7 +1492,7 @@ replica_cleanallruv_thread(void *arg)
ruv_obj = replica_get_ruv(data->replica);
ruv = object_get_data (ruv_obj);
while(data->maxcsn && !is_task_aborted(data->rid) && !is_cleaned_rid(data->rid) && !slapi_is_shutting_down()){
- if(csn_get_replicaid(data->maxcsn) == 0 || ruv_covers_csn(ruv,data->maxcsn)){
+ if(csn_get_replicaid(data->maxcsn) == 0 || ruv_covers_csn_strict(ruv,data->maxcsn)){
/* We are caught up, now we can clean the ruv's */
break;
}
@@ -1587,6 +1588,7 @@ replica_cleanallruv_thread(void *arg)
agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
continue;
}
+ agmt_count++;
if(replica_cleanallruv_check_ruv(agmt, rid_text, data->task) == 0){
found_dirty_rid = 0;
} else {
@@ -1622,7 +1624,7 @@ done:
/*
* If the replicas are cleaned, release the rid, and trim the changelog
*/
- if(!found_dirty_rid){
+ if(!found_dirty_rid || agmt_count == 0){
trigger_cl_trimming(data->rid);
delete_cleaned_rid(data->replica, data->rid, data->maxcsn);
cleanruv_log(data->task, CLEANALLRUV_ID, "Successfully cleaned rid(%d).", data->rid);
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index db94ba7..ecf1f93 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -1618,7 +1618,7 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
break;
}
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: checking if we're caught up...\n");
- if(ruv_covers_csn(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
+ if(ruv_covers_csn_strict(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
/* We are caught up */
break;
} else {
1
0
ldap/servers/slapd/filter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3e0225096450ca65b38ab9ef43f35a70cd7b8fe2
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Tue Aug 7 18:08:23 2012 -0700
Ticket 328 - make sure all internal search filters are properly escaped
Fix description: In addition to de8fd7d0e596e4de885b4dda6bf5329469880c45,
val of LDAP_SUBSTRING_ANY also needs to be reset to "struct slapi_filter
*f" if the part of the filter is excaped.
diff --git a/ldap/servers/slapd/filter.c b/ldap/servers/slapd/filter.c
index 2b35936..325af41 100644
--- a/ldap/servers/slapd/filter.c
+++ b/ldap/servers/slapd/filter.c
@@ -525,12 +525,12 @@ get_substring_filter(
case LDAP_SUBSTRING_ANY:
LDAPDebug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );
- charray_add( &f->f_sub_any, val );
eval = (char*)slapi_escape_filter_value( val, -1);
if(eval){
slapi_ch_free_string(&val);
val = eval;
}
+ charray_add( &f->f_sub_any, val );
*fstr = slapi_ch_realloc( *fstr, strlen( *fstr ) +
strlen( val ) + 2 );
strcat( *fstr, "*" );
1
0
ldap/servers/slapd/filter.c | 2 ++
ldap/servers/slapd/util.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit de8fd7d0e596e4de885b4dda6bf5329469880c45
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Tue Aug 7 12:21:04 2012 -0700
Ticket 328 - make sure all internal search filters are properly escaped
Fix description:
Fixing double-free issues introduced with commit 3cf9a521fa43183c657a5dca507dec3a4379e383.
1) If ctx.buf is realloc'ed in filter_stuff_func, slapi_filter_sprintf
returns already freed buf. And the buf is freed by caller, again.
2) If filter escape occurs in get_substring_filter, freed val is
returned to caller via "struct slapi_filter *f" and it is freed
again.
diff --git a/ldap/servers/slapd/filter.c b/ldap/servers/slapd/filter.c
index 65e9de4..2b35936 100644
--- a/ldap/servers/slapd/filter.c
+++ b/ldap/servers/slapd/filter.c
@@ -516,6 +516,7 @@ get_substring_filter(
if(eval){
slapi_ch_free_string(&val);
val = eval;
+ f->f_sub_initial = val;
}
*fstr = slapi_ch_realloc( *fstr, strlen( *fstr ) +
strlen( val ) + 1 );
@@ -546,6 +547,7 @@ get_substring_filter(
if(eval){
slapi_ch_free_string(&val);
val = eval;
+ f->f_sub_final = val;
}
*fstr = slapi_ch_realloc( *fstr, strlen( *fstr ) +
strlen( val ) + 2 );
diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c
index fc399e7..a70910f 100644
--- a/ldap/servers/slapd/util.c
+++ b/ldap/servers/slapd/util.c
@@ -431,7 +431,7 @@ slapi_filter_sprintf(const char *fmt, ...)
}
va_end(args);
- return buf;
+ return ctx.buf;
}
/*
1
0
Changes since 389-ds-base-1.2.6.a1:
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
Mark Reynolds (65):
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 #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
Coverity Fix
Ticket 365 - passwords in clear text in the audit log
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 #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
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
bump version to 1.2.11.8 for offical release
Ticket 407 - dna memory leak - fix crash from prev fix
Bumped version to 1.2.11.9
Nathan Kinder (193):
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
Noriko Hosoi (338):
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
Trac Ticket #338 - letters in object's cn get converted to
Trac Ticket #359 - Database RUV could mismatch the one
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 #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values
Trac Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values
12813: Uninitialized pointer read
Trac Ticket #412 - memberof performance enhancement
Trac Ticket #409 - Report during startup if nsslapd-cachememsize is too small
Coverity defects
Rich Megginson (362):
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
bump version to 1.2.11.1
Ticket #348 - crash in ldap_initialize with multiple threads
Ticket #351 - use betxn plugins by default
bump version to 1.2.11.2
Ticket #358 - managed entry doesn't delete linked entry
bump version to 1.2.11.3
Trac Ticket #359 - Database RUV could mismatch the one in changelog under the stress
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
bump version to 1.2.11.4
fix coverity issues with uninit vals, no return checking
Ticket #389 - ADD operations not in audit log
Ticket #360 - ldapmodify returns Operations error - fix delete caching
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
bump version to 1.2.11.5
bump version to 1.2.11.6
Ticket 378 - unhashed#user#password visible after changing password
bump version to 1.2.11.7
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
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 | 1
Makefile.am | 279
Makefile.in | 5303 -
README | 11
VERSION.sh | 7
aclocal.m4 | 6996 --
compile | 21
config.guess | 302
config.h.in | 25
config.sub | 232
configure |41959 +++++-------
configure.ac | 196
depcomp | 172
dirsrv.pc.in | 7
include/base/dbtbase.h | 2
include/base/file.h | 3
include/base/lexer.h | 126
include/base/rwlock.h | 91
include/i18n.h | 115
include/ldaputil/ldaputil.h | 10
include/libaccess/aclerror.h | 1
include/libaccess/aclproto.h | 15
include/libaccess/aclstruct.h | 2
include/libaccess/dbtlibaccess.h | 3
include/public/nsacl/aclapi.h | 7
install-sh | 517
ldap/admin/src/base-initconfig.in | 44
ldap/admin/src/initconfig.in | 37
ldap/admin/src/logconv.pl | 809
ldap/admin/src/scripts/10cleanupldapi.pl | 23
ldap/admin/src/scripts/10fixrundir.pl | 11
ldap/admin/src/scripts/50acctusabilityplugin.ldif | 21
ldap/admin/src/scripts/50automemberplugin.ldif | 15
ldap/admin/src/scripts/50fixNsState.pl | 240
ldap/admin/src/scripts/50managedentriesplugin.ldif | 16
ldap/admin/src/scripts/50refintprecedence.ldif | 4
ldap/admin/src/scripts/50smd5pwdstorageplugin.ldif | 5
ldap/admin/src/scripts/60upgradeschemafiles.pl | 2
ldap/admin/src/scripts/70upgradefromldif.pl | 108
ldap/admin/src/scripts/80upgradednformat.pl | 206
ldap/admin/src/scripts/81changelog.pl | 34
ldap/admin/src/scripts/90subtreerename.pl | 21
ldap/admin/src/scripts/91subtreereindex.pl | 148
ldap/admin/src/scripts/DSCreate.pm.in | 338
ldap/admin/src/scripts/DSDialogs.pm | 6
ldap/admin/src/scripts/DSMigration.pm.in | 47
ldap/admin/src/scripts/DSUpdate.pm.in | 50
ldap/admin/src/scripts/DSUtil.pm.in | 329
ldap/admin/src/scripts/DialogManager.pm | 241
ldap/admin/src/scripts/DialogManager.pm.in | 241
ldap/admin/src/scripts/Inf.pm | 67
ldap/admin/src/scripts/Migration.pm.in | 20
ldap/admin/src/scripts/Setup.pm.in | 20
ldap/admin/src/scripts/SetupDialogs.pm.in | 31
ldap/admin/src/scripts/SetupLog.pm | 8
ldap/admin/src/scripts/dnaplugindepends.ldif | 3
ldap/admin/src/scripts/ds-logpipe.py | 221
ldap/admin/src/scripts/exampleupdate.ldif | 2
ldap/admin/src/scripts/exampleupdate.sh | 10
ldap/admin/src/scripts/logregex.py | 16
ldap/admin/src/scripts/migrate-ds.pl.in | 13
ldap/admin/src/scripts/remove-ds.pl.in | 30
ldap/admin/src/scripts/repl-monitor.pl.in | 86
ldap/admin/src/scripts/restart-dirsrv.in | 25
ldap/admin/src/scripts/setup-ds.pl.in | 7
ldap/admin/src/scripts/setup-ds.res.in | 35
ldap/admin/src/scripts/start-dirsrv.in | 43
ldap/admin/src/scripts/stop-dirsrv.in | 27
ldap/admin/src/scripts/template-bak2db.in | 49
ldap/admin/src/scripts/template-bak2db.pl.in | 29
ldap/admin/src/scripts/template-cleanallruv.pl.in | 186
ldap/admin/src/scripts/template-db2bak.in | 53
ldap/admin/src/scripts/template-db2bak.pl.in | 29
ldap/admin/src/scripts/template-db2index.in | 14
ldap/admin/src/scripts/template-db2index.pl.in | 33
ldap/admin/src/scripts/template-db2ldif.in | 15
ldap/admin/src/scripts/template-db2ldif.pl.in | 29
ldap/admin/src/scripts/template-dbverify.in | 15
ldap/admin/src/scripts/template-dn2rdn.in | 25
ldap/admin/src/scripts/template-fixup-linkedattrs.pl.in | 29
ldap/admin/src/scripts/template-fixup-memberof.pl.in | 29
ldap/admin/src/scripts/template-ldif2db.in | 15
ldap/admin/src/scripts/template-ldif2db.pl.in | 29
ldap/admin/src/scripts/template-ldif2ldap.in | 19
ldap/admin/src/scripts/template-monitor.in | 19
ldap/admin/src/scripts/template-ns-accountstatus.pl.in | 33
ldap/admin/src/scripts/template-ns-activate.pl.in | 33
ldap/admin/src/scripts/template-ns-inactivate.pl.in | 33
ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in | 47
ldap/admin/src/scripts/template-restart-slapd.in | 2
ldap/admin/src/scripts/template-restoreconfig.in | 15
ldap/admin/src/scripts/template-saveconfig.in | 15
ldap/admin/src/scripts/template-schema-reload.pl.in | 29
ldap/admin/src/scripts/template-start-slapd.in | 3
ldap/admin/src/scripts/template-stop-slapd.in | 2
ldap/admin/src/scripts/template-suffix2instance.in | 15
ldap/admin/src/scripts/template-syntax-validate.pl.in | 29
ldap/admin/src/scripts/template-upgradedb.in | 15
ldap/admin/src/scripts/template-upgradednformat.in | 63
ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl.in | 29
ldap/admin/src/scripts/template-verify-db.pl.in | 19
ldap/admin/src/scripts/template-vlvindex.in | 15
ldap/admin/src/slapd.inf.in | 2
ldap/admin/src/template-initconfig.in | 18
ldap/docs/LICENSE.txt | 132
ldap/docs/README.txt | 11
ldap/include/ldaplog.h | 32
ldap/ldif/50replication-plugins.ldif | 26
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 | 107
ldap/ldif/template-suffix-db.ldif.in | 1
ldap/schema/00core.ldif | 72
ldap/schema/01core389.ldif | 24
ldap/schema/02common.ldif | 12
ldap/schema/05rfc4523.ldif | 14
ldap/schema/05rfc4524.ldif | 30
ldap/schema/06inetorgperson.ldif | 5
ldap/schema/10automember-plugin.ldif | 123
ldap/schema/10dna-plugin.ldif | 204
ldap/schema/10mep-plugin.ldif | 104
ldap/schema/30ns-common.ldif | 4
ldap/schema/50ns-directory.ldif | 4
ldap/schema/60acctpolicy.ldif | 47
ldap/schema/60nis.ldif | 2
ldap/schema/60pam-plugin.ldif | 3
ldap/schema/60qmail.ldif | 24
ldap/schema/60sabayon.ldif | 10
ldap/schema/60samba3.ldif | 34
ldap/schema/60sendmail.ldif | 54
ldap/schema/60sudo.ldif | 58
ldap/servers/plugins/acct_usability/acct_usability.c | 464
ldap/servers/plugins/acct_usability/acct_usability.h | 63
ldap/servers/plugins/acctpolicy/acct_config.c | 143
ldap/servers/plugins/acctpolicy/acct_init.c | 191
ldap/servers/plugins/acctpolicy/acct_plugin.c | 313
ldap/servers/plugins/acctpolicy/acct_util.c | 257
ldap/servers/plugins/acctpolicy/acctpolicy.h | 81
ldap/servers/plugins/acctpolicy/sampleconfig.ldif | 40
ldap/servers/plugins/acctpolicy/samplepolicy.ldif | 27
ldap/servers/plugins/acl/acl.c | 247
ldap/servers/plugins/acl/acl.h | 43
ldap/servers/plugins/acl/acl_ext.c | 152
ldap/servers/plugins/acl/aclanom.c | 24
ldap/servers/plugins/acl/acleffectiverights.c | 116
ldap/servers/plugins/acl/aclgroup.c | 19
ldap/servers/plugins/acl/aclinit.c | 2
ldap/servers/plugins/acl/acllas.c | 402
ldap/servers/plugins/acl/acllist.c | 79
ldap/servers/plugins/acl/aclparse.c | 615
ldap/servers/plugins/acl/aclplugin.c | 37
ldap/servers/plugins/acl/aclproxy.c | 232
ldap/servers/plugins/acl/aclutil.c | 117
ldap/servers/plugins/automember/automember.c | 2651
ldap/servers/plugins/automember/automember.h | 134
ldap/servers/plugins/bitwise/bitwise.c | 23
ldap/servers/plugins/chainingdb/cb.h | 8
ldap/servers/plugins/chainingdb/cb_add.c | 105
ldap/servers/plugins/chainingdb/cb_bind.c | 196
ldap/servers/plugins/chainingdb/cb_compare.c | 101
ldap/servers/plugins/chainingdb/cb_config.c | 34
ldap/servers/plugins/chainingdb/cb_conn_stateless.c | 102
ldap/servers/plugins/chainingdb/cb_controls.c | 36
ldap/servers/plugins/chainingdb/cb_delete.c | 125
ldap/servers/plugins/chainingdb/cb_init.c | 6
ldap/servers/plugins/chainingdb/cb_instance.c | 325
ldap/servers/plugins/chainingdb/cb_modify.c | 133
ldap/servers/plugins/chainingdb/cb_modrdn.c | 176
ldap/servers/plugins/chainingdb/cb_monitor.c | 6
ldap/servers/plugins/chainingdb/cb_schema.c | 4
ldap/servers/plugins/chainingdb/cb_search.c | 223
ldap/servers/plugins/chainingdb/cb_utils.c | 15
ldap/servers/plugins/collation/collate.c | 24
ldap/servers/plugins/collation/orfilter.c | 19
ldap/servers/plugins/cos/cos.c | 52
ldap/servers/plugins/cos/cos_cache.c | 768
ldap/servers/plugins/deref/deref.c | 16
ldap/servers/plugins/dna/dna.c | 1785
ldap/servers/plugins/http/http_impl.c | 81
ldap/servers/plugins/linkedattrs/fixup_task.c | 119
ldap/servers/plugins/linkedattrs/linked_attrs.c | 237
ldap/servers/plugins/linkedattrs/linked_attrs.h | 7
ldap/servers/plugins/memberof/memberof.c | 1075
ldap/servers/plugins/memberof/memberof.h | 11
ldap/servers/plugins/memberof/memberof_config.c | 275
ldap/servers/plugins/mep/mep.c | 2837
ldap/servers/plugins/mep/mep.h | 130
ldap/servers/plugins/pam_passthru/pam_passthru.h | 48
ldap/servers/plugins/pam_passthru/pam_ptconfig.c | 715
ldap/servers/plugins/pam_passthru/pam_ptimpl.c | 79
ldap/servers/plugins/pam_passthru/pam_ptpreop.c | 587
ldap/servers/plugins/passthru/passthru.h | 4
ldap/servers/plugins/passthru/ptbind.c | 6
ldap/servers/plugins/passthru/ptconfig.c | 43
ldap/servers/plugins/passthru/ptconn.c | 8
ldap/servers/plugins/passthru/ptpreop.c | 17
ldap/servers/plugins/pwdstorage/smd5_pwd.c | 9
ldap/servers/plugins/referint/referint.c | 776
ldap/servers/plugins/replication/cl4_api.c | 2
ldap/servers/plugins/replication/cl5.h | 1
ldap/servers/plugins/replication/cl5_api.c | 2712
ldap/servers/plugins/replication/cl5_api.h | 122
ldap/servers/plugins/replication/cl5_clcache.c | 71
ldap/servers/plugins/replication/cl5_clcache.h | 2
ldap/servers/plugins/replication/cl5_config.c | 247
ldap/servers/plugins/replication/cl5_init.c | 2
ldap/servers/plugins/replication/cl5_test.c | 2
ldap/servers/plugins/replication/cl_crypt.c | 203
ldap/servers/plugins/replication/cl_crypt.h | 53
ldap/servers/plugins/replication/csnpl.c | 74
ldap/servers/plugins/replication/legacy_consumer.c | 31
ldap/servers/plugins/replication/llist.c | 8
ldap/servers/plugins/replication/repl-session-plugin.h | 119
ldap/servers/plugins/replication/repl.h | 2
ldap/servers/plugins/replication/repl5.h | 132
ldap/servers/plugins/replication/repl5_agmt.c | 607
ldap/servers/plugins/replication/repl5_agmtlist.c | 132
ldap/servers/plugins/replication/repl5_connection.c | 194
ldap/servers/plugins/replication/repl5_inc_protocol.c | 1315
ldap/servers/plugins/replication/repl5_init.c | 138
ldap/servers/plugins/replication/repl5_mtnode_ext.c | 13
ldap/servers/plugins/replication/repl5_plugins.c | 206
ldap/servers/plugins/replication/repl5_prot_private.h | 4
ldap/servers/plugins/replication/repl5_protocol.c | 107
ldap/servers/plugins/replication/repl5_protocol_util.c | 563
ldap/servers/plugins/replication/repl5_replica.c | 865
ldap/servers/plugins/replication/repl5_replica_config.c | 2204
ldap/servers/plugins/replication/repl5_replica_dnhash.c | 26
ldap/servers/plugins/replication/repl5_replica_hash.c | 30
ldap/servers/plugins/replication/repl5_ruv.c | 496
ldap/servers/plugins/replication/repl5_ruv.h | 19
ldap/servers/plugins/replication/repl5_tot_protocol.c | 32
ldap/servers/plugins/replication/repl5_total.c | 22
ldap/servers/plugins/replication/repl5_updatedn_list.c | 2
ldap/servers/plugins/replication/repl_bind.c | 6
ldap/servers/plugins/replication/repl_compare.c | 18
ldap/servers/plugins/replication/repl_connext.c | 2
ldap/servers/plugins/replication/repl_controls.c | 2
ldap/servers/plugins/replication/repl_extop.c | 665
ldap/servers/plugins/replication/repl_globals.c | 9
ldap/servers/plugins/replication/repl_init.c | 1
ldap/servers/plugins/replication/repl_objset.c | 9
ldap/servers/plugins/replication/repl_session_plugin.c | 188
ldap/servers/plugins/replication/repl_shared.h | 17
ldap/servers/plugins/replication/replutil.c | 112
ldap/servers/plugins/replication/test_repl_session_plugin.c | 335
ldap/servers/plugins/replication/urp.c | 182
ldap/servers/plugins/replication/urp.h | 3
ldap/servers/plugins/replication/urp_glue.c | 9
ldap/servers/plugins/replication/urp_tombstone.c | 9
ldap/servers/plugins/replication/windows_connection.c | 165
ldap/servers/plugins/replication/windows_inc_protocol.c | 55
ldap/servers/plugins/replication/windows_private.c | 1450
ldap/servers/plugins/replication/windows_protocol_util.c | 890
ldap/servers/plugins/replication/windows_tot_protocol.c | 125
ldap/servers/plugins/replication/windowsrepl.h | 50
ldap/servers/plugins/replication/winsync-plugin.h | 495
ldap/servers/plugins/retrocl/retrocl.c | 51
ldap/servers/plugins/retrocl/retrocl.h | 2
ldap/servers/plugins/retrocl/retrocl_create.c | 13
ldap/servers/plugins/retrocl/retrocl_po.c | 20
ldap/servers/plugins/retrocl/retrocl_trim.c | 20
ldap/servers/plugins/rever/des.c | 72
ldap/servers/plugins/rever/rever.c | 8
ldap/servers/plugins/roles/roles_cache.c | 128
ldap/servers/plugins/roles/roles_plugin.c | 52
ldap/servers/plugins/rootdn_access/rootdn_access.c | 669
ldap/servers/plugins/rootdn_access/rootdn_access.h | 57
ldap/servers/plugins/schema_reload/schema_reload.c | 56
ldap/servers/plugins/shared/plugin-utils.h | 112
ldap/servers/plugins/shared/utils.c | 508
ldap/servers/plugins/statechange/statechange.c | 55
ldap/servers/plugins/syntaxes/bin.c | 142
ldap/servers/plugins/syntaxes/bitstring.c | 68
ldap/servers/plugins/syntaxes/ces.c | 172
ldap/servers/plugins/syntaxes/cis.c | 321
ldap/servers/plugins/syntaxes/deliverymethod.c | 32
ldap/servers/plugins/syntaxes/dn.c | 72
ldap/servers/plugins/syntaxes/facsimile.c | 32
ldap/servers/plugins/syntaxes/guide.c | 32
ldap/servers/plugins/syntaxes/int.c | 96
ldap/servers/plugins/syntaxes/nameoptuid.c | 73
ldap/servers/plugins/syntaxes/numericstring.c | 148
ldap/servers/plugins/syntaxes/sicis.c | 32
ldap/servers/plugins/syntaxes/string.c | 441
ldap/servers/plugins/syntaxes/syntax.h | 61
ldap/servers/plugins/syntaxes/syntax_common.c | 118
ldap/servers/plugins/syntaxes/tel.c | 94
ldap/servers/plugins/syntaxes/teletex.c | 32
ldap/servers/plugins/syntaxes/telex.c | 31
ldap/servers/plugins/syntaxes/validate.c | 17
ldap/servers/plugins/syntaxes/value.c | 120
ldap/servers/plugins/uiduniq/7bit.c | 76
ldap/servers/plugins/uiduniq/plugin-utils.h | 96
ldap/servers/plugins/uiduniq/uid.c | 368
ldap/servers/plugins/uiduniq/utils.c | 249
ldap/servers/plugins/usn/usn.c | 344
ldap/servers/plugins/usn/usn.h | 3
ldap/servers/plugins/usn/usn_cleanup.c | 44
ldap/servers/plugins/views/views.c | 36
ldap/servers/slapd/abandon.c | 8
ldap/servers/slapd/add.c | 257
ldap/servers/slapd/agtmmap.c | 56
ldap/servers/slapd/apibroker.c | 58
ldap/servers/slapd/attr.c | 163
ldap/servers/slapd/attrlist.c | 9
ldap/servers/slapd/attrsyntax.c | 143
ldap/servers/slapd/auditlog.c | 85
ldap/servers/slapd/auth.c | 95
ldap/servers/slapd/ava.c | 2
ldap/servers/slapd/back-ldbm/ancestorid.c | 104
ldap/servers/slapd/back-ldbm/archive.c | 91
ldap/servers/slapd/back-ldbm/back-ldbm.h | 108
ldap/servers/slapd/back-ldbm/backentry.c | 6
ldap/servers/slapd/back-ldbm/cache.c | 158
ldap/servers/slapd/back-ldbm/dbhelp.c | 18
ldap/servers/slapd/back-ldbm/dblayer.c | 2370
ldap/servers/slapd/back-ldbm/dblayer.h | 14
ldap/servers/slapd/back-ldbm/dbtest.c | 349
ldap/servers/slapd/back-ldbm/dbversion.c | 52
ldap/servers/slapd/back-ldbm/dn2entry.c | 63
ldap/servers/slapd/back-ldbm/filterindex.c | 259
ldap/servers/slapd/back-ldbm/findentry.c | 147
ldap/servers/slapd/back-ldbm/id2entry.c | 189
ldap/servers/slapd/back-ldbm/idl.c | 35
ldap/servers/slapd/back-ldbm/idl_common.c | 7
ldap/servers/slapd/back-ldbm/idl_new.c | 111
ldap/servers/slapd/back-ldbm/idl_shim.c | 17
ldap/servers/slapd/back-ldbm/import-merge.c | 28
ldap/servers/slapd/back-ldbm/import-threads.c | 1385
ldap/servers/slapd/back-ldbm/import.c | 403
ldap/servers/slapd/back-ldbm/import.h | 32
ldap/servers/slapd/back-ldbm/index.c | 346
ldap/servers/slapd/back-ldbm/init.c | 89
ldap/servers/slapd/back-ldbm/instance.c | 174
ldap/servers/slapd/back-ldbm/ldbm_add.c | 417
ldap/servers/slapd/back-ldbm/ldbm_attr.c | 392
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 986
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c | 2
ldap/servers/slapd/back-ldbm/ldbm_bind.c | 9
ldap/servers/slapd/back-ldbm/ldbm_compare.c | 9
ldap/servers/slapd/back-ldbm/ldbm_config.c | 321
ldap/servers/slapd/back-ldbm/ldbm_config.h | 9
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 617
ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c | 1582
ldap/servers/slapd/back-ldbm/ldbm_index_config.c | 668
ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 270
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 516
ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 708
ldap/servers/slapd/back-ldbm/ldbm_search.c | 427
ldap/servers/slapd/back-ldbm/ldbm_usn.c | 74
ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 792
ldap/servers/slapd/back-ldbm/matchrule.c | 50
ldap/servers/slapd/back-ldbm/misc.c | 300
ldap/servers/slapd/back-ldbm/monitor.c | 14
ldap/servers/slapd/back-ldbm/nextid.c | 17
ldap/servers/slapd/back-ldbm/parents.c | 141
ldap/servers/slapd/back-ldbm/perfctrs.c | 26
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 56
ldap/servers/slapd/back-ldbm/seq.c | 3
ldap/servers/slapd/back-ldbm/sort.c | 38
ldap/servers/slapd/back-ldbm/start.c | 100
ldap/servers/slapd/back-ldbm/upgrade.c | 56
ldap/servers/slapd/back-ldbm/vlv.c | 388
ldap/servers/slapd/back-ldbm/vlv_srch.c | 17
ldap/servers/slapd/back-ldbm/vlv_srch.h | 3
ldap/servers/slapd/back-ldif/back-ldif.h | 2
ldap/servers/slapd/back-ldif/modrdn.c | 12
ldap/servers/slapd/backend.c | 72
ldap/servers/slapd/backend_manager.c | 18
ldap/servers/slapd/bind.c | 365
ldap/servers/slapd/bulk_import.c | 39
ldap/servers/slapd/charray.c | 32
ldap/servers/slapd/compare.c | 43
ldap/servers/slapd/computed.c | 36
ldap/servers/slapd/config.c | 19
ldap/servers/slapd/configdse.c | 68
ldap/servers/slapd/connection.c | 204
ldap/servers/slapd/conntable.c | 3
ldap/servers/slapd/control.c | 26
ldap/servers/slapd/csn.c | 77
ldap/servers/slapd/csngen.c | 54
ldap/servers/slapd/csnset.c | 4
ldap/servers/slapd/daemon.c | 694
ldap/servers/slapd/delete.c | 128
ldap/servers/slapd/dn.c | 1561
ldap/servers/slapd/dse.c | 788
ldap/servers/slapd/dynalib.c | 29
ldap/servers/slapd/entry.c | 967
ldap/servers/slapd/entrywsi.c | 140
ldap/servers/slapd/eventq.c | 4
ldap/servers/slapd/extendop.c | 35
ldap/servers/slapd/factory.c | 1
ldap/servers/slapd/fe.h | 5
ldap/servers/slapd/fedse.c | 40
ldap/servers/slapd/filter.c | 141
ldap/servers/slapd/filter.h | 1
ldap/servers/slapd/filtercmp.c | 26
ldap/servers/slapd/filterentry.c | 36
ldap/servers/slapd/generation.c | 1
ldap/servers/slapd/index_subsystem.c | 28
ldap/servers/slapd/intrinsics.h | 7
ldap/servers/slapd/ldaputil.c | 892
ldap/servers/slapd/lenstr.c | 6
ldap/servers/slapd/libglobs.c | 1046
ldap/servers/slapd/libslapd.def | 1
ldap/servers/slapd/log.c | 171
ldap/servers/slapd/log.h | 20
ldap/servers/slapd/main.c | 291
ldap/servers/slapd/mapping_tree.c | 478
ldap/servers/slapd/match.c | 96
ldap/servers/slapd/modify.c | 540
ldap/servers/slapd/modrdn.c | 379
ldap/servers/slapd/modutil.c | 77
ldap/servers/slapd/operation.c | 38
ldap/servers/slapd/opshared.c | 411
ldap/servers/slapd/pagedresults.c | 581
ldap/servers/slapd/passwd_extop.c | 203
ldap/servers/slapd/pblock.c | 649
ldap/servers/slapd/plugin.c | 350
ldap/servers/slapd/plugin_acl.c | 24
ldap/servers/slapd/plugin_internal_op.c | 204
ldap/servers/slapd/plugin_mr.c | 474
ldap/servers/slapd/plugin_syntax.c | 442
ldap/servers/slapd/protect_db.c | 24
ldap/servers/slapd/protect_db.h | 7
ldap/servers/slapd/proto-slap.h | 127
ldap/servers/slapd/proxyauth.c | 246
ldap/servers/slapd/psearch.c | 76
ldap/servers/slapd/pw.c | 552
ldap/servers/slapd/pw.h | 7
ldap/servers/slapd/pw_mgmt.c | 162
ldap/servers/slapd/pw_retry.c | 121
ldap/servers/slapd/rdn.c | 141
ldap/servers/slapd/referral.c | 29
ldap/servers/slapd/regex.c | 31
ldap/servers/slapd/resourcelimit.c | 84
ldap/servers/slapd/result.c | 103
ldap/servers/slapd/rootdse.c | 12
ldap/servers/slapd/rwlock.c | 257
ldap/servers/slapd/rwlock.h | 65
ldap/servers/slapd/sasl_io.c | 167
ldap/servers/slapd/sasl_map.c | 63
ldap/servers/slapd/saslbind.c | 172
ldap/servers/slapd/schema.c | 219
ldap/servers/slapd/schemaparse.c | 13
ldap/servers/slapd/search.c | 92
ldap/servers/slapd/security_wrappers.c | 36
ldap/servers/slapd/slap.h | 251
ldap/servers/slapd/slapi-plugin-compat4.h | 6
ldap/servers/slapd/slapi-plugin.h | 1377
ldap/servers/slapd/slapi-private.h | 59
ldap/servers/slapd/slapi2nspr.c | 79
ldap/servers/slapd/slapi_counter.c | 24
ldap/servers/slapd/snmp_collator.c | 19
ldap/servers/slapd/sort.c | 9
ldap/servers/slapd/ssl.c | 323
ldap/servers/slapd/str2filter.c | 5
ldap/servers/slapd/task.c | 184
ldap/servers/slapd/test-plugins/testbind.c | 1
ldap/servers/slapd/test-plugins/testpostop.c | 1
ldap/servers/slapd/thread_data.c | 174
ldap/servers/slapd/time.c | 91
ldap/servers/slapd/tools/dbscan.c | 76
ldap/servers/slapd/tools/ldclt/data.c | 70
ldap/servers/slapd/tools/ldclt/ldapfct.c | 1149
ldap/servers/slapd/tools/ldclt/ldclt.c | 50
ldap/servers/slapd/tools/ldclt/ldclt.h | 3
ldap/servers/slapd/tools/ldclt/ldcltU.c | 24
ldap/servers/slapd/tools/ldclt/parser.c | 19
ldap/servers/slapd/tools/ldclt/scalab01.c | 190
ldap/servers/slapd/tools/ldclt/threadMain.c | 6
ldap/servers/slapd/tools/ldif.c | 4
ldap/servers/slapd/tools/mmldif.c | 9
ldap/servers/slapd/tools/pwenc.c | 2
ldap/servers/slapd/tools/rsearch/addthread.c | 51
ldap/servers/slapd/tools/rsearch/sdattable.c | 4
ldap/servers/slapd/tools/rsearch/searchthread.c | 94
ldap/servers/slapd/uniqueid.c | 99
ldap/servers/slapd/utf8compare.c | 25
ldap/servers/slapd/util.c | 357
ldap/servers/slapd/uuid.c | 22
ldap/servers/slapd/value.c | 62
ldap/servers/slapd/valueset.c | 75
ldap/servers/slapd/vattr.c | 115
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 | 26
ldap/servers/snmp/main.c | 12
ldap/servers/snmp/netscape-ldap.mib | 759
ldap/systools/idsktune.c | 100
lib/base/crit.cpp | 6
lib/base/ereport.cpp | 2
lib/base/file.cpp | 24
lib/base/lexer.cpp | 1015
lib/base/plist.cpp | 3
lib/base/pool.cpp | 10
lib/base/rwlock.cpp | 168
lib/base/util.cpp | 13
lib/ldaputil/cert.c | 4
lib/ldaputil/certmap.c | 409
lib/ldaputil/dbconf.c | 1
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 | 2
lib/libaccess/acl.tab.cpp | 25
lib/libaccess/aclcache.cpp | 105
lib/libaccess/aclflush.cpp | 1
lib/libaccess/aclpriv.h | 1
lib/libaccess/acltext.y | 4
lib/libaccess/acltools.cpp | 1896
lib/libaccess/aclutil.cpp | 13
lib/libaccess/authdb.cpp | 112
lib/libaccess/lasdns.cpp | 23
lib/libaccess/lasgroup.cpp | 10
lib/libaccess/lasip.cpp | 20
lib/libaccess/nseframe.cpp | 1
lib/libaccess/oneeval.cpp | 19
lib/libaccess/permhash.h | 11
lib/libaccess/register.cpp | 50
lib/libaccess/usrcache.cpp | 14
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/libadmin/error.c | 2
lib/libadmin/template.c | 2
lib/libadmin/util.c | 48
lib/libsi18n/coreres.c | 141
lib/libsi18n/coreres.h | 52
lib/libsi18n/getlang.c | 330
lib/libsi18n/getstrmem.c | 160
lib/libsi18n/getstrmem.h | 1
lib/libsi18n/getstrprop.c | 85
lib/libsi18n/makstrdb.c | 21
lib/libsi18n/propset.c | 442
lib/libsi18n/propset.h | 80
lib/libsi18n/reshash.c | 21
ltmain.sh |13199 ++-
m4/db.m4 | 27
m4/fhs.m4 | 4
m4/icu.m4 | 25
m4/kerberos.m4 | 4
m4/mozldap.m4 | 38
m4/netsnmp.m4 | 15
m4/nspr.m4 | 17
m4/nss.m4 | 17
m4/openldap.m4 | 30
m4/pcre.m4 | 28
m4/sasl.m4 | 25
m4/selinux.m4 | 13
m4/svrcore.m4 | 41
man/man1/cl-dump.1 | 18
man/man1/dbgen.pl.1 | 4
man/man1/infadd.1 | 8
man/man1/migratecred.1 | 6
man/man1/mmldif.1 | 4
man/man1/pwdhash.1 | 4
man/man1/repl-monitor.1 | 16
man/man8/ns-slapd.8 | 10
man/man8/remove-ds.pl.8 | 6
man/man8/restart-dirsrv.8 | 50
man/man8/setup-ds.pl.8 | 4
man/man8/start-dirsrv.8 | 50
man/man8/stop-dirsrv.8 | 50
missing | 104
selinux/dirsrv.fc.in | 2
selinux/dirsrv.if | 41
selinux/dirsrv.te | 11
wrappers/cl-dump.in | 11
wrappers/dbscan.in | 10
wrappers/infadd.in | 12
wrappers/initscript.in | 244
wrappers/ldap-agent-initscript.in | 20
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 | 11
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
632 files changed, 94875 insertions(+), 71717 deletions(-)
---
1
0
07 Aug '12
VERSION.sh | 2 +-
ldap/servers/plugins/dna/dna.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ea05e69c129b593329a0fa6dc5250c3b4f6b2cbf
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Aug 6 15:59:52 2012 -0400
Bumped version to 1.2.11.9
diff --git a/VERSION.sh b/VERSION.sh
index 49c5310..e96107e 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=2
-VERSION_MAINT=11.8
+VERSION_MAINT=11.9
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
commit 4a6bcefa11a75e139d3f50a05a3c2e083f35a167
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Aug 6 15:49:49 2012 -0400
Ticket 407 - dna memory leak - fix crash from prev fix
Previous fix added a '&' to a pointer that should not have been added.
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
index 70d9c6b..34d67ab 100644
--- a/ldap/servers/plugins/dna/dna.c
+++ b/ldap/servers/plugins/dna/dna.c
@@ -3260,7 +3260,7 @@ dna_pre_op(Slapi_PBlock * pb, int modtype)
goto bail;
}
smods = slapi_mods_new();
- slapi_mods_init_passin(&smods, mods);
+ slapi_mods_init_passin(smods, mods);
}
/* For a MOD, we need to check the resulting entry */
1
0
ldap/servers/plugins/dna/dna.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 60316fc548f6bc6dd1c53f8133cdc302f2aecbd2
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Aug 6 15:34:55 2012 -0400
Ticket 407 - dna memory leak
One line change to fix crash. Had a '&' where it wasn't needed.
https://fedorahosted.org/389/ticket/407
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
index 70d9c6b..34d67ab 100644
--- a/ldap/servers/plugins/dna/dna.c
+++ b/ldap/servers/plugins/dna/dna.c
@@ -3260,7 +3260,7 @@ dna_pre_op(Slapi_PBlock * pb, int modtype)
goto bail;
}
smods = slapi_mods_new();
- slapi_mods_init_passin(&smods, mods);
+ slapi_mods_init_passin(smods, mods);
}
/* For a MOD, we need to check the resulting entry */
1
0
Changes since 389-ds-base-1.2.6.a1:
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
Mark Reynolds (62):
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 #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
Coverity Fix
Ticket 365 - passwords in clear text in the audit log
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 #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
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
Nathan Kinder (193):
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
Noriko Hosoi (338):
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
Trac Ticket #338 - letters in object's cn get converted to
Trac Ticket #359 - Database RUV could mismatch the one
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 #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values
Trac Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values
12813: Uninitialized pointer read
Trac Ticket #412 - memberof performance enhancement
Trac Ticket #409 - Report during startup if nsslapd-cachememsize is too small
Coverity defects
Rich Megginson (362):
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
bump version to 1.2.11.1
Ticket #348 - crash in ldap_initialize with multiple threads
Ticket #351 - use betxn plugins by default
bump version to 1.2.11.2
Ticket #358 - managed entry doesn't delete linked entry
bump version to 1.2.11.3
Trac Ticket #359 - Database RUV could mismatch the one in changelog under the stress
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
bump version to 1.2.11.4
fix coverity issues with uninit vals, no return checking
Ticket #389 - ADD operations not in audit log
Ticket #360 - ldapmodify returns Operations error - fix delete caching
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
bump version to 1.2.11.5
bump version to 1.2.11.6
Ticket 378 - unhashed#user#password visible after changing password
bump version to 1.2.11.7
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
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 | 1
Makefile.am | 279
Makefile.in | 5303 -
README | 11
VERSION.sh | 7
aclocal.m4 | 6996 --
compile | 21
config.guess | 302
config.h.in | 25
config.sub | 232
configure |41959 +++++-------
configure.ac | 196
depcomp | 172
dirsrv.pc.in | 7
include/base/dbtbase.h | 2
include/base/file.h | 3
include/base/lexer.h | 126
include/base/rwlock.h | 91
include/i18n.h | 115
include/ldaputil/ldaputil.h | 10
include/libaccess/aclerror.h | 1
include/libaccess/aclproto.h | 15
include/libaccess/aclstruct.h | 2
include/libaccess/dbtlibaccess.h | 3
include/public/nsacl/aclapi.h | 7
install-sh | 517
ldap/admin/src/base-initconfig.in | 44
ldap/admin/src/initconfig.in | 37
ldap/admin/src/logconv.pl | 809
ldap/admin/src/scripts/10cleanupldapi.pl | 23
ldap/admin/src/scripts/10fixrundir.pl | 11
ldap/admin/src/scripts/50acctusabilityplugin.ldif | 21
ldap/admin/src/scripts/50automemberplugin.ldif | 15
ldap/admin/src/scripts/50fixNsState.pl | 240
ldap/admin/src/scripts/50managedentriesplugin.ldif | 16
ldap/admin/src/scripts/50refintprecedence.ldif | 4
ldap/admin/src/scripts/50smd5pwdstorageplugin.ldif | 5
ldap/admin/src/scripts/60upgradeschemafiles.pl | 2
ldap/admin/src/scripts/70upgradefromldif.pl | 108
ldap/admin/src/scripts/80upgradednformat.pl | 206
ldap/admin/src/scripts/81changelog.pl | 34
ldap/admin/src/scripts/90subtreerename.pl | 21
ldap/admin/src/scripts/91subtreereindex.pl | 148
ldap/admin/src/scripts/DSCreate.pm.in | 338
ldap/admin/src/scripts/DSDialogs.pm | 6
ldap/admin/src/scripts/DSMigration.pm.in | 47
ldap/admin/src/scripts/DSUpdate.pm.in | 50
ldap/admin/src/scripts/DSUtil.pm.in | 329
ldap/admin/src/scripts/DialogManager.pm | 241
ldap/admin/src/scripts/DialogManager.pm.in | 241
ldap/admin/src/scripts/Inf.pm | 67
ldap/admin/src/scripts/Migration.pm.in | 20
ldap/admin/src/scripts/Setup.pm.in | 20
ldap/admin/src/scripts/SetupDialogs.pm.in | 31
ldap/admin/src/scripts/SetupLog.pm | 8
ldap/admin/src/scripts/dnaplugindepends.ldif | 3
ldap/admin/src/scripts/ds-logpipe.py | 221
ldap/admin/src/scripts/exampleupdate.ldif | 2
ldap/admin/src/scripts/exampleupdate.sh | 10
ldap/admin/src/scripts/logregex.py | 16
ldap/admin/src/scripts/migrate-ds.pl.in | 13
ldap/admin/src/scripts/remove-ds.pl.in | 30
ldap/admin/src/scripts/repl-monitor.pl.in | 86
ldap/admin/src/scripts/restart-dirsrv.in | 25
ldap/admin/src/scripts/setup-ds.pl.in | 7
ldap/admin/src/scripts/setup-ds.res.in | 35
ldap/admin/src/scripts/start-dirsrv.in | 43
ldap/admin/src/scripts/stop-dirsrv.in | 27
ldap/admin/src/scripts/template-bak2db.in | 49
ldap/admin/src/scripts/template-bak2db.pl.in | 29
ldap/admin/src/scripts/template-cleanallruv.pl.in | 186
ldap/admin/src/scripts/template-db2bak.in | 53
ldap/admin/src/scripts/template-db2bak.pl.in | 29
ldap/admin/src/scripts/template-db2index.in | 14
ldap/admin/src/scripts/template-db2index.pl.in | 33
ldap/admin/src/scripts/template-db2ldif.in | 15
ldap/admin/src/scripts/template-db2ldif.pl.in | 29
ldap/admin/src/scripts/template-dbverify.in | 15
ldap/admin/src/scripts/template-dn2rdn.in | 25
ldap/admin/src/scripts/template-fixup-linkedattrs.pl.in | 29
ldap/admin/src/scripts/template-fixup-memberof.pl.in | 29
ldap/admin/src/scripts/template-ldif2db.in | 15
ldap/admin/src/scripts/template-ldif2db.pl.in | 29
ldap/admin/src/scripts/template-ldif2ldap.in | 19
ldap/admin/src/scripts/template-monitor.in | 19
ldap/admin/src/scripts/template-ns-accountstatus.pl.in | 33
ldap/admin/src/scripts/template-ns-activate.pl.in | 33
ldap/admin/src/scripts/template-ns-inactivate.pl.in | 33
ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in | 47
ldap/admin/src/scripts/template-restart-slapd.in | 2
ldap/admin/src/scripts/template-restoreconfig.in | 15
ldap/admin/src/scripts/template-saveconfig.in | 15
ldap/admin/src/scripts/template-schema-reload.pl.in | 29
ldap/admin/src/scripts/template-start-slapd.in | 3
ldap/admin/src/scripts/template-stop-slapd.in | 2
ldap/admin/src/scripts/template-suffix2instance.in | 15
ldap/admin/src/scripts/template-syntax-validate.pl.in | 29
ldap/admin/src/scripts/template-upgradedb.in | 15
ldap/admin/src/scripts/template-upgradednformat.in | 63
ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl.in | 29
ldap/admin/src/scripts/template-verify-db.pl.in | 19
ldap/admin/src/scripts/template-vlvindex.in | 15
ldap/admin/src/slapd.inf.in | 2
ldap/admin/src/template-initconfig.in | 18
ldap/docs/LICENSE.txt | 132
ldap/docs/README.txt | 11
ldap/include/ldaplog.h | 32
ldap/ldif/50replication-plugins.ldif | 26
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 | 107
ldap/ldif/template-suffix-db.ldif.in | 1
ldap/schema/00core.ldif | 72
ldap/schema/01core389.ldif | 24
ldap/schema/02common.ldif | 12
ldap/schema/05rfc4523.ldif | 14
ldap/schema/05rfc4524.ldif | 30
ldap/schema/06inetorgperson.ldif | 5
ldap/schema/10automember-plugin.ldif | 123
ldap/schema/10dna-plugin.ldif | 204
ldap/schema/10mep-plugin.ldif | 104
ldap/schema/30ns-common.ldif | 4
ldap/schema/50ns-directory.ldif | 4
ldap/schema/60acctpolicy.ldif | 47
ldap/schema/60nis.ldif | 2
ldap/schema/60pam-plugin.ldif | 3
ldap/schema/60qmail.ldif | 24
ldap/schema/60sabayon.ldif | 10
ldap/schema/60samba3.ldif | 34
ldap/schema/60sendmail.ldif | 54
ldap/schema/60sudo.ldif | 58
ldap/servers/plugins/acct_usability/acct_usability.c | 464
ldap/servers/plugins/acct_usability/acct_usability.h | 63
ldap/servers/plugins/acctpolicy/acct_config.c | 143
ldap/servers/plugins/acctpolicy/acct_init.c | 191
ldap/servers/plugins/acctpolicy/acct_plugin.c | 313
ldap/servers/plugins/acctpolicy/acct_util.c | 257
ldap/servers/plugins/acctpolicy/acctpolicy.h | 81
ldap/servers/plugins/acctpolicy/sampleconfig.ldif | 40
ldap/servers/plugins/acctpolicy/samplepolicy.ldif | 27
ldap/servers/plugins/acl/acl.c | 247
ldap/servers/plugins/acl/acl.h | 43
ldap/servers/plugins/acl/acl_ext.c | 152
ldap/servers/plugins/acl/aclanom.c | 24
ldap/servers/plugins/acl/acleffectiverights.c | 116
ldap/servers/plugins/acl/aclgroup.c | 19
ldap/servers/plugins/acl/aclinit.c | 2
ldap/servers/plugins/acl/acllas.c | 402
ldap/servers/plugins/acl/acllist.c | 79
ldap/servers/plugins/acl/aclparse.c | 615
ldap/servers/plugins/acl/aclplugin.c | 37
ldap/servers/plugins/acl/aclproxy.c | 232
ldap/servers/plugins/acl/aclutil.c | 117
ldap/servers/plugins/automember/automember.c | 2651
ldap/servers/plugins/automember/automember.h | 134
ldap/servers/plugins/bitwise/bitwise.c | 23
ldap/servers/plugins/chainingdb/cb.h | 8
ldap/servers/plugins/chainingdb/cb_add.c | 105
ldap/servers/plugins/chainingdb/cb_bind.c | 196
ldap/servers/plugins/chainingdb/cb_compare.c | 101
ldap/servers/plugins/chainingdb/cb_config.c | 34
ldap/servers/plugins/chainingdb/cb_conn_stateless.c | 102
ldap/servers/plugins/chainingdb/cb_controls.c | 36
ldap/servers/plugins/chainingdb/cb_delete.c | 125
ldap/servers/plugins/chainingdb/cb_init.c | 6
ldap/servers/plugins/chainingdb/cb_instance.c | 325
ldap/servers/plugins/chainingdb/cb_modify.c | 133
ldap/servers/plugins/chainingdb/cb_modrdn.c | 176
ldap/servers/plugins/chainingdb/cb_monitor.c | 6
ldap/servers/plugins/chainingdb/cb_schema.c | 4
ldap/servers/plugins/chainingdb/cb_search.c | 223
ldap/servers/plugins/chainingdb/cb_utils.c | 15
ldap/servers/plugins/collation/collate.c | 24
ldap/servers/plugins/collation/orfilter.c | 19
ldap/servers/plugins/cos/cos.c | 52
ldap/servers/plugins/cos/cos_cache.c | 768
ldap/servers/plugins/deref/deref.c | 16
ldap/servers/plugins/dna/dna.c | 1785
ldap/servers/plugins/http/http_impl.c | 81
ldap/servers/plugins/linkedattrs/fixup_task.c | 119
ldap/servers/plugins/linkedattrs/linked_attrs.c | 237
ldap/servers/plugins/linkedattrs/linked_attrs.h | 7
ldap/servers/plugins/memberof/memberof.c | 1075
ldap/servers/plugins/memberof/memberof.h | 11
ldap/servers/plugins/memberof/memberof_config.c | 275
ldap/servers/plugins/mep/mep.c | 2837
ldap/servers/plugins/mep/mep.h | 130
ldap/servers/plugins/pam_passthru/pam_passthru.h | 48
ldap/servers/plugins/pam_passthru/pam_ptconfig.c | 715
ldap/servers/plugins/pam_passthru/pam_ptimpl.c | 79
ldap/servers/plugins/pam_passthru/pam_ptpreop.c | 587
ldap/servers/plugins/passthru/passthru.h | 4
ldap/servers/plugins/passthru/ptbind.c | 6
ldap/servers/plugins/passthru/ptconfig.c | 43
ldap/servers/plugins/passthru/ptconn.c | 8
ldap/servers/plugins/passthru/ptpreop.c | 17
ldap/servers/plugins/pwdstorage/smd5_pwd.c | 9
ldap/servers/plugins/referint/referint.c | 776
ldap/servers/plugins/replication/cl4_api.c | 2
ldap/servers/plugins/replication/cl5.h | 1
ldap/servers/plugins/replication/cl5_api.c | 2712
ldap/servers/plugins/replication/cl5_api.h | 122
ldap/servers/plugins/replication/cl5_clcache.c | 71
ldap/servers/plugins/replication/cl5_clcache.h | 2
ldap/servers/plugins/replication/cl5_config.c | 247
ldap/servers/plugins/replication/cl5_init.c | 2
ldap/servers/plugins/replication/cl5_test.c | 2
ldap/servers/plugins/replication/cl_crypt.c | 203
ldap/servers/plugins/replication/cl_crypt.h | 53
ldap/servers/plugins/replication/csnpl.c | 74
ldap/servers/plugins/replication/legacy_consumer.c | 31
ldap/servers/plugins/replication/llist.c | 8
ldap/servers/plugins/replication/repl-session-plugin.h | 119
ldap/servers/plugins/replication/repl.h | 2
ldap/servers/plugins/replication/repl5.h | 132
ldap/servers/plugins/replication/repl5_agmt.c | 607
ldap/servers/plugins/replication/repl5_agmtlist.c | 132
ldap/servers/plugins/replication/repl5_connection.c | 194
ldap/servers/plugins/replication/repl5_inc_protocol.c | 1315
ldap/servers/plugins/replication/repl5_init.c | 138
ldap/servers/plugins/replication/repl5_mtnode_ext.c | 13
ldap/servers/plugins/replication/repl5_plugins.c | 206
ldap/servers/plugins/replication/repl5_prot_private.h | 4
ldap/servers/plugins/replication/repl5_protocol.c | 107
ldap/servers/plugins/replication/repl5_protocol_util.c | 563
ldap/servers/plugins/replication/repl5_replica.c | 865
ldap/servers/plugins/replication/repl5_replica_config.c | 2204
ldap/servers/plugins/replication/repl5_replica_dnhash.c | 26
ldap/servers/plugins/replication/repl5_replica_hash.c | 30
ldap/servers/plugins/replication/repl5_ruv.c | 496
ldap/servers/plugins/replication/repl5_ruv.h | 19
ldap/servers/plugins/replication/repl5_tot_protocol.c | 32
ldap/servers/plugins/replication/repl5_total.c | 22
ldap/servers/plugins/replication/repl5_updatedn_list.c | 2
ldap/servers/plugins/replication/repl_bind.c | 6
ldap/servers/plugins/replication/repl_compare.c | 18
ldap/servers/plugins/replication/repl_connext.c | 2
ldap/servers/plugins/replication/repl_controls.c | 2
ldap/servers/plugins/replication/repl_extop.c | 665
ldap/servers/plugins/replication/repl_globals.c | 9
ldap/servers/plugins/replication/repl_init.c | 1
ldap/servers/plugins/replication/repl_objset.c | 9
ldap/servers/plugins/replication/repl_session_plugin.c | 188
ldap/servers/plugins/replication/repl_shared.h | 17
ldap/servers/plugins/replication/replutil.c | 112
ldap/servers/plugins/replication/test_repl_session_plugin.c | 335
ldap/servers/plugins/replication/urp.c | 182
ldap/servers/plugins/replication/urp.h | 3
ldap/servers/plugins/replication/urp_glue.c | 9
ldap/servers/plugins/replication/urp_tombstone.c | 9
ldap/servers/plugins/replication/windows_connection.c | 165
ldap/servers/plugins/replication/windows_inc_protocol.c | 55
ldap/servers/plugins/replication/windows_private.c | 1450
ldap/servers/plugins/replication/windows_protocol_util.c | 890
ldap/servers/plugins/replication/windows_tot_protocol.c | 125
ldap/servers/plugins/replication/windowsrepl.h | 50
ldap/servers/plugins/replication/winsync-plugin.h | 495
ldap/servers/plugins/retrocl/retrocl.c | 51
ldap/servers/plugins/retrocl/retrocl.h | 2
ldap/servers/plugins/retrocl/retrocl_create.c | 13
ldap/servers/plugins/retrocl/retrocl_po.c | 20
ldap/servers/plugins/retrocl/retrocl_trim.c | 20
ldap/servers/plugins/rever/des.c | 72
ldap/servers/plugins/rever/rever.c | 8
ldap/servers/plugins/roles/roles_cache.c | 128
ldap/servers/plugins/roles/roles_plugin.c | 52
ldap/servers/plugins/rootdn_access/rootdn_access.c | 669
ldap/servers/plugins/rootdn_access/rootdn_access.h | 57
ldap/servers/plugins/schema_reload/schema_reload.c | 56
ldap/servers/plugins/shared/plugin-utils.h | 112
ldap/servers/plugins/shared/utils.c | 508
ldap/servers/plugins/statechange/statechange.c | 55
ldap/servers/plugins/syntaxes/bin.c | 142
ldap/servers/plugins/syntaxes/bitstring.c | 68
ldap/servers/plugins/syntaxes/ces.c | 172
ldap/servers/plugins/syntaxes/cis.c | 321
ldap/servers/plugins/syntaxes/deliverymethod.c | 32
ldap/servers/plugins/syntaxes/dn.c | 72
ldap/servers/plugins/syntaxes/facsimile.c | 32
ldap/servers/plugins/syntaxes/guide.c | 32
ldap/servers/plugins/syntaxes/int.c | 96
ldap/servers/plugins/syntaxes/nameoptuid.c | 73
ldap/servers/plugins/syntaxes/numericstring.c | 148
ldap/servers/plugins/syntaxes/sicis.c | 32
ldap/servers/plugins/syntaxes/string.c | 441
ldap/servers/plugins/syntaxes/syntax.h | 61
ldap/servers/plugins/syntaxes/syntax_common.c | 118
ldap/servers/plugins/syntaxes/tel.c | 94
ldap/servers/plugins/syntaxes/teletex.c | 32
ldap/servers/plugins/syntaxes/telex.c | 31
ldap/servers/plugins/syntaxes/validate.c | 17
ldap/servers/plugins/syntaxes/value.c | 120
ldap/servers/plugins/uiduniq/7bit.c | 76
ldap/servers/plugins/uiduniq/plugin-utils.h | 96
ldap/servers/plugins/uiduniq/uid.c | 368
ldap/servers/plugins/uiduniq/utils.c | 249
ldap/servers/plugins/usn/usn.c | 344
ldap/servers/plugins/usn/usn.h | 3
ldap/servers/plugins/usn/usn_cleanup.c | 44
ldap/servers/plugins/views/views.c | 36
ldap/servers/slapd/abandon.c | 8
ldap/servers/slapd/add.c | 257
ldap/servers/slapd/agtmmap.c | 56
ldap/servers/slapd/apibroker.c | 58
ldap/servers/slapd/attr.c | 163
ldap/servers/slapd/attrlist.c | 9
ldap/servers/slapd/attrsyntax.c | 143
ldap/servers/slapd/auditlog.c | 85
ldap/servers/slapd/auth.c | 95
ldap/servers/slapd/ava.c | 2
ldap/servers/slapd/back-ldbm/ancestorid.c | 104
ldap/servers/slapd/back-ldbm/archive.c | 91
ldap/servers/slapd/back-ldbm/back-ldbm.h | 108
ldap/servers/slapd/back-ldbm/backentry.c | 6
ldap/servers/slapd/back-ldbm/cache.c | 158
ldap/servers/slapd/back-ldbm/dbhelp.c | 18
ldap/servers/slapd/back-ldbm/dblayer.c | 2370
ldap/servers/slapd/back-ldbm/dblayer.h | 14
ldap/servers/slapd/back-ldbm/dbtest.c | 349
ldap/servers/slapd/back-ldbm/dbversion.c | 52
ldap/servers/slapd/back-ldbm/dn2entry.c | 63
ldap/servers/slapd/back-ldbm/filterindex.c | 259
ldap/servers/slapd/back-ldbm/findentry.c | 147
ldap/servers/slapd/back-ldbm/id2entry.c | 189
ldap/servers/slapd/back-ldbm/idl.c | 35
ldap/servers/slapd/back-ldbm/idl_common.c | 7
ldap/servers/slapd/back-ldbm/idl_new.c | 111
ldap/servers/slapd/back-ldbm/idl_shim.c | 17
ldap/servers/slapd/back-ldbm/import-merge.c | 28
ldap/servers/slapd/back-ldbm/import-threads.c | 1385
ldap/servers/slapd/back-ldbm/import.c | 403
ldap/servers/slapd/back-ldbm/import.h | 32
ldap/servers/slapd/back-ldbm/index.c | 346
ldap/servers/slapd/back-ldbm/init.c | 89
ldap/servers/slapd/back-ldbm/instance.c | 174
ldap/servers/slapd/back-ldbm/ldbm_add.c | 417
ldap/servers/slapd/back-ldbm/ldbm_attr.c | 392
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 986
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c | 2
ldap/servers/slapd/back-ldbm/ldbm_bind.c | 9
ldap/servers/slapd/back-ldbm/ldbm_compare.c | 9
ldap/servers/slapd/back-ldbm/ldbm_config.c | 321
ldap/servers/slapd/back-ldbm/ldbm_config.h | 9
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 617
ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c | 1582
ldap/servers/slapd/back-ldbm/ldbm_index_config.c | 668
ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 270
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 516
ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 708
ldap/servers/slapd/back-ldbm/ldbm_search.c | 427
ldap/servers/slapd/back-ldbm/ldbm_usn.c | 74
ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 792
ldap/servers/slapd/back-ldbm/matchrule.c | 50
ldap/servers/slapd/back-ldbm/misc.c | 300
ldap/servers/slapd/back-ldbm/monitor.c | 14
ldap/servers/slapd/back-ldbm/nextid.c | 17
ldap/servers/slapd/back-ldbm/parents.c | 141
ldap/servers/slapd/back-ldbm/perfctrs.c | 26
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 56
ldap/servers/slapd/back-ldbm/seq.c | 3
ldap/servers/slapd/back-ldbm/sort.c | 38
ldap/servers/slapd/back-ldbm/start.c | 100
ldap/servers/slapd/back-ldbm/upgrade.c | 56
ldap/servers/slapd/back-ldbm/vlv.c | 388
ldap/servers/slapd/back-ldbm/vlv_srch.c | 17
ldap/servers/slapd/back-ldbm/vlv_srch.h | 3
ldap/servers/slapd/back-ldif/back-ldif.h | 2
ldap/servers/slapd/back-ldif/modrdn.c | 12
ldap/servers/slapd/backend.c | 72
ldap/servers/slapd/backend_manager.c | 18
ldap/servers/slapd/bind.c | 365
ldap/servers/slapd/bulk_import.c | 39
ldap/servers/slapd/charray.c | 32
ldap/servers/slapd/compare.c | 43
ldap/servers/slapd/computed.c | 36
ldap/servers/slapd/config.c | 19
ldap/servers/slapd/configdse.c | 68
ldap/servers/slapd/connection.c | 204
ldap/servers/slapd/conntable.c | 3
ldap/servers/slapd/control.c | 26
ldap/servers/slapd/csn.c | 77
ldap/servers/slapd/csngen.c | 54
ldap/servers/slapd/csnset.c | 4
ldap/servers/slapd/daemon.c | 694
ldap/servers/slapd/delete.c | 128
ldap/servers/slapd/dn.c | 1561
ldap/servers/slapd/dse.c | 788
ldap/servers/slapd/dynalib.c | 29
ldap/servers/slapd/entry.c | 967
ldap/servers/slapd/entrywsi.c | 140
ldap/servers/slapd/eventq.c | 4
ldap/servers/slapd/extendop.c | 35
ldap/servers/slapd/factory.c | 1
ldap/servers/slapd/fe.h | 5
ldap/servers/slapd/fedse.c | 40
ldap/servers/slapd/filter.c | 141
ldap/servers/slapd/filter.h | 1
ldap/servers/slapd/filtercmp.c | 26
ldap/servers/slapd/filterentry.c | 36
ldap/servers/slapd/generation.c | 1
ldap/servers/slapd/index_subsystem.c | 28
ldap/servers/slapd/intrinsics.h | 7
ldap/servers/slapd/ldaputil.c | 892
ldap/servers/slapd/lenstr.c | 6
ldap/servers/slapd/libglobs.c | 1046
ldap/servers/slapd/libslapd.def | 1
ldap/servers/slapd/log.c | 171
ldap/servers/slapd/log.h | 20
ldap/servers/slapd/main.c | 291
ldap/servers/slapd/mapping_tree.c | 478
ldap/servers/slapd/match.c | 96
ldap/servers/slapd/modify.c | 540
ldap/servers/slapd/modrdn.c | 379
ldap/servers/slapd/modutil.c | 77
ldap/servers/slapd/operation.c | 38
ldap/servers/slapd/opshared.c | 411
ldap/servers/slapd/pagedresults.c | 581
ldap/servers/slapd/passwd_extop.c | 203
ldap/servers/slapd/pblock.c | 649
ldap/servers/slapd/plugin.c | 350
ldap/servers/slapd/plugin_acl.c | 24
ldap/servers/slapd/plugin_internal_op.c | 204
ldap/servers/slapd/plugin_mr.c | 474
ldap/servers/slapd/plugin_syntax.c | 442
ldap/servers/slapd/protect_db.c | 24
ldap/servers/slapd/protect_db.h | 7
ldap/servers/slapd/proto-slap.h | 127
ldap/servers/slapd/proxyauth.c | 246
ldap/servers/slapd/psearch.c | 76
ldap/servers/slapd/pw.c | 552
ldap/servers/slapd/pw.h | 7
ldap/servers/slapd/pw_mgmt.c | 162
ldap/servers/slapd/pw_retry.c | 121
ldap/servers/slapd/rdn.c | 141
ldap/servers/slapd/referral.c | 29
ldap/servers/slapd/regex.c | 31
ldap/servers/slapd/resourcelimit.c | 84
ldap/servers/slapd/result.c | 103
ldap/servers/slapd/rootdse.c | 12
ldap/servers/slapd/rwlock.c | 257
ldap/servers/slapd/rwlock.h | 65
ldap/servers/slapd/sasl_io.c | 167
ldap/servers/slapd/sasl_map.c | 63
ldap/servers/slapd/saslbind.c | 172
ldap/servers/slapd/schema.c | 219
ldap/servers/slapd/schemaparse.c | 13
ldap/servers/slapd/search.c | 92
ldap/servers/slapd/security_wrappers.c | 36
ldap/servers/slapd/slap.h | 251
ldap/servers/slapd/slapi-plugin-compat4.h | 6
ldap/servers/slapd/slapi-plugin.h | 1377
ldap/servers/slapd/slapi-private.h | 59
ldap/servers/slapd/slapi2nspr.c | 79
ldap/servers/slapd/slapi_counter.c | 24
ldap/servers/slapd/snmp_collator.c | 19
ldap/servers/slapd/sort.c | 9
ldap/servers/slapd/ssl.c | 323
ldap/servers/slapd/str2filter.c | 5
ldap/servers/slapd/task.c | 184
ldap/servers/slapd/test-plugins/testbind.c | 1
ldap/servers/slapd/test-plugins/testpostop.c | 1
ldap/servers/slapd/thread_data.c | 174
ldap/servers/slapd/time.c | 91
ldap/servers/slapd/tools/dbscan.c | 76
ldap/servers/slapd/tools/ldclt/data.c | 70
ldap/servers/slapd/tools/ldclt/ldapfct.c | 1149
ldap/servers/slapd/tools/ldclt/ldclt.c | 50
ldap/servers/slapd/tools/ldclt/ldclt.h | 3
ldap/servers/slapd/tools/ldclt/ldcltU.c | 24
ldap/servers/slapd/tools/ldclt/parser.c | 19
ldap/servers/slapd/tools/ldclt/scalab01.c | 190
ldap/servers/slapd/tools/ldclt/threadMain.c | 6
ldap/servers/slapd/tools/ldif.c | 4
ldap/servers/slapd/tools/mmldif.c | 9
ldap/servers/slapd/tools/pwenc.c | 2
ldap/servers/slapd/tools/rsearch/addthread.c | 51
ldap/servers/slapd/tools/rsearch/sdattable.c | 4
ldap/servers/slapd/tools/rsearch/searchthread.c | 94
ldap/servers/slapd/uniqueid.c | 99
ldap/servers/slapd/utf8compare.c | 25
ldap/servers/slapd/util.c | 357
ldap/servers/slapd/uuid.c | 22
ldap/servers/slapd/value.c | 62
ldap/servers/slapd/valueset.c | 75
ldap/servers/slapd/vattr.c | 115
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 | 26
ldap/servers/snmp/main.c | 12
ldap/servers/snmp/netscape-ldap.mib | 759
ldap/systools/idsktune.c | 100
lib/base/crit.cpp | 6
lib/base/ereport.cpp | 2
lib/base/file.cpp | 24
lib/base/lexer.cpp | 1015
lib/base/plist.cpp | 3
lib/base/pool.cpp | 10
lib/base/rwlock.cpp | 168
lib/base/util.cpp | 13
lib/ldaputil/cert.c | 4
lib/ldaputil/certmap.c | 409
lib/ldaputil/dbconf.c | 1
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 | 2
lib/libaccess/acl.tab.cpp | 25
lib/libaccess/aclcache.cpp | 105
lib/libaccess/aclflush.cpp | 1
lib/libaccess/aclpriv.h | 1
lib/libaccess/acltext.y | 4
lib/libaccess/acltools.cpp | 1896
lib/libaccess/aclutil.cpp | 13
lib/libaccess/authdb.cpp | 112
lib/libaccess/lasdns.cpp | 23
lib/libaccess/lasgroup.cpp | 10
lib/libaccess/lasip.cpp | 20
lib/libaccess/nseframe.cpp | 1
lib/libaccess/oneeval.cpp | 19
lib/libaccess/permhash.h | 11
lib/libaccess/register.cpp | 50
lib/libaccess/usrcache.cpp | 14
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/libadmin/error.c | 2
lib/libadmin/template.c | 2
lib/libadmin/util.c | 48
lib/libsi18n/coreres.c | 141
lib/libsi18n/coreres.h | 52
lib/libsi18n/getlang.c | 330
lib/libsi18n/getstrmem.c | 160
lib/libsi18n/getstrmem.h | 1
lib/libsi18n/getstrprop.c | 85
lib/libsi18n/makstrdb.c | 21
lib/libsi18n/propset.c | 442
lib/libsi18n/propset.h | 80
lib/libsi18n/reshash.c | 21
ltmain.sh |13199 ++-
m4/db.m4 | 27
m4/fhs.m4 | 4
m4/icu.m4 | 25
m4/kerberos.m4 | 4
m4/mozldap.m4 | 38
m4/netsnmp.m4 | 15
m4/nspr.m4 | 17
m4/nss.m4 | 17
m4/openldap.m4 | 30
m4/pcre.m4 | 28
m4/sasl.m4 | 25
m4/selinux.m4 | 13
m4/svrcore.m4 | 41
man/man1/cl-dump.1 | 18
man/man1/dbgen.pl.1 | 4
man/man1/infadd.1 | 8
man/man1/migratecred.1 | 6
man/man1/mmldif.1 | 4
man/man1/pwdhash.1 | 4
man/man1/repl-monitor.1 | 16
man/man8/ns-slapd.8 | 10
man/man8/remove-ds.pl.8 | 6
man/man8/restart-dirsrv.8 | 50
man/man8/setup-ds.pl.8 | 4
man/man8/start-dirsrv.8 | 50
man/man8/stop-dirsrv.8 | 50
missing | 104
selinux/dirsrv.fc.in | 2
selinux/dirsrv.if | 41
selinux/dirsrv.te | 11
wrappers/cl-dump.in | 11
wrappers/dbscan.in | 10
wrappers/infadd.in | 12
wrappers/initscript.in | 244
wrappers/ldap-agent-initscript.in | 20
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 | 11
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
632 files changed, 94875 insertions(+), 71717 deletions(-)
---
1
0
VERSION.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ddcf669337dfcc0498c2626b6b2b5080419c6d0f
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Fri Aug 3 16:08:34 2012 -0400
bump version to 1.2.11.8 for offical release
diff --git a/VERSION.sh b/VERSION.sh
index 50bfbe8..49c5310 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=2
-VERSION_MAINT=11.7
+VERSION_MAINT=11.8
# 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/memberof/memberof.c | 29 +++++++++++++++++++++--------
ldap/servers/slapd/util.c | 14 +++++---------
2 files changed, 26 insertions(+), 17 deletions(-)
New commits:
commit 52e15071bc98cc66edc47838d986c9803e1479bf
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Fri Aug 3 15:02:46 2012 -0400
Misc Coverity Fixes
Reviewed by: richm(Thanks Rich!)
diff --git a/ldap/servers/plugins/memberof/memberof.c b/ldap/servers/plugins/memberof/memberof.c
index a69dd16..2ca4d2f 100644
--- a/ldap/servers/plugins/memberof/memberof.c
+++ b/ldap/servers/plugins/memberof/memberof.c
@@ -1113,17 +1113,29 @@ memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config,
Slapi_Entry *e = 0;
memberofstringll *ll = 0;
char *op_str = 0;
- const char *op_to = slapi_sdn_get_ndn(op_to_sdn);
- const char *op_this = slapi_sdn_get_ndn(op_this_sdn);
- Slapi_Value *to_dn_val = slapi_value_new_string(op_to);
- Slapi_Value *this_dn_val = slapi_value_new_string(op_this);
+ const char *op_to;
+ const char *op_this;
+ Slapi_Value *to_dn_val;
+ Slapi_Value *this_dn_val;
+
+ op_to = slapi_sdn_get_ndn(op_to_sdn);
+ op_this = slapi_sdn_get_ndn(op_this_sdn);
+ to_dn_val = slapi_value_new_string(op_to);
+ this_dn_val = slapi_value_new_string(op_this);
+
+ if(this_dn_val == NULL || to_dn_val == NULL){
+ slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM,
+ "memberof_modop_one_replace_r: failed to get DN values (NULL)\n");
+ goto bail;
+ }
+
/* op_this and op_to are both case-normalized */
slapi_value_set_flags(this_dn_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS);
slapi_value_set_flags(to_dn_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS);
if (config == NULL) {
slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM,
- "memberof_modop_one_replace_r: NULL config parameter");
+ "memberof_modop_one_replace_r: NULL config parameter\n");
goto bail;
}
@@ -1184,8 +1196,7 @@ memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config,
int res = 0;
slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_RESULT, &res);
slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM,
- "memberof_modop_one_replace_r: error searching for members: "
- "%d", res);
+ "memberof_modop_one_replace_r: error searching for members: %d\n", res);
} else {
slapi_pblock_get(search_pb, SLAPI_NENTRIES, &n_entries);
if(n_entries > 0)
@@ -1885,8 +1896,10 @@ int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data)
entry_sdn = slapi_entry_get_sdn(e);
entry_dn = slapi_value_new_string(slapi_entry_get_ndn(e));
+ if(entry_dn == NULL){
+ goto bail;
+ }
slapi_value_set_flags(entry_dn, SLAPI_ATTR_FLAG_NORMALIZED_CIS);
-
if(0 == entry_dn)
{
goto bail;
diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c
index c3f3593..fc399e7 100644
--- a/ldap/servers/slapd/util.c
+++ b/ldap/servers/slapd/util.c
@@ -258,7 +258,6 @@ filter_stuff_func(void *arg, const char *val, PRUint32 slen)
char *buf = (char *)val;
int extra_space;
int filter_len = slen;
- int free_buf = 0;
/* look at val - if val is one of our special keywords, and make a note of it for the next pass */
if (strcmp(val, ESC_NEXT_VAL) == 0){
@@ -342,7 +341,6 @@ filter_stuff_func(void *arg, const char *val, PRUint32 slen)
}
#else
buf = slapi_ch_calloc(sizeof(char), filter_len*3 + 1);
- free_buf = 1;
if(do_escape_string(val, filter_len, buf, special_filter) == NULL){
LDAPDebug(LDAP_DEBUG_TRACE, "slapi_filter_sprintf: failed to escape filter value(%s)\n",val,0,0);
ctx->next_arg_needs_esc_norm = 0;
@@ -360,7 +358,7 @@ filter_stuff_func(void *arg, const char *val, PRUint32 slen)
if (ctx->buf_size + filter_len >= ctx->buf_len){
/* increase buffer for this filter */
extra_space = (ctx->buf_len + filter_len + BUF_INCR);
- slapi_ch_realloc(ctx->buf, sizeof(char) * extra_space);
+ ctx->buf = slapi_ch_realloc(ctx->buf, sizeof(char) * extra_space);
ctx->buf_len = extra_space;
}
@@ -373,9 +371,7 @@ filter_stuff_func(void *arg, const char *val, PRUint32 slen)
ctx->attr_found = 0;
ctx->attr_position = 0;
memset(ctx->attr, '\0', ATTRSIZE);
- if(free_buf){
- slapi_ch_free_string(&buf);
- }
+ slapi_ch_free_string(&buf);
return filter_len;
} else { /* process arg as is */
@@ -446,7 +442,7 @@ slapi_filter_sprintf(const char *fmt, ...)
char*
slapi_escape_filter_value(char* filter_str, int len)
{
- struct berval *escaped_filter = NULL;
+ struct berval escaped_filter;
struct berval raw_filter;
int filter_len;
@@ -469,11 +465,11 @@ slapi_escape_filter_value(char* filter_str, int len)
*/
raw_filter.bv_val = filter_str;
raw_filter.bv_len = filter_len;
- if(ldap_bv2escaped_filter_value(&raw_filter, escaped_filter) != 0){
+ if(ldap_bv2escaped_filter_value(&raw_filter, &escaped_filter) != 0){
LDAPDebug(LDAP_DEBUG_TRACE, "slapi_escape_filter_value: failed to escape filter value(%s)\n",filter_str,0,0);
return NULL;
} else {
- return slapi_ch_strdup(escaped_filter->bv_val);
+ return escaped_filter.bv_val;
}
#else
char *buf = slapi_ch_calloc(sizeof(char), filter_len*3+1);
1
0
ldap/servers/plugins/replication/windows_private.c | 1270 +++++++++++----
ldap/servers/plugins/replication/windows_protocol_util.c | 29
ldap/servers/plugins/replication/windowsrepl.h | 1
ldap/servers/plugins/replication/winsync-plugin.h | 653 -------
ldap/servers/slapd/apibroker.c | 58
ldap/servers/slapd/slapi-plugin.h | 14
6 files changed, 1106 insertions(+), 919 deletions(-)
New commits:
commit e3cf72645847d53e37ccf5a31e151d910ee7a202
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Aug 2 16:48:11 2012 -0600
Ticket #425 - support multiple winsync plugins
https://fedorahosted.org/389/ticket/425
Resolves: Ticket #425
Bug Description: support multiple winsync plugins
Reviewed by: nkinder (Thanks!)
Branch: master
Fix Description: Instead of a single WinsyncAPI pointer, use a CList to
store a list of APIs. Added API version 3 - the new function is a
precedence callback so the API can report back the plugin precedence to
order multiple winsync plugins. Since each API may have a different
cookie per agreement, changed the cookie to be a list of cookies indexed
by the API pointer. The old slapi_apib interface stored multiple APIs
per GUID, but did not allow plugins to retrieve them. I added another
slapi_apib function which allows the plugin to retrieve all of the APIs
for a given GUID.
I also move the test winsync code from the public header into the
windows_private.c code and compiled it by default. This will allow us to
easily enable the plugin for testing, and also exercises the compiler in
case we make an incompatible change to the public API.
Platforms tested: RHEL6 x86_64
Flag Day: Yes - public header file change
Doc impact: Yes - document the new behavior and precedence
(cherry picked from commit c81f64399775cd5681882c923f4761d9c17cd588)
diff --git a/ldap/servers/plugins/replication/windows_private.c b/ldap/servers/plugins/replication/windows_private.c
index afdffda..20accfd 100644
--- a/ldap/servers/plugins/replication/windows_private.c
+++ b/ldap/servers/plugins/replication/windows_private.c
@@ -263,6 +263,8 @@ void windows_agreement_delete(Repl_Agmt *ra)
winsync_plugin_call_destroy_agmt_cb(ra, dp->directory_subtree,
dp->windows_subtree);
+ windows_plugin_cleanup_agmt(ra);
+
slapi_sdn_free(&dp->directory_subtree);
slapi_sdn_free(&dp->windows_subtree);
slapi_filter_free(dp->directory_filter, 1);
@@ -1022,78 +1024,235 @@ windows_private_set_sync_interval(Repl_Agmt *ra, char *str)
LDAPDebug0Args( LDAP_DEBUG_TRACE, "<= windows_private_set_sync_interval\n" );
}
-/* an array of function pointers */
-static void **_WinSyncAPI = NULL;
-static int maxapiidx = WINSYNC_PLUGIN_VERSION_1_END;
-#define DECL_WINSYNC_API_FUNC(idx,thetype,thefunc) \
- thetype thefunc = (_WinSyncAPI && (idx <= maxapiidx) && _WinSyncAPI[idx]) ? \
- (thetype)_WinSyncAPI[idx] : NULL;
+static PRCallOnceType winsync_callOnce = {0,0};
-void
-windows_plugin_init(Repl_Agmt *ra)
+struct winsync_plugin {
+ struct winsync_plugin *next; /* see PRCList - declare here to avoid lots of casting */
+ struct winsync_plugin *prev; /* see PRCList - declare here to avoid lots of casting */
+ void **api; /* the api - array of function pointers */
+ int maxapi; /* the max index i.e. the api version */
+ int precedence; /* lower number == higher precedence */
+};
+static struct winsync_plugin winsync_plugin_list;
+
+#define DECL_WINSYNC_API_IDX_FUNC(theapi,idx,maxidx,thetype,thefunc) \
+ thetype thefunc = (theapi && (idx <= maxidx) && theapi[idx]) ? \
+ (thetype)theapi[idx] : NULL;
+
+#define WINSYNC_PLUGIN_CALL_PLUGINS_BEGIN(idx,thetype,thefunc) \
+ struct winsync_plugin *elem; \
+ for (elem = PR_LIST_HEAD(&winsync_plugin_list); \
+ elem && (elem != &winsync_plugin_list); \
+ elem = PR_NEXT_LINK(elem)) { \
+ DECL_WINSYNC_API_IDX_FUNC(elem->api,idx,elem->maxapi,thetype,thefunc); \
+ if (thefunc) {
+
+#define WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(idx,thetype,thefunc) \
+ WINSYNC_PLUGIN_CALL_PLUGINS_BEGIN(idx,thetype,thefunc) \
+ void *cookie = winsync_plugin_cookie_find(ra, elem->api);
+
+#define WINSYNC_PLUGIN_CALL_PLUGINS_END } /* this one matches if thefunc */ } /* this one matches the for loop */
+
+/* this structure is per agreement - to store the cookie per agreement
+ for each winsync plugin */
+struct winsync_plugin_cookie {
+ struct winsync_plugin_cookie *next; /* see PRCList - declare here to avoid lots of casting */
+ struct winsync_plugin_cookie *prev; /* see PRCList - declare here to avoid lots of casting */
+ void **api; /* the api - array of function pointers */
+ void *cookie; /* plugin data */
+};
+
+static struct winsync_plugin *
+new_winsync_plugin(void **theapi, int maxapi, int precedence)
{
- void *cookie = NULL;
- winsync_plugin_init_cb initfunc = NULL;
-
- LDAPDebug0Args( LDAP_DEBUG_PLUGIN, "--> windows_plugin_init_start -- begin\n");
-
- /* if the function pointer array is null, get the functions - we will
- call init once per replication agreement, but will only grab the
- api once */
- if(NULL == _WinSyncAPI) {
- if (slapi_apib_get_interface(WINSYNC_v2_0_GUID, &_WinSyncAPI) ||
- (NULL == _WinSyncAPI))
- {
- LDAPDebug1Arg( LDAP_DEBUG_PLUGIN,
- "<-- windows_plugin_init_start -- no windows plugin API registered for GUID [%s] -- end\n",
- WINSYNC_v2_0_GUID);
- } else if (_WinSyncAPI) {
- LDAPDebug1Arg( LDAP_DEBUG_PLUGIN,
- "<-- windows_plugin_init_start -- found windows plugin API registered for GUID [%s] -- end\n",
- WINSYNC_v2_0_GUID);
- maxapiidx = WINSYNC_PLUGIN_VERSION_2_END;
+ struct winsync_plugin *wpi = (struct winsync_plugin *)slapi_ch_calloc(1, sizeof(struct winsync_plugin));
+ wpi->api = theapi;
+ wpi->maxapi = maxapi;
+ wpi->precedence = precedence;
+ return wpi;
+}
+
+static struct winsync_plugin *
+windows_plugin_find(void **theapi)
+{
+ struct winsync_plugin *elem = PR_LIST_HEAD(&winsync_plugin_list);
+ while (elem && (elem != &winsync_plugin_list)) {
+ if (theapi == elem->api) {
+ return elem;
}
+ elem = PR_NEXT_LINK(elem);
}
+ return NULL;
+}
+
+/* returns 0 for success - 1 means already added - -1 means some error */
+static int
+windows_plugin_add(void **theapi, int maxapi)
+{
+ int precedence = WINSYNC_PLUGIN_DEFAULT_PRECEDENCE;
+ DECL_WINSYNC_API_IDX_FUNC(theapi,WINSYNC_PLUGIN_PRECEDENCE_CB,maxapi,winsync_plugin_precedence_cb,thefunc);
- if (NULL == _WinSyncAPI) { /* no v2 interface - look for v1 */
- if (slapi_apib_get_interface(WINSYNC_v1_0_GUID, &_WinSyncAPI) ||
- (NULL == _WinSyncAPI))
- {
- LDAPDebug1Arg( LDAP_DEBUG_PLUGIN,
- "<-- windows_plugin_init_start -- no windows plugin API registered for GUID [%s] -- end\n",
- WINSYNC_v1_0_GUID);
- return;
+ if (thefunc) {
+ /* supports precedence */
+ precedence = (*thefunc)();
+ }
+ if (PR_CLIST_IS_EMPTY(&winsync_plugin_list)) {
+ struct winsync_plugin *wpi = new_winsync_plugin(theapi, maxapi, precedence);
+ PR_INSERT_LINK(wpi, &winsync_plugin_list);
+ return 0;
+ } else if (windows_plugin_find(theapi)) {
+ return 1; /* already in list */
+ } else {
+ struct winsync_plugin *wpi = new_winsync_plugin(theapi, maxapi, precedence);
+ struct winsync_plugin *elem = PR_LIST_HEAD(&winsync_plugin_list);
+ while (elem && (elem != &winsync_plugin_list)) {
+ if (precedence < elem->precedence) {
+ PR_INSERT_BEFORE(wpi, elem);
+ break;
+ }
+ elem = PR_NEXT_LINK(elem);
+ }
+ if (elem == &winsync_plugin_list) {
+ /* just add to end of list */
+ PR_INSERT_BEFORE(wpi, elem);
+ }
+ return 0;
+ }
+ return -1;
+}
+
+static PRStatus
+windows_plugin_callonce(void)
+{
+ char *guids[] = {WINSYNC_v3_0_GUID, WINSYNC_v2_0_GUID, WINSYNC_v1_0_GUID, NULL};
+ int maxapis[] = {WINSYNC_PLUGIN_VERSION_3_END, WINSYNC_PLUGIN_VERSION_2_END,
+ WINSYNC_PLUGIN_VERSION_1_END, 0};
+ int ii;
+
+ PR_INIT_CLIST(&winsync_plugin_list);
+ /* loop through all of the registered winsync plugins - look for them in reverse
+ version order (e.g. look for v3 first) - if there are no plugins registered
+ for the given version, or we have already registered all plugins for a given
+ version, just go to the next lowest version */
+ for (ii = 0; guids[ii]; ++ii) {
+ char *guid = guids[ii];
+ int maxapi = maxapis[ii];
+ void ***theapis = NULL;
+
+ if (slapi_apib_get_interface_all(guid, &theapis) || (NULL == theapis)) {
+ LDAPDebug1Arg(LDAP_DEBUG_PLUGIN,
+ "<-- windows_plugin_callonce -- no more windows plugin APIs registered "
+ "for GUID [%s] -- end\n",
+ guid);
} else {
- LDAPDebug1Arg( LDAP_DEBUG_PLUGIN,
- "<-- windows_plugin_init_start -- found windows plugin API registered for GUID [%s] -- end\n",
- WINSYNC_v1_0_GUID);
+ int idx;
+ for (idx = 0; theapis && theapis[idx]; ++idx) {
+ if (windows_plugin_add(theapis[idx], maxapi)) {
+ LDAPDebug(LDAP_DEBUG_PLUGIN,
+ "<-- windows_plugin_callonce -- already added windows plugin API "
+ "[%d][0x%p] for GUID [%s] -- end\n",
+ idx, theapis[idx], guid);
+ }
+ }
}
- }
+ slapi_ch_free((void **)&theapis);
+ }
+ return PR_SUCCESS;
+}
+
+static struct winsync_plugin_cookie *
+new_winsync_plugin_cookie(void **theapi, void *cookie)
+{
+ struct winsync_plugin_cookie *wpc = (struct winsync_plugin_cookie *)slapi_ch_calloc(1, sizeof(struct winsync_plugin_cookie));
+ wpc->api = theapi;
+ wpc->cookie = cookie;
+ return wpc;
+}
+
+static void *
+winsync_plugin_cookie_find(const Repl_Agmt *ra, void **theapi)
+{
+ if (ra) {
+ struct winsync_plugin_cookie *list = (struct winsync_plugin_cookie *)windows_private_get_api_cookie(ra);
+ if (list) {
+ struct winsync_plugin_cookie *elem = PR_LIST_HEAD(list);
+ while (elem && (elem != list)) {
+ if (theapi == elem->api) {
+ return elem->cookie;
+ }
+ elem = PR_NEXT_LINK(elem);
+ }
+ }
+ }
+ return NULL;
+}
+
+static void
+winsync_plugin_cookie_add(struct winsync_plugin_cookie **list, void **theapi, void *cookie)
+{
+ struct winsync_plugin_cookie *elem = NULL;
+ if (!*list) {
+ *list = new_winsync_plugin_cookie(NULL, NULL);
+ PR_INIT_CLIST(*list);
+ }
+ elem = new_winsync_plugin_cookie(theapi, cookie);
+ PR_INSERT_BEFORE(elem, *list);
+ return;
+}
- initfunc = (winsync_plugin_init_cb)_WinSyncAPI[WINSYNC_PLUGIN_INIT_CB];
- if (initfunc) {
- cookie = (*initfunc)(windows_private_get_directory_subtree(ra),
- windows_private_get_windows_subtree(ra));
+void
+windows_plugin_init(Repl_Agmt *ra)
+{
+ struct winsync_plugin_cookie *list = NULL;
+ void *cookie = NULL;
+ PRStatus rv;
+
+ LDAPDebug0Args( LDAP_DEBUG_PLUGIN, "--> windows_plugin_init_start -- begin\n");
+
+ rv = PR_CallOnce(&winsync_callOnce, windows_plugin_callonce);
+
+ /* call each plugin init function in turn - store the returned cookie
+ indexed by the api */
+ {
+ WINSYNC_PLUGIN_CALL_PLUGINS_BEGIN(WINSYNC_PLUGIN_INIT_CB,winsync_plugin_init_cb,thefunc)
+ cookie = (*thefunc)(windows_private_get_directory_subtree(ra),
+ windows_private_get_windows_subtree(ra));
+ if (cookie) {
+ winsync_plugin_cookie_add(&list, elem->api, cookie);
+ }
+ WINSYNC_PLUGIN_CALL_PLUGINS_END
}
- windows_private_set_api_cookie(ra, cookie);
+
+ windows_private_set_api_cookie(ra, list);
- LDAPDebug0Args( LDAP_DEBUG_PLUGIN, "<-- windows_plugin_init_start -- end\n");
+ LDAPDebug0Args( LDAP_DEBUG_PLUGIN, "<-- windows_plugin_init_start -- end\n");
return;
}
void
-winsync_plugin_call_dirsync_search_params_cb(const Repl_Agmt *ra, const char *agmt_dn,
- char **base, int *scope, char **filter,
- char ***attrs, LDAPControl ***serverctrls)
+windows_plugin_cleanup_agmt(Repl_Agmt *ra)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_DIRSYNC_SEARCH_CB,winsync_search_params_cb,thefunc);
+ struct winsync_plugin_cookie *list = (struct winsync_plugin_cookie *)windows_private_get_api_cookie(ra);
+ struct winsync_plugin_cookie *elem = NULL;
- if (!thefunc) {
- return;
+ while (list && !PR_CLIST_IS_EMPTY(list)) {
+ elem = PR_LIST_HEAD(list);
+ PR_REMOVE_LINK(elem);
+ slapi_ch_free((void **)&elem);
}
+ slapi_ch_free((void **)&list);
+ windows_private_set_api_cookie(ra, NULL);
+ return;
+}
- (*thefunc)(windows_private_get_api_cookie(ra), agmt_dn, base, scope, filter,
- attrs, serverctrls);
+void
+winsync_plugin_call_dirsync_search_params_cb(const Repl_Agmt *ra, const char *agmt_dn,
+ char **base, int *scope, char **filter,
+ char ***attrs, LDAPControl ***serverctrls)
+{
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_DIRSYNC_SEARCH_CB,winsync_search_params_cb,thefunc)
+ (*thefunc)(cookie, agmt_dn, base, scope, filter, attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1103,14 +1262,9 @@ winsync_plugin_call_pre_ad_search_cb(const Repl_Agmt *ra, const char *agmt_dn,
char **base, int *scope, char **filter,
char ***attrs, LDAPControl ***serverctrls)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_SEARCH_CB,winsync_search_params_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), agmt_dn, base, scope, filter,
- attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_SEARCH_CB,winsync_search_params_cb,thefunc)
+ (*thefunc)(cookie, agmt_dn, base, scope, filter, attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1120,14 +1274,9 @@ winsync_plugin_call_pre_ds_search_entry_cb(const Repl_Agmt *ra, const char *agmt
char **base, int *scope, char **filter,
char ***attrs, LDAPControl ***serverctrls)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_DS_SEARCH_ENTRY_CB,winsync_search_params_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), agmt_dn, base, scope, filter,
- attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_DS_SEARCH_ENTRY_CB,winsync_search_params_cb,thefunc)
+ (*thefunc)(cookie, agmt_dn, base, scope, filter, attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1137,14 +1286,9 @@ winsync_plugin_call_pre_ds_search_all_cb(const Repl_Agmt *ra, const char *agmt_d
char **base, int *scope, char **filter,
char ***attrs, LDAPControl ***serverctrls)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_DS_SEARCH_ALL_CB,winsync_search_params_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), agmt_dn, base, scope, filter,
- attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_DS_SEARCH_ALL_CB,winsync_search_params_cb,thefunc)
+ (*thefunc)(cookie, agmt_dn, base, scope, filter, attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1154,14 +1298,9 @@ winsync_plugin_call_pre_ad_mod_user_cb(const Repl_Agmt *ra, const Slapi_Entry *r
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *do_modify)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_MOD_USER_CB,winsync_pre_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_MOD_USER_CB,winsync_pre_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1171,14 +1310,9 @@ winsync_plugin_call_pre_ad_mod_group_cb(const Repl_Agmt *ra, const Slapi_Entry *
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *do_modify)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_MOD_GROUP_CB,winsync_pre_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_MOD_GROUP_CB,winsync_pre_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1188,14 +1322,9 @@ winsync_plugin_call_pre_ds_mod_user_cb(const Repl_Agmt *ra, const Slapi_Entry *r
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *do_modify)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_DS_MOD_USER_CB,winsync_pre_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_DS_MOD_USER_CB,winsync_pre_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1205,14 +1334,9 @@ winsync_plugin_call_pre_ds_mod_group_cb(const Repl_Agmt *ra, const Slapi_Entry *
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *do_modify)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_DS_MOD_GROUP_CB,winsync_pre_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_DS_MOD_GROUP_CB,winsync_pre_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1221,14 +1345,9 @@ void
winsync_plugin_call_pre_ds_add_user_cb(const Repl_Agmt *ra, const Slapi_Entry *rawentry,
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_DS_ADD_USER_CB,winsync_pre_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_DS_ADD_USER_CB,winsync_pre_add_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1237,14 +1356,9 @@ void
winsync_plugin_call_pre_ds_add_group_cb(const Repl_Agmt *ra, const Slapi_Entry *rawentry,
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_DS_ADD_GROUP_CB,winsync_pre_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_DS_ADD_GROUP_CB,winsync_pre_add_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1254,14 +1368,9 @@ winsync_plugin_call_get_new_ds_user_dn_cb(const Repl_Agmt *ra, const Slapi_Entry
Slapi_Entry *ad_entry, char **new_dn_string,
const Slapi_DN *ds_suffix, const Slapi_DN *ad_suffix)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_GET_NEW_DS_USER_DN_CB,winsync_get_new_dn_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- new_dn_string, ds_suffix, ad_suffix);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_GET_NEW_DS_USER_DN_CB,winsync_get_new_dn_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, new_dn_string, ds_suffix, ad_suffix);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1271,14 +1380,9 @@ winsync_plugin_call_get_new_ds_group_dn_cb(const Repl_Agmt *ra, const Slapi_Entr
Slapi_Entry *ad_entry, char **new_dn_string,
const Slapi_DN *ds_suffix, const Slapi_DN *ad_suffix)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_GET_NEW_DS_GROUP_DN_CB,winsync_get_new_dn_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- new_dn_string, ds_suffix, ad_suffix);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_GET_NEW_DS_GROUP_DN_CB,winsync_get_new_dn_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, new_dn_string, ds_suffix, ad_suffix);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1290,14 +1394,9 @@ winsync_plugin_call_pre_ad_mod_user_mods_cb(const Repl_Agmt *ra, const Slapi_Ent
LDAPMod * const *origmods,
Slapi_DN *remote_dn, LDAPMod ***modstosend)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_MOD_USER_MODS_CB,winsync_pre_ad_mod_mods_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, local_dn,
- ds_entry, origmods, remote_dn, modstosend);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_MOD_USER_MODS_CB,winsync_pre_ad_mod_mods_cb,thefunc)
+ (*thefunc)(cookie, rawentry, local_dn, ds_entry, origmods, remote_dn, modstosend);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1309,14 +1408,9 @@ winsync_plugin_call_pre_ad_mod_group_mods_cb(const Repl_Agmt *ra, const Slapi_En
LDAPMod * const *origmods,
Slapi_DN *remote_dn, LDAPMod ***modstosend)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_MOD_GROUP_MODS_CB,winsync_pre_ad_mod_mods_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, local_dn,
- ds_entry, origmods, remote_dn, modstosend);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_MOD_GROUP_MODS_CB,winsync_pre_ad_mod_mods_cb,thefunc)
+ (*thefunc)(cookie, rawentry, local_dn, ds_entry, origmods, remote_dn, modstosend);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1325,26 +1419,22 @@ int
winsync_plugin_call_can_add_entry_to_ad_cb(const Repl_Agmt *ra, const Slapi_Entry *local_entry,
const Slapi_DN *remote_dn)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_CAN_ADD_ENTRY_TO_AD_CB,winsync_can_add_to_ad_cb,thefunc);
-
- if (!thefunc) {
- return 1; /* default is entry can be added to AD */
- }
-
- return (*thefunc)(windows_private_get_api_cookie(ra), local_entry, remote_dn);
+ int canadd = 1;
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_CAN_ADD_ENTRY_TO_AD_CB,winsync_can_add_to_ad_cb,thefunc)
+ if (canadd) {
+ canadd = (*thefunc)(cookie, local_entry, remote_dn);
+ }
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
+ return canadd;
}
void
winsync_plugin_call_begin_update_cb(const Repl_Agmt *ra, const Slapi_DN *ds_subtree,
const Slapi_DN *ad_subtree, int is_total)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_BEGIN_UPDATE_CB,winsync_plugin_update_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), ds_subtree, ad_subtree, is_total);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_BEGIN_UPDATE_CB,winsync_plugin_update_cb,thefunc)
+ (*thefunc)(cookie, ds_subtree, ad_subtree, is_total);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1353,13 +1443,9 @@ void
winsync_plugin_call_end_update_cb(const Repl_Agmt *ra, const Slapi_DN *ds_subtree,
const Slapi_DN *ad_subtree, int is_total)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_END_UPDATE_CB,winsync_plugin_update_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), ds_subtree, ad_subtree, is_total);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_END_UPDATE_CB,winsync_plugin_update_cb,thefunc)
+ (*thefunc)(cookie, ds_subtree, ad_subtree, is_total);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1369,11 +1455,9 @@ winsync_plugin_call_destroy_agmt_cb(const Repl_Agmt *ra,
const Slapi_DN *ds_subtree,
const Slapi_DN *ad_subtree)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_DESTROY_AGMT_CB,winsync_plugin_destroy_agmt_cb,thefunc);
-
- if (thefunc) {
- (*thefunc)(windows_private_get_api_cookie(ra), ds_subtree, ad_subtree);
- }
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_DESTROY_AGMT_CB,winsync_plugin_destroy_agmt_cb,thefunc)
+ (*thefunc)(cookie, ds_subtree, ad_subtree);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1383,14 +1467,9 @@ winsync_plugin_call_post_ad_mod_user_cb(const Repl_Agmt *ra, const Slapi_Entry *
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_AD_MOD_USER_CB,winsync_post_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_AD_MOD_USER_CB,winsync_post_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1400,14 +1479,9 @@ winsync_plugin_call_post_ad_mod_group_cb(const Repl_Agmt *ra, const Slapi_Entry
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_AD_MOD_GROUP_CB,winsync_post_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_AD_MOD_GROUP_CB,winsync_post_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1417,14 +1491,9 @@ winsync_plugin_call_post_ds_mod_user_cb(const Repl_Agmt *ra, const Slapi_Entry *
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_DS_MOD_USER_CB,winsync_post_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_DS_MOD_USER_CB,winsync_post_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1434,14 +1503,9 @@ winsync_plugin_call_post_ds_mod_group_cb(const Repl_Agmt *ra, const Slapi_Entry
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_DS_MOD_GROUP_CB,winsync_post_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_DS_MOD_GROUP_CB,winsync_post_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1450,14 +1514,9 @@ void
winsync_plugin_call_post_ds_add_user_cb(const Repl_Agmt *ra, const Slapi_Entry *rawentry,
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_DS_ADD_USER_CB,winsync_post_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_DS_ADD_USER_CB,winsync_post_add_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1466,14 +1525,9 @@ void
winsync_plugin_call_post_ds_add_group_cb(const Repl_Agmt *ra, const Slapi_Entry *rawentry,
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_DS_ADD_GROUP_CB,winsync_post_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_DS_ADD_GROUP_CB,winsync_post_add_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1482,13 +1536,9 @@ void
winsync_plugin_call_pre_ad_add_user_cb(const Repl_Agmt *ra, Slapi_Entry *ad_entry,
Slapi_Entry *ds_entry)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_ADD_USER_CB,winsync_pre_ad_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), ad_entry, ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_ADD_USER_CB,winsync_pre_ad_add_cb,thefunc)
+ (*thefunc)(cookie, ad_entry, ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1497,13 +1547,9 @@ void
winsync_plugin_call_pre_ad_add_group_cb(const Repl_Agmt *ra, Slapi_Entry *ad_entry,
Slapi_Entry *ds_entry)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_ADD_GROUP_CB,winsync_pre_ad_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), ad_entry, ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_ADD_GROUP_CB,winsync_pre_ad_add_cb,thefunc)
+ (*thefunc)(cookie, ad_entry, ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1512,13 +1558,9 @@ void
winsync_plugin_call_post_ad_add_user_cb(const Repl_Agmt *ra, Slapi_Entry *ad_entry,
Slapi_Entry *ds_entry, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_AD_ADD_USER_CB,winsync_post_ad_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), ad_entry, ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_AD_ADD_USER_CB,winsync_post_ad_add_cb,thefunc)
+ (*thefunc)(cookie, ad_entry, ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1527,13 +1569,9 @@ void
winsync_plugin_call_post_ad_add_group_cb(const Repl_Agmt *ra, Slapi_Entry *ad_entry,
Slapi_Entry *ds_entry, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_AD_ADD_GROUP_CB,winsync_post_ad_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), ad_entry, ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_AD_ADD_GROUP_CB,winsync_post_ad_add_cb,thefunc)
+ (*thefunc)(cookie, ad_entry, ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1545,14 +1583,9 @@ winsync_plugin_call_post_ad_mod_user_mods_cb(const Repl_Agmt *ra, const Slapi_En
LDAPMod * const *origmods,
Slapi_DN *remote_dn, LDAPMod **modstosend, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_AD_MOD_USER_MODS_CB,winsync_post_ad_mod_mods_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, local_dn,
- ds_entry, origmods, remote_dn, modstosend, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_AD_MOD_USER_MODS_CB,winsync_post_ad_mod_mods_cb,thefunc)
+ (*thefunc)(cookie, rawentry, local_dn, ds_entry, origmods, remote_dn, modstosend, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1564,18 +1597,711 @@ winsync_plugin_call_post_ad_mod_group_mods_cb(const Repl_Agmt *ra, const Slapi_E
LDAPMod * const *origmods,
Slapi_DN *remote_dn, LDAPMod **modstosend, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_AD_MOD_GROUP_MODS_CB,winsync_post_ad_mod_mods_cb,thefunc);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_AD_MOD_GROUP_MODS_CB,winsync_post_ad_mod_mods_cb,thefunc)
+ (*thefunc)(cookie, rawentry, local_dn, ds_entry, origmods, remote_dn, modstosend, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
+
+ return;
+}
+
+
+/*
+ The following are sample code stubs to show how to implement
+ a plugin which uses this api
+*/
+
+#define WINSYNC_SAMPLE_CODE
+#ifdef WINSYNC_SAMPLE_CODE
+
+#include "slapi-plugin.h"
+#include "winsync-plugin.h"
+
+static char *test_winsync_plugin_name = "test_winsync_api";
+
+static void *
+test_winsync_api_init(const Slapi_DN *ds_subtree, const Slapi_DN *ad_subtree)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_init [%s] [%s] -- begin\n",
+ slapi_sdn_get_dn(ds_subtree),
+ slapi_sdn_get_dn(ad_subtree));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_init -- end\n");
+
+ return NULL;
+}
+
+static void
+test_winsync_dirsync_search_params_cb(void *cbdata, const char *agmt_dn,
+ char **base, int *scope, char **filter,
+ char ***attrs, LDAPControl ***serverctrls)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_dirsync_search_params_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_dirsync_search_params_cb -- end\n");
+
+ return;
+}
+
+/* called before searching for a single entry from AD - agmt_dn will be NULL */
+static void
+test_winsync_pre_ad_search_cb(void *cbdata, const char *agmt_dn,
+ char **base, int *scope, char **filter,
+ char ***attrs, LDAPControl ***serverctrls)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_search_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_search_cb -- end\n");
+
+ return;
+}
+
+/* called before an internal search to get a single DS entry - agmt_dn will be NULL */
+static void
+test_winsync_pre_ds_search_entry_cb(void *cbdata, const char *agmt_dn,
+ char **base, int *scope, char **filter,
+ char ***attrs, LDAPControl ***serverctrls)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ds_search_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ds_search_cb -- end\n");
+
+ return;
+}
+
+/* called before the total update to get all entries from the DS to sync to AD */
+static void
+test_winsync_pre_ds_search_all_cb(void *cbdata, const char *agmt_dn,
+ char **base, int *scope, char **filter,
+ char ***attrs, LDAPControl ***serverctrls)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ds_search_all_cb -- orig filter [%s] -- begin\n",
+ ((filter && *filter) ? *filter : "NULL"));
+
+ /* We only want to grab users from the ds side - no groups */
+ slapi_ch_free_string(filter);
+ /* maybe use ntUniqueId=* - only get users that have already been
+ synced with AD already - ntUniqueId and ntUserDomainId are
+ indexed for equality only - need to add presence? */
+ *filter = slapi_ch_strdup("(&(objectclass=ntuser)(ntUserDomainId=*))");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ds_search_all_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ad_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
+ Slapi_Mods *smods, int *do_modify)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_mod_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_mod_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ad_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
+ Slapi_Mods *smods, int *do_modify)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_mod_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_mod_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
+ Slapi_Mods *smods, int *do_modify)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ds_mod_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ds_mod_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
+ Slapi_Mods *smods, int *do_modify)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ds_mod_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ds_mod_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, Slapi_Entry *ds_entry)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ds_add_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ds_add_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ds_add_group_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, Slapi_Entry *ds_entry)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ds_add_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ds_add_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_get_new_ds_user_dn_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, char **new_dn_string,
+ const Slapi_DN *ds_suffix, const Slapi_DN *ad_suffix)
+{
+ char **rdns = NULL;
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_get_new_ds_user_dn_cb -- old dn [%s] -- begin\n",
+ *new_dn_string);
- if (!thefunc) {
+ rdns = slapi_ldap_explode_dn(*new_dn_string, 0);
+ if (!rdns || !rdns[0]) {
+ slapi_ldap_value_free(rdns);
return;
}
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, local_dn,
- ds_entry, origmods, remote_dn, modstosend, result);
+ slapi_ch_free_string(new_dn_string);
+ *new_dn_string = PR_smprintf("%s,%s", rdns[0], slapi_sdn_get_dn(ds_suffix));
+ slapi_ldap_value_free(rdns);
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_get_new_ds_user_dn_cb -- new dn [%s] -- end\n",
+ *new_dn_string);
+
+ return;
+}
+
+static void
+test_winsync_get_new_ds_group_dn_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, char **new_dn_string,
+ const Slapi_DN *ds_suffix, const Slapi_DN *ad_suffix)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_get_new_ds_group_dn_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_get_new_ds_group_dn_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ad_mod_user_mods_cb(void *cbdata, const Slapi_Entry *rawentry,
+ const Slapi_Entry *ds_entry,
+ const Slapi_DN *local_dn, LDAPMod * const *origmods,
+ Slapi_DN *remote_dn, LDAPMod ***modstosend)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_mod_user_mods_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_mod_user_mods_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ad_mod_group_mods_cb(void *cbdata, const Slapi_Entry *rawentry,
+ const Slapi_Entry *ds_entry,
+ const Slapi_DN *local_dn, LDAPMod * const *origmods,
+ Slapi_DN *remote_dn, LDAPMod ***modstosend)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_mod_group_mods_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_mod_group_mods_cb -- end\n");
+
+ return;
+}
+
+static int
+test_winsync_can_add_entry_to_ad_cb(void *cbdata, const Slapi_Entry *local_entry,
+ const Slapi_DN *remote_dn)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_can_add_entry_to_ad_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_can_add_entry_to_ad_cb -- end\n");
+
+ /* return 0;*/ /* false - do not allow entries to be added to ad */
+ return 1; /* true - allow entries to be added to ad */
+}
+
+static void
+test_winsync_begin_update_cb(void *cbdata, const Slapi_DN *ds_subtree,
+ const Slapi_DN *ad_subtree, int is_total)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_begin_update_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_begin_update_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_end_update_cb(void *cbdata, const Slapi_DN *ds_subtree,
+ const Slapi_DN *ad_subtree, int is_total)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_end_update_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_end_update_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_destroy_agmt_cb(void *cbdata, const Slapi_DN *ds_subtree,
+ const Slapi_DN *ad_subtree)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_destroy_agmt_cb -- begin\n");
+
+ /* free(cbdata); */
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_destroy_agmt_cb -- end\n");
return;
}
+static void
+test_winsync_post_ad_mod_user_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ad_mod_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of modifying AD entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ad_mod_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ad_mod_group_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ad_mod_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of modifying AD entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ad_mod_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ds_mod_user_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ds_mod_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of modifying DS entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ds_mod_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ds_mod_group_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ds_mod_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of modifying DS entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ds_mod_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ds_add_user_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ds_add_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of adding DS entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ds_add_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ds_add_group_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ds_add_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of adding DS entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ds_add_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ad_add_user_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_add_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Adding AD entry [%s] from add of DS entry [%s]\n",
+ slapi_entry_get_dn(ad_entry), slapi_entry_get_dn(ds_entry));
+ /* make modifications to ad_entry here */
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_add_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ad_add_group_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_add_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Adding AD entry [%s] from add of DS entry [%s]\n",
+ slapi_entry_get_dn(ad_entry), slapi_entry_get_dn(ds_entry));
+ /* make modifications to ad_entry here */
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_add_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ad_add_user_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ad_add_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of adding AD entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ad_add_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ad_add_group_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ad_add_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of adding AD entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ad_add_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ad_mod_user_mods_cb(void *cookie, const Slapi_Entry *rawentry, const Slapi_DN *local_dn, const Slapi_Entry *ds_entry, LDAPMod * const *origmods, Slapi_DN *remote_dn, LDAPMod ***modstosend, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ad_mod_user_mods_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of modifying AD entry [%s] was [%d:%s]\n",
+ slapi_sdn_get_dn(remote_dn), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ad_mod_user_mods_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ad_mod_group_mods_cb(void *cookie, const Slapi_Entry *rawentry, const Slapi_DN *local_dn, const Slapi_Entry *ds_entry, LDAPMod * const *origmods, Slapi_DN *remote_dn, LDAPMod ***modstosend, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ad_mod_group_mods_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of modifying AD entry [%s] was [%d:%s]\n",
+ slapi_sdn_get_dn(remote_dn), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ad_mod_group_mods_cb -- end\n");
+
+ return;
+}
+
+static int
+test_winsync_precedence(void)
+{
+ return 99;
+}
+
+/**
+ * Plugin identifiers
+ */
+static Slapi_PluginDesc test_winsync_pdesc = {
+ "test-winsync-plugin",
+ VENDOR,
+ DS_PACKAGE_VERSION,
+ "test winsync plugin"
+};
+
+static Slapi_ComponentId *test_winsync_plugin_id = NULL;
+
+#ifdef TEST_V1_WINSYNC_API
+static void *test_winsync_api_v1[] = {
+ NULL, /* reserved for api broker use, must be zero */
+ test_winsync_api_init,
+ test_winsync_dirsync_search_params_cb,
+ test_winsync_pre_ad_search_cb,
+ test_winsync_pre_ds_search_entry_cb,
+ test_winsync_pre_ds_search_all_cb,
+ test_winsync_pre_ad_mod_user_cb,
+ test_winsync_pre_ad_mod_group_cb,
+ test_winsync_pre_ds_mod_user_cb,
+ test_winsync_pre_ds_mod_group_cb,
+ test_winsync_pre_ds_add_user_cb,
+ test_winsync_pre_ds_add_group_cb,
+ test_winsync_get_new_ds_user_dn_cb,
+ test_winsync_get_new_ds_group_dn_cb,
+ test_winsync_pre_ad_mod_user_mods_cb,
+ test_winsync_pre_ad_mod_group_mods_cb,
+ test_winsync_can_add_entry_to_ad_cb,
+ test_winsync_begin_update_cb,
+ test_winsync_end_update_cb,
+ test_winsync_destroy_agmt_cb
+};
+#endif /* TEST_V1_WINSYNC_API */
+
+#ifdef TEST_V2_WINSYNC_API
+static void *test_winsync_api_v2[] = {
+ NULL, /* reserved for api broker use, must be zero */
+ test_winsync_api_init,
+ test_winsync_dirsync_search_params_cb,
+ test_winsync_pre_ad_search_cb,
+ test_winsync_pre_ds_search_entry_cb,
+ test_winsync_pre_ds_search_all_cb,
+ test_winsync_pre_ad_mod_user_cb,
+ test_winsync_pre_ad_mod_group_cb,
+ test_winsync_pre_ds_mod_user_cb,
+ test_winsync_pre_ds_mod_group_cb,
+ test_winsync_pre_ds_add_user_cb,
+ test_winsync_pre_ds_add_group_cb,
+ test_winsync_get_new_ds_user_dn_cb,
+ test_winsync_get_new_ds_group_dn_cb,
+ test_winsync_pre_ad_mod_user_mods_cb,
+ test_winsync_pre_ad_mod_group_mods_cb,
+ test_winsync_can_add_entry_to_ad_cb,
+ test_winsync_begin_update_cb,
+ test_winsync_end_update_cb,
+ test_winsync_destroy_agmt_cb,
+ test_winsync_post_ad_mod_user_cb,
+ test_winsync_post_ad_mod_group_cb,
+ test_winsync_post_ds_mod_user_cb,
+ test_winsync_post_ds_mod_group_cb,
+ test_winsync_post_ds_add_user_cb,
+ test_winsync_post_ds_add_group_cb,
+ test_winsync_pre_ad_add_user_cb,
+ test_winsync_pre_ad_add_group_cb,
+ test_winsync_post_ad_add_user_cb,
+ test_winsync_post_ad_add_group_cb,
+ test_winsync_post_ad_mod_user_mods_cb,
+ test_winsync_post_ad_mod_group_mods_cb
+};
+#endif /* TEST_V2_WINSYNC_API */
+
+static void *test_winsync_api_v3[] = {
+ NULL, /* reserved for api broker use, must be zero */
+ test_winsync_api_init,
+ test_winsync_dirsync_search_params_cb,
+ test_winsync_pre_ad_search_cb,
+ test_winsync_pre_ds_search_entry_cb,
+ test_winsync_pre_ds_search_all_cb,
+ test_winsync_pre_ad_mod_user_cb,
+ test_winsync_pre_ad_mod_group_cb,
+ test_winsync_pre_ds_mod_user_cb,
+ test_winsync_pre_ds_mod_group_cb,
+ test_winsync_pre_ds_add_user_cb,
+ test_winsync_pre_ds_add_group_cb,
+ test_winsync_get_new_ds_user_dn_cb,
+ test_winsync_get_new_ds_group_dn_cb,
+ test_winsync_pre_ad_mod_user_mods_cb,
+ test_winsync_pre_ad_mod_group_mods_cb,
+ test_winsync_can_add_entry_to_ad_cb,
+ test_winsync_begin_update_cb,
+ test_winsync_end_update_cb,
+ test_winsync_destroy_agmt_cb,
+ test_winsync_post_ad_mod_user_cb,
+ test_winsync_post_ad_mod_group_cb,
+ test_winsync_post_ds_mod_user_cb,
+ test_winsync_post_ds_mod_group_cb,
+ test_winsync_post_ds_add_user_cb,
+ test_winsync_post_ds_add_group_cb,
+ test_winsync_pre_ad_add_user_cb,
+ test_winsync_pre_ad_add_group_cb,
+ test_winsync_post_ad_add_user_cb,
+ test_winsync_post_ad_add_group_cb,
+ test_winsync_post_ad_mod_user_mods_cb,
+ test_winsync_post_ad_mod_group_mods_cb,
+ test_winsync_precedence
+};
+
+static int
+test_winsync_plugin_start(Slapi_PBlock *pb)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_plugin_start -- begin\n");
+
+ if( slapi_apib_register(WINSYNC_v3_0_GUID, test_winsync_api_v3) ) {
+ slapi_log_error( SLAPI_LOG_FATAL, test_winsync_plugin_name,
+ "<-- test_winsync_plugin_start -- failed to register winsync api -- end\n");
+ return -1;
+ }
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_plugin_start -- end\n");
+ return 0;
+}
+
+static int
+test_winsync_plugin_close(Slapi_PBlock *pb)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_plugin_close -- begin\n");
+
+ slapi_apib_unregister(WINSYNC_v3_0_GUID);
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_plugin_close -- end\n");
+ return 0;
+}
+
+/* this is the slapi plugin init function,
+ not the one used by the winsync api
+*/
+int test_winsync_plugin_init(Slapi_PBlock *pb)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_plugin_init -- begin\n");
+
+ if ( slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION,
+ SLAPI_PLUGIN_VERSION_01 ) != 0 ||
+ slapi_pblock_set(pb, SLAPI_PLUGIN_START_FN,
+ (void *) test_winsync_plugin_start ) != 0 ||
+ slapi_pblock_set(pb, SLAPI_PLUGIN_CLOSE_FN,
+ (void *) test_winsync_plugin_close ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION,
+ (void *)&test_winsync_pdesc ) != 0 )
+ {
+ slapi_log_error( SLAPI_LOG_FATAL, test_winsync_plugin_name,
+ "<-- test_winsync_plugin_init -- failed to register plugin -- end\n");
+ return -1;
+ }
+
+ /* Retrieve and save the plugin identity to later pass to
+ internal operations */
+ if (slapi_pblock_get(pb, SLAPI_PLUGIN_IDENTITY, &test_winsync_plugin_id) != 0) {
+ slapi_log_error(SLAPI_LOG_FATAL, test_winsync_plugin_name,
+ "<-- test_winsync_plugin_init -- failed to retrieve plugin identity -- end\n");
+ return -1;
+ }
+
+ slapi_log_error( SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_plugin_init -- end\n");
+ return 0;
+}
+
+/*
+dn: cn=Test Winsync API,cn=plugins,cn=config
+objectclass: top
+objectclass: nsSlapdPlugin
+objectclass: extensibleObject
+cn: Test Winsync API
+nsslapd-pluginpath: libtestwinsync-plugin
+nsslapd-plugininitfunc: test_winsync_plugin_init
+nsslapd-plugintype: preoperation
+nsslapd-pluginenabled: on
+nsslapd-plugin-depends-on-type: database
+nsslapd-pluginDescription: Test Winsync
+nsslapd-pluginVendor: 389 project
+nsslapd-pluginId: test-winsync
+nsslapd-pluginVersion: 0.9
+*/
+
+#endif /* WINSYNC_SAMPLE_CODE */
+
/* #define WINSYNC_TEST_IPA */
#ifdef WINSYNC_TEST_IPA
diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c
index fb10fb0..0b16bde 100644
--- a/ldap/servers/plugins/replication/windows_protocol_util.c
+++ b/ldap/servers/plugins/replication/windows_protocol_util.c
@@ -4376,11 +4376,40 @@ windows_generate_update_mods(Private_Repl_Protocol *prp,Slapi_Entry *remote_entr
slapi_valueset_free(restricted_local_values);
restricted_local_values = NULL;
}
+ else
+ {
+ slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
+ "windows_generate_update_mods: no restricted local values found for "
+ "local attribute %s in local entry %s for remote attribute "
+ "%s in remote entry %s\n",
+ local_type ? local_type : "NULL",
+ local_entry ? slapi_entry_get_dn(local_entry) : "NULL",
+ type ? type : "NULL",
+ remote_entry ? slapi_entry_get_dn(remote_entry) : "NULL");
+ }
slapi_valueset_free(local_values);
local_values = NULL;
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
+ "windows_generate_update_mods: no local values found for "
+ "local attribute %s in local entry %s for remote attribute "
+ "%s in remote entry %s\n",
+ local_type ? local_type : "NULL",
+ local_entry ? slapi_entry_get_dn(local_entry) : "NULL",
+ type ? type : "NULL",
+ remote_entry ? slapi_entry_get_dn(remote_entry) : "NULL");
}
slapi_valueset_free(mapped_remote_values);
mapped_remote_values = NULL;
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
+ "windows_generate_update_mods: could not map the values in "
+ "local attribute %s in local entry %s for remote attribute "
+ "%s in remote entry %s\n",
+ local_type ? local_type : "NULL",
+ local_entry ? slapi_entry_get_dn(local_entry) : "NULL",
+ type ? type : "NULL",
+ remote_entry ? slapi_entry_get_dn(remote_entry) : "NULL");
}
}
} else
diff --git a/ldap/servers/plugins/replication/windowsrepl.h b/ldap/servers/plugins/replication/windowsrepl.h
index 7da855c..5780e74 100644
--- a/ldap/servers/plugins/replication/windowsrepl.h
+++ b/ldap/servers/plugins/replication/windowsrepl.h
@@ -146,6 +146,7 @@ int windows_check_user_password(Repl_Connection *conn, Slapi_DN *sdn, char *pass
specific data
*/
void windows_plugin_init(Repl_Agmt *ra);
+void windows_plugin_cleanup_agmt(Repl_Agmt *ra);
void winsync_plugin_call_dirsync_search_params_cb(const Repl_Agmt *ra, const char *agmt_dn, char **base, int *scope, char **filter, char ***attrs, LDAPControl ***serverctrls);
/* called before searching for a single entry from AD - agmt_dn will be NULL */
diff --git a/ldap/servers/plugins/replication/winsync-plugin.h b/ldap/servers/plugins/replication/winsync-plugin.h
index 9ac5621..0f3b757 100644
--- a/ldap/servers/plugins/replication/winsync-plugin.h
+++ b/ldap/servers/plugins/replication/winsync-plugin.h
@@ -50,6 +50,7 @@
*/
#define WINSYNC_v1_0_GUID "CDA8F029-A3C6-4EBB-80B8-A2E183DB0481"
#define WINSYNC_v2_0_GUID "706B83AA-FC51-444A-ACC9-53DC73D641D4"
+#define WINSYNC_v3_0_GUID "6D7C2E54-638C-4564-B53F-D9C5354DEBA0"
/*
* This callback is called when a winsync agreement is created.
@@ -274,654 +275,12 @@ typedef void (*winsync_post_ad_mod_mods_cb)(void *cookie, const Slapi_Entry *raw
#define WINSYNC_PLUGIN_POST_AD_MOD_USER_MODS_CB 30
#define WINSYNC_PLUGIN_POST_AD_MOD_GROUP_MODS_CB 31
#define WINSYNC_PLUGIN_VERSION_2_END WINSYNC_PLUGIN_POST_AD_MOD_GROUP_MODS_CB
-/*
- The following are sample code stubs to show how to implement
- a plugin which uses this api
-*/
-
-/* #define WINSYNC_SAMPLE_CODE */
-#ifdef WINSYNC_SAMPLE_CODE
-
-#include "slapi-plugin.h"
-#include "winsync-plugin.h"
-
-static char *test_winsync_plugin_name = "test_winsync_api";
-
-static void *
-test_winsync_api_init(const Slapi_DN *ds_subtree, const Slapi_DN *ad_subtree)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_init [%s] [%s] -- begin\n",
- slapi_sdn_get_dn(ds_subtree),
- slapi_sdn_get_dn(ad_subtree));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_init -- end\n");
-
- return NULL;
-}
-
-static void
-test_winsync_dirsync_search_params_cb(void *cbdata, const char *agmt_dn,
- char **base, int *scope, char **filter,
- char ***attrs, LDAPControl ***serverctrls)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_dirsync_search_params_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_dirsync_search_params_cb -- end\n");
-
- return;
-}
-
-/* called before searching for a single entry from AD - agmt_dn will be NULL */
-static void
-test_winsync_pre_ad_search_cb(void *cbdata, const char *agmt_dn,
- char **base, int *scope, char **filter,
- char ***attrs, LDAPControl ***serverctrls)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_search_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_search_cb -- end\n");
-
- return;
-}
-
-/* called before an internal search to get a single DS entry - agmt_dn will be NULL */
-static void
-test_winsync_pre_ds_search_entry_cb(void *cbdata, const char *agmt_dn,
- char **base, int *scope, char **filter,
- char ***attrs, LDAPControl ***serverctrls)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ds_search_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ds_search_cb -- end\n");
-
- return;
-}
-
-/* called before the total update to get all entries from the DS to sync to AD */
-static void
-test_winsync_pre_ds_search_all_cb(void *cbdata, const char *agmt_dn,
- char **base, int *scope, char **filter,
- char ***attrs, LDAPControl ***serverctrls)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ds_search_all_cb -- orig filter [%s] -- begin\n",
- ((filter && *filter) ? *filter : "NULL"));
-
- /* We only want to grab users from the ds side - no groups */
- slapi_ch_free_string(filter);
- /* maybe use ntUniqueId=* - only get users that have already been
- synced with AD already - ntUniqueId and ntUserDomainId are
- indexed for equality only - need to add presence? */
- *filter = slapi_ch_strdup("(&(objectclass=ntuser)(ntUserDomainId=*))");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ds_search_all_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ad_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
- Slapi_Mods *smods, int *do_modify)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_mod_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_mod_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ad_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
- Slapi_Mods *smods, int *do_modify)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_mod_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_mod_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
- Slapi_Mods *smods, int *do_modify)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ds_mod_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ds_mod_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
- Slapi_Mods *smods, int *do_modify)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ds_mod_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ds_mod_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, Slapi_Entry *ds_entry)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ds_add_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ds_add_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ds_add_group_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, Slapi_Entry *ds_entry)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ds_add_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ds_add_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_get_new_ds_user_dn_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, char **new_dn_string,
- const Slapi_DN *ds_suffix, const Slapi_DN *ad_suffix)
-{
- char **rdns = NULL;
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_get_new_ds_user_dn_cb -- old dn [%s] -- begin\n",
- *new_dn_string);
-
- rdns = slapi_ldap_explode_dn(*new_dn_string, 0);
- if (!rdns || !rdns[0]) {
- slapi_ldap_value_free(rdns);
- return;
- }
-
- slapi_ch_free_string(new_dn_string);
- *new_dn_string = PR_smprintf("%s,%s", rdns[0], slapi_sdn_get_dn(ds_suffix));
- slapi_ldap_value_free(rdns);
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_get_new_ds_user_dn_cb -- new dn [%s] -- end\n",
- *new_dn_string);
-
- return;
-}
-
-static void
-test_winsync_get_new_ds_group_dn_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, char **new_dn_string,
- const Slapi_DN *ds_suffix, const Slapi_DN *ad_suffix)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_get_new_ds_group_dn_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_get_new_ds_group_dn_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ad_mod_user_mods_cb(void *cbdata, const Slapi_Entry *rawentry,
- const Slapi_Entry *ds_entry,
- const Slapi_DN *local_dn, LDAPMod * const *origmods,
- Slapi_DN *remote_dn, LDAPMod ***modstosend)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_mod_user_mods_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_mod_user_mods_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ad_mod_group_mods_cb(void *cbdata, const Slapi_Entry *rawentry,
- const Slapi_Entry *ds_entry,
- const Slapi_DN *local_dn, LDAPMod * const *origmods,
- Slapi_DN *remote_dn, LDAPMod ***modstosend)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_mod_group_mods_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_mod_group_mods_cb -- end\n");
-
- return;
-}
-
-static int
-test_winsync_can_add_entry_to_ad_cb(void *cbdata, const Slapi_Entry *local_entry,
- const Slapi_DN *remote_dn)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_can_add_entry_to_ad_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_can_add_entry_to_ad_cb -- end\n");
-
- /* return 0;*/ /* false - do not allow entries to be added to ad */
- return 1; /* true - allow entries to be added to ad */
-}
-
-static void
-test_winsync_begin_update_cb(void *cbdata, const Slapi_DN *ds_subtree,
- const Slapi_DN *ad_subtree, int is_total)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_begin_update_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_begin_update_cb -- end\n");
- return;
-}
-
-static void
-test_winsync_end_update_cb(void *cbdata, const Slapi_DN *ds_subtree,
- const Slapi_DN *ad_subtree, int is_total)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_end_update_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_end_update_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_destroy_agmt_cb(void *cbdata, const Slapi_DN *ds_subtree,
- const Slapi_DN *ad_subtree)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_destroy_agmt_cb -- begin\n");
-
- /* free(cbdata); */
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_destroy_agmt_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ad_mod_user_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ad_mod_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of modifying AD entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ad_mod_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ad_mod_group_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ad_mod_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of modifying AD entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ad_mod_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ds_mod_user_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ds_mod_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of modifying DS entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ds_mod_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ds_mod_group_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ds_mod_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of modifying DS entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ds_mod_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ds_add_user_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ds_add_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of adding DS entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ds_add_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ds_add_group_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ds_add_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of adding DS entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ds_add_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ad_add_user_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_add_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Adding AD entry [%s] from add of DS entry [%s]\n",
- slapi_entry_get_dn(ad_entry), slapi_entry_get_dn(ds_entry));
- /* make modifications to ad_entry here */
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_add_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ad_add_group_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_add_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Adding AD entry [%s] from add of DS entry [%s]\n",
- slapi_entry_get_dn(ad_entry), slapi_entry_get_dn(ds_entry));
- /* make modifications to ad_entry here */
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_add_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ad_add_user_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ad_add_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of adding AD entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ad_add_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ad_add_group_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ad_add_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of adding AD entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ad_add_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ad_mod_user_mods_cb(void *cookie, const Slapi_Entry *rawentry, const Slapi_DN *local_dn, const Slapi_Entry *ds_entry, LDAPMod * const *origmods, Slapi_DN *remote_dn, LDAPMod ***modstosend, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ad_mod_user_mods_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of modifying AD entry [%s] was [%d:%s]\n",
- slapi_sdn_get_dn(remote_dn), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ad_mod_user_mods_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ad_mod_group_mods_cb(void *cookie, const Slapi_Entry *rawentry, const Slapi_DN *local_dn, const Slapi_Entry *ds_entry, LDAPMod * const *origmods, Slapi_DN *remote_dn, LDAPMod ***modstosend, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ad_mod_group_mods_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of modifying AD entry [%s] was [%d:%s]\n",
- slapi_sdn_get_dn(remote_dn), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ad_mod_group_mods_cb -- end\n");
-
- return;
-}
-
-/**
- * Plugin identifiers
- */
-static Slapi_PluginDesc test_winsync_pdesc = {
- "test-winsync-plugin",
- VENDOR,
- DS_PACKAGE_VERSION,
- "test winsync plugin"
-};
-
-static Slapi_ComponentId *test_winsync_plugin_id = NULL;
-
-#ifdef TEST_V1_WINSYNC_API
-static void *test_winsync_api_v1[] = {
- NULL, /* reserved for api broker use, must be zero */
- test_winsync_api_init,
- test_winsync_dirsync_search_params_cb,
- test_winsync_pre_ad_search_cb,
- test_winsync_pre_ds_search_entry_cb,
- test_winsync_pre_ds_search_all_cb,
- test_winsync_pre_ad_mod_user_cb,
- test_winsync_pre_ad_mod_group_cb,
- test_winsync_pre_ds_mod_user_cb,
- test_winsync_pre_ds_mod_group_cb,
- test_winsync_pre_ds_add_user_cb,
- test_winsync_pre_ds_add_group_cb,
- test_winsync_get_new_ds_user_dn_cb,
- test_winsync_get_new_ds_group_dn_cb,
- test_winsync_pre_ad_mod_user_mods_cb,
- test_winsync_pre_ad_mod_group_mods_cb,
- test_winsync_can_add_entry_to_ad_cb,
- test_winsync_begin_update_cb,
- test_winsync_end_update_cb,
- test_winsync_destroy_agmt_cb
-};
-#endif /* TEST_V1_WINSYNC_API */
-
-static void *test_winsync_api_v2[] = {
- NULL, /* reserved for api broker use, must be zero */
- test_winsync_api_init,
- test_winsync_dirsync_search_params_cb,
- test_winsync_pre_ad_search_cb,
- test_winsync_pre_ds_search_entry_cb,
- test_winsync_pre_ds_search_all_cb,
- test_winsync_pre_ad_mod_user_cb,
- test_winsync_pre_ad_mod_group_cb,
- test_winsync_pre_ds_mod_user_cb,
- test_winsync_pre_ds_mod_group_cb,
- test_winsync_pre_ds_add_user_cb,
- test_winsync_pre_ds_add_group_cb,
- test_winsync_get_new_ds_user_dn_cb,
- test_winsync_get_new_ds_group_dn_cb,
- test_winsync_pre_ad_mod_user_mods_cb,
- test_winsync_pre_ad_mod_group_mods_cb,
- test_winsync_can_add_entry_to_ad_cb,
- test_winsync_begin_update_cb,
- test_winsync_end_update_cb,
- test_winsync_destroy_agmt_cb,
- test_winsync_post_ad_mod_user_cb,
- test_winsync_post_ad_mod_group_cb,
- test_winsync_post_ds_mod_user_cb,
- test_winsync_post_ds_mod_group_cb,
- test_winsync_post_ds_add_user_cb,
- test_winsync_post_ds_add_group_cb,
- test_winsync_pre_ad_add_user_cb,
- test_winsync_pre_ad_add_group_cb,
- test_winsync_post_ad_add_user_cb,
- test_winsync_post_ad_add_group_cb,
- test_winsync_post_ad_mod_user_mods_cb,
- test_winsync_post_ad_mod_group_mods_cb
-};
-
-static int
-test_winsync_plugin_start(Slapi_PBlock *pb)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_plugin_start -- begin\n");
-
- if( slapi_apib_register(WINSYNC_v2_0_GUID, test_winsync_api_v2) ) {
- slapi_log_error( SLAPI_LOG_FATAL, test_winsync_plugin_name,
- "<-- test_winsync_plugin_start -- failed to register winsync api -- end\n");
- return -1;
- }
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_plugin_start -- end\n");
- return 0;
-}
-
-static int
-test_winsync_plugin_close(Slapi_PBlock *pb)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_plugin_close -- begin\n");
-
- slapi_apib_unregister(WINSYNC_v2_0_GUID);
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_plugin_close -- end\n");
- return 0;
-}
-
-/* this is the slapi plugin init function,
- not the one used by the winsync api
-*/
-int test_winsync_plugin_init(Slapi_PBlock *pb)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_plugin_init -- begin\n");
-
- if ( slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION,
- SLAPI_PLUGIN_VERSION_01 ) != 0 ||
- slapi_pblock_set(pb, SLAPI_PLUGIN_START_FN,
- (void *) test_winsync_plugin_start ) != 0 ||
- slapi_pblock_set(pb, SLAPI_PLUGIN_CLOSE_FN,
- (void *) test_winsync_plugin_close ) != 0 ||
- slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION,
- (void *)&test_winsync_pdesc ) != 0 )
- {
- slapi_log_error( SLAPI_LOG_FATAL, test_winsync_plugin_name,
- "<-- test_winsync_plugin_init -- failed to register plugin -- end\n");
- return -1;
- }
-
- /* Retrieve and save the plugin identity to later pass to
- internal operations */
- if (slapi_pblock_get(pb, SLAPI_PLUGIN_IDENTITY, &test_winsync_plugin_id) != 0) {
- slapi_log_error(SLAPI_LOG_FATAL, test_winsync_plugin_name,
- "<-- test_winsync_plugin_init -- failed to retrieve plugin identity -- end\n");
- return -1;
- }
-
- slapi_log_error( SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_plugin_init -- end\n");
- return 0;
-}
-
-/*
-dn: cn=Test Winsync API,cn=plugins,cn=config
-objectclass: top
-objectclass: nsSlapdPlugin
-objectclass: extensibleObject
-cn: Test Winsync API
-nsslapd-pluginpath: libtestwinsync-plugin
-nsslapd-plugininitfunc: test_winsync_plugin_init
-nsslapd-plugintype: preoperation
-nsslapd-pluginenabled: on
-nsslapd-plugin-depends-on-type: database
-nsslapd-plugin-depends-on-named: Multimaster Replication Plugin
-*/
+typedef int (*winsync_plugin_precedence_cb)(void);
+#define WINSYNC_PLUGIN_PRECEDENCE_CB 32
+#define WINSYNC_PLUGIN_VERSION_3_END WINSYNC_PLUGIN_PRECEDENCE_CB
-#endif /* WINSYNC_SAMPLE_CODE */
+/* precedence works like regular slapi plugin precedence */
+#define WINSYNC_PLUGIN_DEFAULT_PRECEDENCE 50
#endif /* WINSYNC_PLUGIN_PUBLIC_API */
diff --git a/ldap/servers/slapd/apibroker.c b/ldap/servers/slapd/apibroker.c
index 2987716..9937b88 100644
--- a/ldap/servers/slapd/apibroker.c
+++ b/ldap/servers/slapd/apibroker.c
@@ -72,6 +72,7 @@ typedef struct _API_FEATURES
static ABAPI *head = NULL;
static ABAPI **ABAPIBroker_FindInterface(char *guid);
+static void ***ABAPIBroker_FindInterface_All(char *guid);
int slapi_apib_register(char *guid, void **api )
{
@@ -188,6 +189,39 @@ int slapi_apib_get_interface(char *guid, void ***api)
return ret;
}
+int slapi_apib_get_interface_all(char *guid, void ****api)
+{
+ void ***retapi = NULL;
+ int idx = 0;
+
+ if(buffer_lock == 0)
+ return -1;
+
+ if(buffer_lock == 0)
+ {
+ if(0 == (buffer_lock = slapi_new_mutex())) /* we never free this mutex */
+ /* badness */
+ return -1;
+ }
+
+ slapi_lock_mutex(buffer_lock);
+
+ retapi = ABAPIBroker_FindInterface_All(guid);
+ for (idx = 0; retapi && retapi[idx]; ++idx) {
+ void **theapi = retapi[idx];
+ if(theapi[0])
+ {
+ slapi_apib_addref(theapi);
+ }
+ }
+
+ *api = retapi;
+
+ slapi_unlock_mutex(buffer_lock);
+
+ return 0;
+}
+
int slapi_apib_make_reference_counted(void **api, slapi_apib_callback_on_zero callback_on_zero)
{
int ret = -1;
@@ -280,3 +314,27 @@ static ABAPI **ABAPIBroker_FindInterface(char *guid)
return 0;
}
+
+static void ***ABAPIBroker_FindInterface_All(char *guid)
+{
+ ABAPI *api = NULL;
+ ABAPI *start_api = head;
+ void ***apilist = NULL;
+ int idx = 0;
+
+ api = start_api;
+ if (!api) {
+ return NULL;
+ }
+
+ do {
+ if(0 == strcmp(guid, api->guid)) {
+ apilist = (void ***)slapi_ch_realloc((char *)apilist, (idx+2)*sizeof(void **));
+ apilist[idx++] = api->api;
+ apilist[idx] = NULL;
+ }
+ api = api->next;
+ } while(api != start_api);
+
+ return apilist;
+}
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index c16800f..f277fd3 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -5132,6 +5132,20 @@ int slapi_apib_unregister(char *guid); /* remove interface from published list *
*/
int slapi_apib_get_interface(char *guid, void ***api); /* retrieve an interface for use */
+/* Function: slapi_apib_get_interface_all
+ Description: this function allows retrieval of a published interface,
+ if the api reference counted, then the reference
+ count is incremented
+ This will return all published interfaces for a given guid
+ Parameters: guid - a string constant that uniquely identifies the
+ interface requested
+ apilist - the retrieved list of vtables for the published api - caller
+ must free the apilist, but not the apilist elements
+ Return: 0 if function succeeds
+ non-zero otherwise
+*/
+int slapi_apib_get_interface_all(char *guid, void ****apilist); /* retrieve all interfaces for guid */
+
/* Function: slapi_apib_make_reference_counted
Description: this function makes an interface a reference counted interface
1
0
Branch '389-ds-base-1.2.11' - 10 commits - ldap/admin ldap/schema ldap/servers Makefile.am Makefile.in
by Richard Allen Megginson 03 Aug '12
by Richard Allen Megginson 03 Aug '12
03 Aug '12
Makefile.am | 1
Makefile.in | 1
ldap/admin/src/scripts/template-cleanallruv.pl.in | 186 +
ldap/schema/01core389.ldif | 17
ldap/servers/plugins/dna/dna.c | 12
ldap/servers/plugins/linkedattrs/fixup_task.c | 2
ldap/servers/plugins/linkedattrs/linked_attrs.h | 2
ldap/servers/plugins/memberof/memberof.c | 2
ldap/servers/plugins/memberof/memberof.h | 2
ldap/servers/plugins/replication/cl5_api.c | 75
ldap/servers/plugins/replication/cl5_api.h | 9
ldap/servers/plugins/replication/cl5_clcache.c | 16
ldap/servers/plugins/replication/repl5.h | 58
ldap/servers/plugins/replication/repl5_agmt.c | 171 -
ldap/servers/plugins/replication/repl5_agmtlist.c | 13
ldap/servers/plugins/replication/repl5_connection.c | 13
ldap/servers/plugins/replication/repl5_inc_protocol.c | 21
ldap/servers/plugins/replication/repl5_init.c | 46
ldap/servers/plugins/replication/repl5_plugins.c | 18
ldap/servers/plugins/replication/repl5_replica.c | 497 ++-
ldap/servers/plugins/replication/repl5_replica_config.c | 2238 +++++++++++----
ldap/servers/plugins/replication/repl5_ruv.c | 58
ldap/servers/plugins/replication/repl5_ruv.h | 1
ldap/servers/plugins/replication/repl_extop.c | 448 +--
ldap/servers/plugins/replication/repl_globals.c | 5
ldap/servers/plugins/replication/windows_private.c | 1270 ++++++--
ldap/servers/plugins/replication/windows_protocol_util.c | 29
ldap/servers/plugins/replication/windowsrepl.h | 1
ldap/servers/plugins/replication/winsync-plugin.h | 653 ----
ldap/servers/plugins/rootdn_access/rootdn_access.c | 32
ldap/servers/plugins/uiduniq/uid.c | 3
ldap/servers/plugins/usn/usn_cleanup.c | 2
ldap/servers/slapd/apibroker.c | 58
ldap/servers/slapd/back-ldbm/cache.c | 24
ldap/servers/slapd/back-ldbm/dblayer.c | 2
ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c | 6
ldap/servers/slapd/back-ldbm/ldbm_search.c | 2
ldap/servers/slapd/libglobs.c | 63
ldap/servers/slapd/log.c | 27
ldap/servers/slapd/slapi-plugin.h | 48
ldap/servers/slapd/task.c | 56
41 files changed, 4161 insertions(+), 2027 deletions(-)
New commits:
commit fb1e89cb0117a44082cebb6289735e740860c783
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Aug 2 16:48:11 2012 -0600
Ticket #425 - support multiple winsync plugins
https://fedorahosted.org/389/ticket/425
Resolves: Ticket #425
Bug Description: support multiple winsync plugins
Reviewed by: nkinder (Thanks!)
Branch: 389-ds-base-1.2.11
Fix Description: Instead of a single WinsyncAPI pointer, use a CList to
store a list of APIs. Added API version 3 - the new function is a
precedence callback so the API can report back the plugin precedence to
order multiple winsync plugins. Since each API may have a different
cookie per agreement, changed the cookie to be a list of cookies indexed
by the API pointer. The old slapi_apib interface stored multiple APIs
per GUID, but did not allow plugins to retrieve them. I added another
slapi_apib function which allows the plugin to retrieve all of the APIs
for a given GUID.
I also move the test winsync code from the public header into the
windows_private.c code and compiled it by default. This will allow us to
easily enable the plugin for testing, and also exercises the compiler in
case we make an incompatible change to the public API.
Platforms tested: RHEL6 x86_64
Flag Day: Yes - public header file change
Doc impact: Yes - document the new behavior and precedence
diff --git a/ldap/servers/plugins/replication/windows_private.c b/ldap/servers/plugins/replication/windows_private.c
index 72cb721..85b585a 100644
--- a/ldap/servers/plugins/replication/windows_private.c
+++ b/ldap/servers/plugins/replication/windows_private.c
@@ -258,6 +258,8 @@ void windows_agreement_delete(Repl_Agmt *ra)
winsync_plugin_call_destroy_agmt_cb(ra, dp->directory_subtree,
dp->windows_subtree);
+ windows_plugin_cleanup_agmt(ra);
+
slapi_sdn_free(&dp->directory_subtree);
slapi_sdn_free(&dp->windows_subtree);
slapi_filter_free(dp->directory_filter, 1);
@@ -1017,78 +1019,235 @@ windows_private_set_sync_interval(Repl_Agmt *ra, char *str)
LDAPDebug0Args( LDAP_DEBUG_TRACE, "<= windows_private_set_sync_interval\n" );
}
-/* an array of function pointers */
-static void **_WinSyncAPI = NULL;
-static int maxapiidx = WINSYNC_PLUGIN_VERSION_1_END;
-#define DECL_WINSYNC_API_FUNC(idx,thetype,thefunc) \
- thetype thefunc = (_WinSyncAPI && (idx <= maxapiidx) && _WinSyncAPI[idx]) ? \
- (thetype)_WinSyncAPI[idx] : NULL;
+static PRCallOnceType winsync_callOnce = {0,0};
-void
-windows_plugin_init(Repl_Agmt *ra)
+struct winsync_plugin {
+ struct winsync_plugin *next; /* see PRCList - declare here to avoid lots of casting */
+ struct winsync_plugin *prev; /* see PRCList - declare here to avoid lots of casting */
+ void **api; /* the api - array of function pointers */
+ int maxapi; /* the max index i.e. the api version */
+ int precedence; /* lower number == higher precedence */
+};
+static struct winsync_plugin winsync_plugin_list;
+
+#define DECL_WINSYNC_API_IDX_FUNC(theapi,idx,maxidx,thetype,thefunc) \
+ thetype thefunc = (theapi && (idx <= maxidx) && theapi[idx]) ? \
+ (thetype)theapi[idx] : NULL;
+
+#define WINSYNC_PLUGIN_CALL_PLUGINS_BEGIN(idx,thetype,thefunc) \
+ struct winsync_plugin *elem; \
+ for (elem = PR_LIST_HEAD(&winsync_plugin_list); \
+ elem && (elem != &winsync_plugin_list); \
+ elem = PR_NEXT_LINK(elem)) { \
+ DECL_WINSYNC_API_IDX_FUNC(elem->api,idx,elem->maxapi,thetype,thefunc); \
+ if (thefunc) {
+
+#define WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(idx,thetype,thefunc) \
+ WINSYNC_PLUGIN_CALL_PLUGINS_BEGIN(idx,thetype,thefunc) \
+ void *cookie = winsync_plugin_cookie_find(ra, elem->api);
+
+#define WINSYNC_PLUGIN_CALL_PLUGINS_END } /* this one matches if thefunc */ } /* this one matches the for loop */
+
+/* this structure is per agreement - to store the cookie per agreement
+ for each winsync plugin */
+struct winsync_plugin_cookie {
+ struct winsync_plugin_cookie *next; /* see PRCList - declare here to avoid lots of casting */
+ struct winsync_plugin_cookie *prev; /* see PRCList - declare here to avoid lots of casting */
+ void **api; /* the api - array of function pointers */
+ void *cookie; /* plugin data */
+};
+
+static struct winsync_plugin *
+new_winsync_plugin(void **theapi, int maxapi, int precedence)
{
- void *cookie = NULL;
- winsync_plugin_init_cb initfunc = NULL;
-
- LDAPDebug0Args( LDAP_DEBUG_PLUGIN, "--> windows_plugin_init_start -- begin\n");
-
- /* if the function pointer array is null, get the functions - we will
- call init once per replication agreement, but will only grab the
- api once */
- if(NULL == _WinSyncAPI) {
- if (slapi_apib_get_interface(WINSYNC_v2_0_GUID, &_WinSyncAPI) ||
- (NULL == _WinSyncAPI))
- {
- LDAPDebug1Arg( LDAP_DEBUG_PLUGIN,
- "<-- windows_plugin_init_start -- no windows plugin API registered for GUID [%s] -- end\n",
- WINSYNC_v2_0_GUID);
- } else if (_WinSyncAPI) {
- LDAPDebug1Arg( LDAP_DEBUG_PLUGIN,
- "<-- windows_plugin_init_start -- found windows plugin API registered for GUID [%s] -- end\n",
- WINSYNC_v2_0_GUID);
- maxapiidx = WINSYNC_PLUGIN_VERSION_2_END;
+ struct winsync_plugin *wpi = (struct winsync_plugin *)slapi_ch_calloc(1, sizeof(struct winsync_plugin));
+ wpi->api = theapi;
+ wpi->maxapi = maxapi;
+ wpi->precedence = precedence;
+ return wpi;
+}
+
+static struct winsync_plugin *
+windows_plugin_find(void **theapi)
+{
+ struct winsync_plugin *elem = PR_LIST_HEAD(&winsync_plugin_list);
+ while (elem && (elem != &winsync_plugin_list)) {
+ if (theapi == elem->api) {
+ return elem;
}
+ elem = PR_NEXT_LINK(elem);
}
+ return NULL;
+}
+
+/* returns 0 for success - 1 means already added - -1 means some error */
+static int
+windows_plugin_add(void **theapi, int maxapi)
+{
+ int precedence = WINSYNC_PLUGIN_DEFAULT_PRECEDENCE;
+ DECL_WINSYNC_API_IDX_FUNC(theapi,WINSYNC_PLUGIN_PRECEDENCE_CB,maxapi,winsync_plugin_precedence_cb,thefunc);
- if (NULL == _WinSyncAPI) { /* no v2 interface - look for v1 */
- if (slapi_apib_get_interface(WINSYNC_v1_0_GUID, &_WinSyncAPI) ||
- (NULL == _WinSyncAPI))
- {
- LDAPDebug1Arg( LDAP_DEBUG_PLUGIN,
- "<-- windows_plugin_init_start -- no windows plugin API registered for GUID [%s] -- end\n",
- WINSYNC_v1_0_GUID);
- return;
+ if (thefunc) {
+ /* supports precedence */
+ precedence = (*thefunc)();
+ }
+ if (PR_CLIST_IS_EMPTY(&winsync_plugin_list)) {
+ struct winsync_plugin *wpi = new_winsync_plugin(theapi, maxapi, precedence);
+ PR_INSERT_LINK(wpi, &winsync_plugin_list);
+ return 0;
+ } else if (windows_plugin_find(theapi)) {
+ return 1; /* already in list */
+ } else {
+ struct winsync_plugin *wpi = new_winsync_plugin(theapi, maxapi, precedence);
+ struct winsync_plugin *elem = PR_LIST_HEAD(&winsync_plugin_list);
+ while (elem && (elem != &winsync_plugin_list)) {
+ if (precedence < elem->precedence) {
+ PR_INSERT_BEFORE(wpi, elem);
+ break;
+ }
+ elem = PR_NEXT_LINK(elem);
+ }
+ if (elem == &winsync_plugin_list) {
+ /* just add to end of list */
+ PR_INSERT_BEFORE(wpi, elem);
+ }
+ return 0;
+ }
+ return -1;
+}
+
+static PRStatus
+windows_plugin_callonce(void)
+{
+ char *guids[] = {WINSYNC_v3_0_GUID, WINSYNC_v2_0_GUID, WINSYNC_v1_0_GUID, NULL};
+ int maxapis[] = {WINSYNC_PLUGIN_VERSION_3_END, WINSYNC_PLUGIN_VERSION_2_END,
+ WINSYNC_PLUGIN_VERSION_1_END, 0};
+ int ii;
+
+ PR_INIT_CLIST(&winsync_plugin_list);
+ /* loop through all of the registered winsync plugins - look for them in reverse
+ version order (e.g. look for v3 first) - if there are no plugins registered
+ for the given version, or we have already registered all plugins for a given
+ version, just go to the next lowest version */
+ for (ii = 0; guids[ii]; ++ii) {
+ char *guid = guids[ii];
+ int maxapi = maxapis[ii];
+ void ***theapis = NULL;
+
+ if (slapi_apib_get_interface_all(guid, &theapis) || (NULL == theapis)) {
+ LDAPDebug1Arg(LDAP_DEBUG_PLUGIN,
+ "<-- windows_plugin_callonce -- no more windows plugin APIs registered "
+ "for GUID [%s] -- end\n",
+ guid);
} else {
- LDAPDebug1Arg( LDAP_DEBUG_PLUGIN,
- "<-- windows_plugin_init_start -- found windows plugin API registered for GUID [%s] -- end\n",
- WINSYNC_v1_0_GUID);
+ int idx;
+ for (idx = 0; theapis && theapis[idx]; ++idx) {
+ if (windows_plugin_add(theapis[idx], maxapi)) {
+ LDAPDebug(LDAP_DEBUG_PLUGIN,
+ "<-- windows_plugin_callonce -- already added windows plugin API "
+ "[%d][0x%p] for GUID [%s] -- end\n",
+ idx, theapis[idx], guid);
+ }
+ }
}
- }
+ slapi_ch_free((void **)&theapis);
+ }
+ return PR_SUCCESS;
+}
+
+static struct winsync_plugin_cookie *
+new_winsync_plugin_cookie(void **theapi, void *cookie)
+{
+ struct winsync_plugin_cookie *wpc = (struct winsync_plugin_cookie *)slapi_ch_calloc(1, sizeof(struct winsync_plugin_cookie));
+ wpc->api = theapi;
+ wpc->cookie = cookie;
+ return wpc;
+}
+
+static void *
+winsync_plugin_cookie_find(const Repl_Agmt *ra, void **theapi)
+{
+ if (ra) {
+ struct winsync_plugin_cookie *list = (struct winsync_plugin_cookie *)windows_private_get_api_cookie(ra);
+ if (list) {
+ struct winsync_plugin_cookie *elem = PR_LIST_HEAD(list);
+ while (elem && (elem != list)) {
+ if (theapi == elem->api) {
+ return elem->cookie;
+ }
+ elem = PR_NEXT_LINK(elem);
+ }
+ }
+ }
+ return NULL;
+}
+
+static void
+winsync_plugin_cookie_add(struct winsync_plugin_cookie **list, void **theapi, void *cookie)
+{
+ struct winsync_plugin_cookie *elem = NULL;
+ if (!*list) {
+ *list = new_winsync_plugin_cookie(NULL, NULL);
+ PR_INIT_CLIST(*list);
+ }
+ elem = new_winsync_plugin_cookie(theapi, cookie);
+ PR_INSERT_BEFORE(elem, *list);
+ return;
+}
- initfunc = (winsync_plugin_init_cb)_WinSyncAPI[WINSYNC_PLUGIN_INIT_CB];
- if (initfunc) {
- cookie = (*initfunc)(windows_private_get_directory_subtree(ra),
- windows_private_get_windows_subtree(ra));
+void
+windows_plugin_init(Repl_Agmt *ra)
+{
+ struct winsync_plugin_cookie *list = NULL;
+ void *cookie = NULL;
+ PRStatus rv;
+
+ LDAPDebug0Args( LDAP_DEBUG_PLUGIN, "--> windows_plugin_init_start -- begin\n");
+
+ rv = PR_CallOnce(&winsync_callOnce, windows_plugin_callonce);
+
+ /* call each plugin init function in turn - store the returned cookie
+ indexed by the api */
+ {
+ WINSYNC_PLUGIN_CALL_PLUGINS_BEGIN(WINSYNC_PLUGIN_INIT_CB,winsync_plugin_init_cb,thefunc)
+ cookie = (*thefunc)(windows_private_get_directory_subtree(ra),
+ windows_private_get_windows_subtree(ra));
+ if (cookie) {
+ winsync_plugin_cookie_add(&list, elem->api, cookie);
+ }
+ WINSYNC_PLUGIN_CALL_PLUGINS_END
}
- windows_private_set_api_cookie(ra, cookie);
+
+ windows_private_set_api_cookie(ra, list);
- LDAPDebug0Args( LDAP_DEBUG_PLUGIN, "<-- windows_plugin_init_start -- end\n");
+ LDAPDebug0Args( LDAP_DEBUG_PLUGIN, "<-- windows_plugin_init_start -- end\n");
return;
}
void
-winsync_plugin_call_dirsync_search_params_cb(const Repl_Agmt *ra, const char *agmt_dn,
- char **base, int *scope, char **filter,
- char ***attrs, LDAPControl ***serverctrls)
+windows_plugin_cleanup_agmt(Repl_Agmt *ra)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_DIRSYNC_SEARCH_CB,winsync_search_params_cb,thefunc);
+ struct winsync_plugin_cookie *list = (struct winsync_plugin_cookie *)windows_private_get_api_cookie(ra);
+ struct winsync_plugin_cookie *elem = NULL;
- if (!thefunc) {
- return;
+ while (list && !PR_CLIST_IS_EMPTY(list)) {
+ elem = PR_LIST_HEAD(list);
+ PR_REMOVE_LINK(elem);
+ slapi_ch_free((void **)&elem);
}
+ slapi_ch_free((void **)&list);
+ windows_private_set_api_cookie(ra, NULL);
+ return;
+}
- (*thefunc)(windows_private_get_api_cookie(ra), agmt_dn, base, scope, filter,
- attrs, serverctrls);
+void
+winsync_plugin_call_dirsync_search_params_cb(const Repl_Agmt *ra, const char *agmt_dn,
+ char **base, int *scope, char **filter,
+ char ***attrs, LDAPControl ***serverctrls)
+{
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_DIRSYNC_SEARCH_CB,winsync_search_params_cb,thefunc)
+ (*thefunc)(cookie, agmt_dn, base, scope, filter, attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1098,14 +1257,9 @@ winsync_plugin_call_pre_ad_search_cb(const Repl_Agmt *ra, const char *agmt_dn,
char **base, int *scope, char **filter,
char ***attrs, LDAPControl ***serverctrls)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_SEARCH_CB,winsync_search_params_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), agmt_dn, base, scope, filter,
- attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_SEARCH_CB,winsync_search_params_cb,thefunc)
+ (*thefunc)(cookie, agmt_dn, base, scope, filter, attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1115,14 +1269,9 @@ winsync_plugin_call_pre_ds_search_entry_cb(const Repl_Agmt *ra, const char *agmt
char **base, int *scope, char **filter,
char ***attrs, LDAPControl ***serverctrls)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_DS_SEARCH_ENTRY_CB,winsync_search_params_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), agmt_dn, base, scope, filter,
- attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_DS_SEARCH_ENTRY_CB,winsync_search_params_cb,thefunc)
+ (*thefunc)(cookie, agmt_dn, base, scope, filter, attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1132,14 +1281,9 @@ winsync_plugin_call_pre_ds_search_all_cb(const Repl_Agmt *ra, const char *agmt_d
char **base, int *scope, char **filter,
char ***attrs, LDAPControl ***serverctrls)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_DS_SEARCH_ALL_CB,winsync_search_params_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), agmt_dn, base, scope, filter,
- attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_DS_SEARCH_ALL_CB,winsync_search_params_cb,thefunc)
+ (*thefunc)(cookie, agmt_dn, base, scope, filter, attrs, serverctrls);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1149,14 +1293,9 @@ winsync_plugin_call_pre_ad_mod_user_cb(const Repl_Agmt *ra, const Slapi_Entry *r
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *do_modify)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_MOD_USER_CB,winsync_pre_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_MOD_USER_CB,winsync_pre_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1166,14 +1305,9 @@ winsync_plugin_call_pre_ad_mod_group_cb(const Repl_Agmt *ra, const Slapi_Entry *
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *do_modify)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_MOD_GROUP_CB,winsync_pre_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_MOD_GROUP_CB,winsync_pre_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1183,14 +1317,9 @@ winsync_plugin_call_pre_ds_mod_user_cb(const Repl_Agmt *ra, const Slapi_Entry *r
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *do_modify)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_DS_MOD_USER_CB,winsync_pre_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_DS_MOD_USER_CB,winsync_pre_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1200,14 +1329,9 @@ winsync_plugin_call_pre_ds_mod_group_cb(const Repl_Agmt *ra, const Slapi_Entry *
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *do_modify)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_DS_MOD_GROUP_CB,winsync_pre_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_DS_MOD_GROUP_CB,winsync_pre_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, do_modify);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1216,14 +1340,9 @@ void
winsync_plugin_call_pre_ds_add_user_cb(const Repl_Agmt *ra, const Slapi_Entry *rawentry,
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_DS_ADD_USER_CB,winsync_pre_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_DS_ADD_USER_CB,winsync_pre_add_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1232,14 +1351,9 @@ void
winsync_plugin_call_pre_ds_add_group_cb(const Repl_Agmt *ra, const Slapi_Entry *rawentry,
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_DS_ADD_GROUP_CB,winsync_pre_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_DS_ADD_GROUP_CB,winsync_pre_add_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1249,14 +1363,9 @@ winsync_plugin_call_get_new_ds_user_dn_cb(const Repl_Agmt *ra, const Slapi_Entry
Slapi_Entry *ad_entry, char **new_dn_string,
const Slapi_DN *ds_suffix, const Slapi_DN *ad_suffix)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_GET_NEW_DS_USER_DN_CB,winsync_get_new_dn_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- new_dn_string, ds_suffix, ad_suffix);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_GET_NEW_DS_USER_DN_CB,winsync_get_new_dn_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, new_dn_string, ds_suffix, ad_suffix);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1266,14 +1375,9 @@ winsync_plugin_call_get_new_ds_group_dn_cb(const Repl_Agmt *ra, const Slapi_Entr
Slapi_Entry *ad_entry, char **new_dn_string,
const Slapi_DN *ds_suffix, const Slapi_DN *ad_suffix)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_GET_NEW_DS_GROUP_DN_CB,winsync_get_new_dn_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- new_dn_string, ds_suffix, ad_suffix);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_GET_NEW_DS_GROUP_DN_CB,winsync_get_new_dn_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, new_dn_string, ds_suffix, ad_suffix);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1285,14 +1389,9 @@ winsync_plugin_call_pre_ad_mod_user_mods_cb(const Repl_Agmt *ra, const Slapi_Ent
LDAPMod * const *origmods,
Slapi_DN *remote_dn, LDAPMod ***modstosend)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_MOD_USER_MODS_CB,winsync_pre_ad_mod_mods_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, local_dn,
- ds_entry, origmods, remote_dn, modstosend);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_MOD_USER_MODS_CB,winsync_pre_ad_mod_mods_cb,thefunc)
+ (*thefunc)(cookie, rawentry, local_dn, ds_entry, origmods, remote_dn, modstosend);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1304,14 +1403,9 @@ winsync_plugin_call_pre_ad_mod_group_mods_cb(const Repl_Agmt *ra, const Slapi_En
LDAPMod * const *origmods,
Slapi_DN *remote_dn, LDAPMod ***modstosend)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_MOD_GROUP_MODS_CB,winsync_pre_ad_mod_mods_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, local_dn,
- ds_entry, origmods, remote_dn, modstosend);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_MOD_GROUP_MODS_CB,winsync_pre_ad_mod_mods_cb,thefunc)
+ (*thefunc)(cookie, rawentry, local_dn, ds_entry, origmods, remote_dn, modstosend);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1320,26 +1414,22 @@ int
winsync_plugin_call_can_add_entry_to_ad_cb(const Repl_Agmt *ra, const Slapi_Entry *local_entry,
const Slapi_DN *remote_dn)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_CAN_ADD_ENTRY_TO_AD_CB,winsync_can_add_to_ad_cb,thefunc);
-
- if (!thefunc) {
- return 1; /* default is entry can be added to AD */
- }
-
- return (*thefunc)(windows_private_get_api_cookie(ra), local_entry, remote_dn);
+ int canadd = 1;
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_CAN_ADD_ENTRY_TO_AD_CB,winsync_can_add_to_ad_cb,thefunc)
+ if (canadd) {
+ canadd = (*thefunc)(cookie, local_entry, remote_dn);
+ }
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
+ return canadd;
}
void
winsync_plugin_call_begin_update_cb(const Repl_Agmt *ra, const Slapi_DN *ds_subtree,
const Slapi_DN *ad_subtree, int is_total)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_BEGIN_UPDATE_CB,winsync_plugin_update_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), ds_subtree, ad_subtree, is_total);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_BEGIN_UPDATE_CB,winsync_plugin_update_cb,thefunc)
+ (*thefunc)(cookie, ds_subtree, ad_subtree, is_total);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1348,13 +1438,9 @@ void
winsync_plugin_call_end_update_cb(const Repl_Agmt *ra, const Slapi_DN *ds_subtree,
const Slapi_DN *ad_subtree, int is_total)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_END_UPDATE_CB,winsync_plugin_update_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), ds_subtree, ad_subtree, is_total);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_END_UPDATE_CB,winsync_plugin_update_cb,thefunc)
+ (*thefunc)(cookie, ds_subtree, ad_subtree, is_total);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1364,11 +1450,9 @@ winsync_plugin_call_destroy_agmt_cb(const Repl_Agmt *ra,
const Slapi_DN *ds_subtree,
const Slapi_DN *ad_subtree)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_DESTROY_AGMT_CB,winsync_plugin_destroy_agmt_cb,thefunc);
-
- if (thefunc) {
- (*thefunc)(windows_private_get_api_cookie(ra), ds_subtree, ad_subtree);
- }
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_DESTROY_AGMT_CB,winsync_plugin_destroy_agmt_cb,thefunc)
+ (*thefunc)(cookie, ds_subtree, ad_subtree);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1378,14 +1462,9 @@ winsync_plugin_call_post_ad_mod_user_cb(const Repl_Agmt *ra, const Slapi_Entry *
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_AD_MOD_USER_CB,winsync_post_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_AD_MOD_USER_CB,winsync_post_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1395,14 +1474,9 @@ winsync_plugin_call_post_ad_mod_group_cb(const Repl_Agmt *ra, const Slapi_Entry
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_AD_MOD_GROUP_CB,winsync_post_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_AD_MOD_GROUP_CB,winsync_post_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1412,14 +1486,9 @@ winsync_plugin_call_post_ds_mod_user_cb(const Repl_Agmt *ra, const Slapi_Entry *
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_DS_MOD_USER_CB,winsync_post_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_DS_MOD_USER_CB,winsync_post_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1429,14 +1498,9 @@ winsync_plugin_call_post_ds_mod_group_cb(const Repl_Agmt *ra, const Slapi_Entry
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
Slapi_Mods *smods, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_DS_MOD_GROUP_CB,winsync_post_mod_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_DS_MOD_GROUP_CB,winsync_post_mod_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, smods, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1445,14 +1509,9 @@ void
winsync_plugin_call_post_ds_add_user_cb(const Repl_Agmt *ra, const Slapi_Entry *rawentry,
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_DS_ADD_USER_CB,winsync_post_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_DS_ADD_USER_CB,winsync_post_add_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1461,14 +1520,9 @@ void
winsync_plugin_call_post_ds_add_group_cb(const Repl_Agmt *ra, const Slapi_Entry *rawentry,
Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_DS_ADD_GROUP_CB,winsync_post_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, ad_entry,
- ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_DS_ADD_GROUP_CB,winsync_post_add_cb,thefunc)
+ (*thefunc)(cookie, rawentry, ad_entry, ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1477,13 +1531,9 @@ void
winsync_plugin_call_pre_ad_add_user_cb(const Repl_Agmt *ra, Slapi_Entry *ad_entry,
Slapi_Entry *ds_entry)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_ADD_USER_CB,winsync_pre_ad_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), ad_entry, ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_ADD_USER_CB,winsync_pre_ad_add_cb,thefunc)
+ (*thefunc)(cookie, ad_entry, ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1492,13 +1542,9 @@ void
winsync_plugin_call_pre_ad_add_group_cb(const Repl_Agmt *ra, Slapi_Entry *ad_entry,
Slapi_Entry *ds_entry)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_PRE_AD_ADD_GROUP_CB,winsync_pre_ad_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), ad_entry, ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_PRE_AD_ADD_GROUP_CB,winsync_pre_ad_add_cb,thefunc)
+ (*thefunc)(cookie, ad_entry, ds_entry);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1507,13 +1553,9 @@ void
winsync_plugin_call_post_ad_add_user_cb(const Repl_Agmt *ra, Slapi_Entry *ad_entry,
Slapi_Entry *ds_entry, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_AD_ADD_USER_CB,winsync_post_ad_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), ad_entry, ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_AD_ADD_USER_CB,winsync_post_ad_add_cb,thefunc)
+ (*thefunc)(cookie, ad_entry, ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1522,13 +1564,9 @@ void
winsync_plugin_call_post_ad_add_group_cb(const Repl_Agmt *ra, Slapi_Entry *ad_entry,
Slapi_Entry *ds_entry, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_AD_ADD_GROUP_CB,winsync_post_ad_add_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), ad_entry, ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_AD_ADD_GROUP_CB,winsync_post_ad_add_cb,thefunc)
+ (*thefunc)(cookie, ad_entry, ds_entry, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1540,14 +1578,9 @@ winsync_plugin_call_post_ad_mod_user_mods_cb(const Repl_Agmt *ra, const Slapi_En
LDAPMod * const *origmods,
Slapi_DN *remote_dn, LDAPMod **modstosend, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_AD_MOD_USER_MODS_CB,winsync_post_ad_mod_mods_cb,thefunc);
-
- if (!thefunc) {
- return;
- }
-
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, local_dn,
- ds_entry, origmods, remote_dn, modstosend, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_AD_MOD_USER_MODS_CB,winsync_post_ad_mod_mods_cb,thefunc)
+ (*thefunc)(cookie, rawentry, local_dn, ds_entry, origmods, remote_dn, modstosend, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
return;
}
@@ -1559,18 +1592,711 @@ winsync_plugin_call_post_ad_mod_group_mods_cb(const Repl_Agmt *ra, const Slapi_E
LDAPMod * const *origmods,
Slapi_DN *remote_dn, LDAPMod **modstosend, int *result)
{
- DECL_WINSYNC_API_FUNC(WINSYNC_PLUGIN_POST_AD_MOD_GROUP_MODS_CB,winsync_post_ad_mod_mods_cb,thefunc);
+ WINSYNC_PLUGIN_CALL_PLUGINS_COOKIE_BEGIN(WINSYNC_PLUGIN_POST_AD_MOD_GROUP_MODS_CB,winsync_post_ad_mod_mods_cb,thefunc)
+ (*thefunc)(cookie, rawentry, local_dn, ds_entry, origmods, remote_dn, modstosend, result);
+ WINSYNC_PLUGIN_CALL_PLUGINS_END;
+
+ return;
+}
+
+
+/*
+ The following are sample code stubs to show how to implement
+ a plugin which uses this api
+*/
+
+#define WINSYNC_SAMPLE_CODE
+#ifdef WINSYNC_SAMPLE_CODE
+
+#include "slapi-plugin.h"
+#include "winsync-plugin.h"
+
+static char *test_winsync_plugin_name = "test_winsync_api";
+
+static void *
+test_winsync_api_init(const Slapi_DN *ds_subtree, const Slapi_DN *ad_subtree)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_init [%s] [%s] -- begin\n",
+ slapi_sdn_get_dn(ds_subtree),
+ slapi_sdn_get_dn(ad_subtree));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_init -- end\n");
+
+ return NULL;
+}
+
+static void
+test_winsync_dirsync_search_params_cb(void *cbdata, const char *agmt_dn,
+ char **base, int *scope, char **filter,
+ char ***attrs, LDAPControl ***serverctrls)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_dirsync_search_params_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_dirsync_search_params_cb -- end\n");
+
+ return;
+}
+
+/* called before searching for a single entry from AD - agmt_dn will be NULL */
+static void
+test_winsync_pre_ad_search_cb(void *cbdata, const char *agmt_dn,
+ char **base, int *scope, char **filter,
+ char ***attrs, LDAPControl ***serverctrls)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_search_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_search_cb -- end\n");
+
+ return;
+}
+
+/* called before an internal search to get a single DS entry - agmt_dn will be NULL */
+static void
+test_winsync_pre_ds_search_entry_cb(void *cbdata, const char *agmt_dn,
+ char **base, int *scope, char **filter,
+ char ***attrs, LDAPControl ***serverctrls)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ds_search_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ds_search_cb -- end\n");
+
+ return;
+}
+
+/* called before the total update to get all entries from the DS to sync to AD */
+static void
+test_winsync_pre_ds_search_all_cb(void *cbdata, const char *agmt_dn,
+ char **base, int *scope, char **filter,
+ char ***attrs, LDAPControl ***serverctrls)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ds_search_all_cb -- orig filter [%s] -- begin\n",
+ ((filter && *filter) ? *filter : "NULL"));
+
+ /* We only want to grab users from the ds side - no groups */
+ slapi_ch_free_string(filter);
+ /* maybe use ntUniqueId=* - only get users that have already been
+ synced with AD already - ntUniqueId and ntUserDomainId are
+ indexed for equality only - need to add presence? */
+ *filter = slapi_ch_strdup("(&(objectclass=ntuser)(ntUserDomainId=*))");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ds_search_all_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ad_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
+ Slapi_Mods *smods, int *do_modify)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_mod_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_mod_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ad_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
+ Slapi_Mods *smods, int *do_modify)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_mod_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_mod_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
+ Slapi_Mods *smods, int *do_modify)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ds_mod_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ds_mod_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
+ Slapi_Mods *smods, int *do_modify)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ds_mod_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ds_mod_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, Slapi_Entry *ds_entry)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ds_add_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ds_add_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ds_add_group_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, Slapi_Entry *ds_entry)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ds_add_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ds_add_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_get_new_ds_user_dn_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, char **new_dn_string,
+ const Slapi_DN *ds_suffix, const Slapi_DN *ad_suffix)
+{
+ char **rdns = NULL;
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_get_new_ds_user_dn_cb -- old dn [%s] -- begin\n",
+ *new_dn_string);
- if (!thefunc) {
+ rdns = slapi_ldap_explode_dn(*new_dn_string, 0);
+ if (!rdns || !rdns[0]) {
+ slapi_ldap_value_free(rdns);
return;
}
- (*thefunc)(windows_private_get_api_cookie(ra), rawentry, local_dn,
- ds_entry, origmods, remote_dn, modstosend, result);
+ slapi_ch_free_string(new_dn_string);
+ *new_dn_string = PR_smprintf("%s,%s", rdns[0], slapi_sdn_get_dn(ds_suffix));
+ slapi_ldap_value_free(rdns);
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_get_new_ds_user_dn_cb -- new dn [%s] -- end\n",
+ *new_dn_string);
+
+ return;
+}
+
+static void
+test_winsync_get_new_ds_group_dn_cb(void *cbdata, const Slapi_Entry *rawentry,
+ Slapi_Entry *ad_entry, char **new_dn_string,
+ const Slapi_DN *ds_suffix, const Slapi_DN *ad_suffix)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_get_new_ds_group_dn_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_get_new_ds_group_dn_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ad_mod_user_mods_cb(void *cbdata, const Slapi_Entry *rawentry,
+ const Slapi_Entry *ds_entry,
+ const Slapi_DN *local_dn, LDAPMod * const *origmods,
+ Slapi_DN *remote_dn, LDAPMod ***modstosend)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_mod_user_mods_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_mod_user_mods_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ad_mod_group_mods_cb(void *cbdata, const Slapi_Entry *rawentry,
+ const Slapi_Entry *ds_entry,
+ const Slapi_DN *local_dn, LDAPMod * const *origmods,
+ Slapi_DN *remote_dn, LDAPMod ***modstosend)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_mod_group_mods_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_mod_group_mods_cb -- end\n");
+
+ return;
+}
+
+static int
+test_winsync_can_add_entry_to_ad_cb(void *cbdata, const Slapi_Entry *local_entry,
+ const Slapi_DN *remote_dn)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_can_add_entry_to_ad_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_can_add_entry_to_ad_cb -- end\n");
+
+ /* return 0;*/ /* false - do not allow entries to be added to ad */
+ return 1; /* true - allow entries to be added to ad */
+}
+
+static void
+test_winsync_begin_update_cb(void *cbdata, const Slapi_DN *ds_subtree,
+ const Slapi_DN *ad_subtree, int is_total)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_begin_update_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_begin_update_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_end_update_cb(void *cbdata, const Slapi_DN *ds_subtree,
+ const Slapi_DN *ad_subtree, int is_total)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_end_update_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_end_update_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_destroy_agmt_cb(void *cbdata, const Slapi_DN *ds_subtree,
+ const Slapi_DN *ad_subtree)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_destroy_agmt_cb -- begin\n");
+
+ /* free(cbdata); */
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_destroy_agmt_cb -- end\n");
return;
}
+static void
+test_winsync_post_ad_mod_user_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ad_mod_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of modifying AD entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ad_mod_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ad_mod_group_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ad_mod_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of modifying AD entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ad_mod_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ds_mod_user_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ds_mod_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of modifying DS entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ds_mod_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ds_mod_group_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ds_mod_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of modifying DS entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ds_mod_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ds_add_user_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ds_add_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of adding DS entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ds_add_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ds_add_group_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ds_add_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of adding DS entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ds_add_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ad_add_user_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_add_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Adding AD entry [%s] from add of DS entry [%s]\n",
+ slapi_entry_get_dn(ad_entry), slapi_entry_get_dn(ds_entry));
+ /* make modifications to ad_entry here */
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_add_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_pre_ad_add_group_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_pre_ad_add_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Adding AD entry [%s] from add of DS entry [%s]\n",
+ slapi_entry_get_dn(ad_entry), slapi_entry_get_dn(ds_entry));
+ /* make modifications to ad_entry here */
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_pre_ad_add_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ad_add_user_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ad_add_user_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of adding AD entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ad_add_user_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ad_add_group_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ad_add_group_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of adding AD entry [%s] was [%d:%s]\n",
+ slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ad_add_group_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ad_mod_user_mods_cb(void *cookie, const Slapi_Entry *rawentry, const Slapi_DN *local_dn, const Slapi_Entry *ds_entry, LDAPMod * const *origmods, Slapi_DN *remote_dn, LDAPMod ***modstosend, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ad_mod_user_mods_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of modifying AD entry [%s] was [%d:%s]\n",
+ slapi_sdn_get_dn(remote_dn), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ad_mod_user_mods_cb -- end\n");
+
+ return;
+}
+
+static void
+test_winsync_post_ad_mod_group_mods_cb(void *cookie, const Slapi_Entry *rawentry, const Slapi_DN *local_dn, const Slapi_Entry *ds_entry, LDAPMod * const *origmods, Slapi_DN *remote_dn, LDAPMod ***modstosend, int *result)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_post_ad_mod_group_mods_cb -- begin\n");
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "Result of modifying AD entry [%s] was [%d:%s]\n",
+ slapi_sdn_get_dn(remote_dn), *result, ldap_err2string(*result));
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_post_ad_mod_group_mods_cb -- end\n");
+
+ return;
+}
+
+static int
+test_winsync_precedence(void)
+{
+ return 99;
+}
+
+/**
+ * Plugin identifiers
+ */
+static Slapi_PluginDesc test_winsync_pdesc = {
+ "test-winsync-plugin",
+ VENDOR,
+ DS_PACKAGE_VERSION,
+ "test winsync plugin"
+};
+
+static Slapi_ComponentId *test_winsync_plugin_id = NULL;
+
+#ifdef TEST_V1_WINSYNC_API
+static void *test_winsync_api_v1[] = {
+ NULL, /* reserved for api broker use, must be zero */
+ test_winsync_api_init,
+ test_winsync_dirsync_search_params_cb,
+ test_winsync_pre_ad_search_cb,
+ test_winsync_pre_ds_search_entry_cb,
+ test_winsync_pre_ds_search_all_cb,
+ test_winsync_pre_ad_mod_user_cb,
+ test_winsync_pre_ad_mod_group_cb,
+ test_winsync_pre_ds_mod_user_cb,
+ test_winsync_pre_ds_mod_group_cb,
+ test_winsync_pre_ds_add_user_cb,
+ test_winsync_pre_ds_add_group_cb,
+ test_winsync_get_new_ds_user_dn_cb,
+ test_winsync_get_new_ds_group_dn_cb,
+ test_winsync_pre_ad_mod_user_mods_cb,
+ test_winsync_pre_ad_mod_group_mods_cb,
+ test_winsync_can_add_entry_to_ad_cb,
+ test_winsync_begin_update_cb,
+ test_winsync_end_update_cb,
+ test_winsync_destroy_agmt_cb
+};
+#endif /* TEST_V1_WINSYNC_API */
+
+#ifdef TEST_V2_WINSYNC_API
+static void *test_winsync_api_v2[] = {
+ NULL, /* reserved for api broker use, must be zero */
+ test_winsync_api_init,
+ test_winsync_dirsync_search_params_cb,
+ test_winsync_pre_ad_search_cb,
+ test_winsync_pre_ds_search_entry_cb,
+ test_winsync_pre_ds_search_all_cb,
+ test_winsync_pre_ad_mod_user_cb,
+ test_winsync_pre_ad_mod_group_cb,
+ test_winsync_pre_ds_mod_user_cb,
+ test_winsync_pre_ds_mod_group_cb,
+ test_winsync_pre_ds_add_user_cb,
+ test_winsync_pre_ds_add_group_cb,
+ test_winsync_get_new_ds_user_dn_cb,
+ test_winsync_get_new_ds_group_dn_cb,
+ test_winsync_pre_ad_mod_user_mods_cb,
+ test_winsync_pre_ad_mod_group_mods_cb,
+ test_winsync_can_add_entry_to_ad_cb,
+ test_winsync_begin_update_cb,
+ test_winsync_end_update_cb,
+ test_winsync_destroy_agmt_cb,
+ test_winsync_post_ad_mod_user_cb,
+ test_winsync_post_ad_mod_group_cb,
+ test_winsync_post_ds_mod_user_cb,
+ test_winsync_post_ds_mod_group_cb,
+ test_winsync_post_ds_add_user_cb,
+ test_winsync_post_ds_add_group_cb,
+ test_winsync_pre_ad_add_user_cb,
+ test_winsync_pre_ad_add_group_cb,
+ test_winsync_post_ad_add_user_cb,
+ test_winsync_post_ad_add_group_cb,
+ test_winsync_post_ad_mod_user_mods_cb,
+ test_winsync_post_ad_mod_group_mods_cb
+};
+#endif /* TEST_V2_WINSYNC_API */
+
+static void *test_winsync_api_v3[] = {
+ NULL, /* reserved for api broker use, must be zero */
+ test_winsync_api_init,
+ test_winsync_dirsync_search_params_cb,
+ test_winsync_pre_ad_search_cb,
+ test_winsync_pre_ds_search_entry_cb,
+ test_winsync_pre_ds_search_all_cb,
+ test_winsync_pre_ad_mod_user_cb,
+ test_winsync_pre_ad_mod_group_cb,
+ test_winsync_pre_ds_mod_user_cb,
+ test_winsync_pre_ds_mod_group_cb,
+ test_winsync_pre_ds_add_user_cb,
+ test_winsync_pre_ds_add_group_cb,
+ test_winsync_get_new_ds_user_dn_cb,
+ test_winsync_get_new_ds_group_dn_cb,
+ test_winsync_pre_ad_mod_user_mods_cb,
+ test_winsync_pre_ad_mod_group_mods_cb,
+ test_winsync_can_add_entry_to_ad_cb,
+ test_winsync_begin_update_cb,
+ test_winsync_end_update_cb,
+ test_winsync_destroy_agmt_cb,
+ test_winsync_post_ad_mod_user_cb,
+ test_winsync_post_ad_mod_group_cb,
+ test_winsync_post_ds_mod_user_cb,
+ test_winsync_post_ds_mod_group_cb,
+ test_winsync_post_ds_add_user_cb,
+ test_winsync_post_ds_add_group_cb,
+ test_winsync_pre_ad_add_user_cb,
+ test_winsync_pre_ad_add_group_cb,
+ test_winsync_post_ad_add_user_cb,
+ test_winsync_post_ad_add_group_cb,
+ test_winsync_post_ad_mod_user_mods_cb,
+ test_winsync_post_ad_mod_group_mods_cb,
+ test_winsync_precedence
+};
+
+static int
+test_winsync_plugin_start(Slapi_PBlock *pb)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_plugin_start -- begin\n");
+
+ if( slapi_apib_register(WINSYNC_v3_0_GUID, test_winsync_api_v3) ) {
+ slapi_log_error( SLAPI_LOG_FATAL, test_winsync_plugin_name,
+ "<-- test_winsync_plugin_start -- failed to register winsync api -- end\n");
+ return -1;
+ }
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_plugin_start -- end\n");
+ return 0;
+}
+
+static int
+test_winsync_plugin_close(Slapi_PBlock *pb)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_plugin_close -- begin\n");
+
+ slapi_apib_unregister(WINSYNC_v3_0_GUID);
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_plugin_close -- end\n");
+ return 0;
+}
+
+/* this is the slapi plugin init function,
+ not the one used by the winsync api
+*/
+int test_winsync_plugin_init(Slapi_PBlock *pb)
+{
+ slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "--> test_winsync_plugin_init -- begin\n");
+
+ if ( slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION,
+ SLAPI_PLUGIN_VERSION_01 ) != 0 ||
+ slapi_pblock_set(pb, SLAPI_PLUGIN_START_FN,
+ (void *) test_winsync_plugin_start ) != 0 ||
+ slapi_pblock_set(pb, SLAPI_PLUGIN_CLOSE_FN,
+ (void *) test_winsync_plugin_close ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION,
+ (void *)&test_winsync_pdesc ) != 0 )
+ {
+ slapi_log_error( SLAPI_LOG_FATAL, test_winsync_plugin_name,
+ "<-- test_winsync_plugin_init -- failed to register plugin -- end\n");
+ return -1;
+ }
+
+ /* Retrieve and save the plugin identity to later pass to
+ internal operations */
+ if (slapi_pblock_get(pb, SLAPI_PLUGIN_IDENTITY, &test_winsync_plugin_id) != 0) {
+ slapi_log_error(SLAPI_LOG_FATAL, test_winsync_plugin_name,
+ "<-- test_winsync_plugin_init -- failed to retrieve plugin identity -- end\n");
+ return -1;
+ }
+
+ slapi_log_error( SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
+ "<-- test_winsync_plugin_init -- end\n");
+ return 0;
+}
+
+/*
+dn: cn=Test Winsync API,cn=plugins,cn=config
+objectclass: top
+objectclass: nsSlapdPlugin
+objectclass: extensibleObject
+cn: Test Winsync API
+nsslapd-pluginpath: libtestwinsync-plugin
+nsslapd-plugininitfunc: test_winsync_plugin_init
+nsslapd-plugintype: preoperation
+nsslapd-pluginenabled: on
+nsslapd-plugin-depends-on-type: database
+nsslapd-pluginDescription: Test Winsync
+nsslapd-pluginVendor: 389 project
+nsslapd-pluginId: test-winsync
+nsslapd-pluginVersion: 0.9
+*/
+
+#endif /* WINSYNC_SAMPLE_CODE */
+
/* #define WINSYNC_TEST_IPA */
#ifdef WINSYNC_TEST_IPA
diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c
index a2ec448..518a133 100644
--- a/ldap/servers/plugins/replication/windows_protocol_util.c
+++ b/ldap/servers/plugins/replication/windows_protocol_util.c
@@ -4317,11 +4317,40 @@ windows_generate_update_mods(Private_Repl_Protocol *prp,Slapi_Entry *remote_entr
slapi_valueset_free(restricted_local_values);
restricted_local_values = NULL;
}
+ else
+ {
+ slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
+ "windows_generate_update_mods: no restricted local values found for "
+ "local attribute %s in local entry %s for remote attribute "
+ "%s in remote entry %s\n",
+ local_type ? local_type : "NULL",
+ local_entry ? slapi_entry_get_dn(local_entry) : "NULL",
+ type ? type : "NULL",
+ remote_entry ? slapi_entry_get_dn(remote_entry) : "NULL");
+ }
slapi_valueset_free(local_values);
local_values = NULL;
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
+ "windows_generate_update_mods: no local values found for "
+ "local attribute %s in local entry %s for remote attribute "
+ "%s in remote entry %s\n",
+ local_type ? local_type : "NULL",
+ local_entry ? slapi_entry_get_dn(local_entry) : "NULL",
+ type ? type : "NULL",
+ remote_entry ? slapi_entry_get_dn(remote_entry) : "NULL");
}
slapi_valueset_free(mapped_remote_values);
mapped_remote_values = NULL;
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name,
+ "windows_generate_update_mods: could not map the values in "
+ "local attribute %s in local entry %s for remote attribute "
+ "%s in remote entry %s\n",
+ local_type ? local_type : "NULL",
+ local_entry ? slapi_entry_get_dn(local_entry) : "NULL",
+ type ? type : "NULL",
+ remote_entry ? slapi_entry_get_dn(remote_entry) : "NULL");
}
}
} else
diff --git a/ldap/servers/plugins/replication/windowsrepl.h b/ldap/servers/plugins/replication/windowsrepl.h
index 7da855c..5780e74 100644
--- a/ldap/servers/plugins/replication/windowsrepl.h
+++ b/ldap/servers/plugins/replication/windowsrepl.h
@@ -146,6 +146,7 @@ int windows_check_user_password(Repl_Connection *conn, Slapi_DN *sdn, char *pass
specific data
*/
void windows_plugin_init(Repl_Agmt *ra);
+void windows_plugin_cleanup_agmt(Repl_Agmt *ra);
void winsync_plugin_call_dirsync_search_params_cb(const Repl_Agmt *ra, const char *agmt_dn, char **base, int *scope, char **filter, char ***attrs, LDAPControl ***serverctrls);
/* called before searching for a single entry from AD - agmt_dn will be NULL */
diff --git a/ldap/servers/plugins/replication/winsync-plugin.h b/ldap/servers/plugins/replication/winsync-plugin.h
index 9ac5621..0f3b757 100644
--- a/ldap/servers/plugins/replication/winsync-plugin.h
+++ b/ldap/servers/plugins/replication/winsync-plugin.h
@@ -50,6 +50,7 @@
*/
#define WINSYNC_v1_0_GUID "CDA8F029-A3C6-4EBB-80B8-A2E183DB0481"
#define WINSYNC_v2_0_GUID "706B83AA-FC51-444A-ACC9-53DC73D641D4"
+#define WINSYNC_v3_0_GUID "6D7C2E54-638C-4564-B53F-D9C5354DEBA0"
/*
* This callback is called when a winsync agreement is created.
@@ -274,654 +275,12 @@ typedef void (*winsync_post_ad_mod_mods_cb)(void *cookie, const Slapi_Entry *raw
#define WINSYNC_PLUGIN_POST_AD_MOD_USER_MODS_CB 30
#define WINSYNC_PLUGIN_POST_AD_MOD_GROUP_MODS_CB 31
#define WINSYNC_PLUGIN_VERSION_2_END WINSYNC_PLUGIN_POST_AD_MOD_GROUP_MODS_CB
-/*
- The following are sample code stubs to show how to implement
- a plugin which uses this api
-*/
-
-/* #define WINSYNC_SAMPLE_CODE */
-#ifdef WINSYNC_SAMPLE_CODE
-
-#include "slapi-plugin.h"
-#include "winsync-plugin.h"
-
-static char *test_winsync_plugin_name = "test_winsync_api";
-
-static void *
-test_winsync_api_init(const Slapi_DN *ds_subtree, const Slapi_DN *ad_subtree)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_init [%s] [%s] -- begin\n",
- slapi_sdn_get_dn(ds_subtree),
- slapi_sdn_get_dn(ad_subtree));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_init -- end\n");
-
- return NULL;
-}
-
-static void
-test_winsync_dirsync_search_params_cb(void *cbdata, const char *agmt_dn,
- char **base, int *scope, char **filter,
- char ***attrs, LDAPControl ***serverctrls)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_dirsync_search_params_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_dirsync_search_params_cb -- end\n");
-
- return;
-}
-
-/* called before searching for a single entry from AD - agmt_dn will be NULL */
-static void
-test_winsync_pre_ad_search_cb(void *cbdata, const char *agmt_dn,
- char **base, int *scope, char **filter,
- char ***attrs, LDAPControl ***serverctrls)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_search_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_search_cb -- end\n");
-
- return;
-}
-
-/* called before an internal search to get a single DS entry - agmt_dn will be NULL */
-static void
-test_winsync_pre_ds_search_entry_cb(void *cbdata, const char *agmt_dn,
- char **base, int *scope, char **filter,
- char ***attrs, LDAPControl ***serverctrls)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ds_search_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ds_search_cb -- end\n");
-
- return;
-}
-
-/* called before the total update to get all entries from the DS to sync to AD */
-static void
-test_winsync_pre_ds_search_all_cb(void *cbdata, const char *agmt_dn,
- char **base, int *scope, char **filter,
- char ***attrs, LDAPControl ***serverctrls)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ds_search_all_cb -- orig filter [%s] -- begin\n",
- ((filter && *filter) ? *filter : "NULL"));
-
- /* We only want to grab users from the ds side - no groups */
- slapi_ch_free_string(filter);
- /* maybe use ntUniqueId=* - only get users that have already been
- synced with AD already - ntUniqueId and ntUserDomainId are
- indexed for equality only - need to add presence? */
- *filter = slapi_ch_strdup("(&(objectclass=ntuser)(ntUserDomainId=*))");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ds_search_all_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ad_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
- Slapi_Mods *smods, int *do_modify)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_mod_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_mod_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ad_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
- Slapi_Mods *smods, int *do_modify)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_mod_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_mod_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
- Slapi_Mods *smods, int *do_modify)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ds_mod_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ds_mod_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ds_mod_group_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, Slapi_Entry *ds_entry,
- Slapi_Mods *smods, int *do_modify)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ds_mod_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ds_mod_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, Slapi_Entry *ds_entry)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ds_add_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ds_add_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ds_add_group_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, Slapi_Entry *ds_entry)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ds_add_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ds_add_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_get_new_ds_user_dn_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, char **new_dn_string,
- const Slapi_DN *ds_suffix, const Slapi_DN *ad_suffix)
-{
- char **rdns = NULL;
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_get_new_ds_user_dn_cb -- old dn [%s] -- begin\n",
- *new_dn_string);
-
- rdns = slapi_ldap_explode_dn(*new_dn_string, 0);
- if (!rdns || !rdns[0]) {
- slapi_ldap_value_free(rdns);
- return;
- }
-
- slapi_ch_free_string(new_dn_string);
- *new_dn_string = PR_smprintf("%s,%s", rdns[0], slapi_sdn_get_dn(ds_suffix));
- slapi_ldap_value_free(rdns);
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_get_new_ds_user_dn_cb -- new dn [%s] -- end\n",
- *new_dn_string);
-
- return;
-}
-
-static void
-test_winsync_get_new_ds_group_dn_cb(void *cbdata, const Slapi_Entry *rawentry,
- Slapi_Entry *ad_entry, char **new_dn_string,
- const Slapi_DN *ds_suffix, const Slapi_DN *ad_suffix)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_get_new_ds_group_dn_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_get_new_ds_group_dn_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ad_mod_user_mods_cb(void *cbdata, const Slapi_Entry *rawentry,
- const Slapi_Entry *ds_entry,
- const Slapi_DN *local_dn, LDAPMod * const *origmods,
- Slapi_DN *remote_dn, LDAPMod ***modstosend)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_mod_user_mods_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_mod_user_mods_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ad_mod_group_mods_cb(void *cbdata, const Slapi_Entry *rawentry,
- const Slapi_Entry *ds_entry,
- const Slapi_DN *local_dn, LDAPMod * const *origmods,
- Slapi_DN *remote_dn, LDAPMod ***modstosend)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_mod_group_mods_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_mod_group_mods_cb -- end\n");
-
- return;
-}
-
-static int
-test_winsync_can_add_entry_to_ad_cb(void *cbdata, const Slapi_Entry *local_entry,
- const Slapi_DN *remote_dn)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_can_add_entry_to_ad_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_can_add_entry_to_ad_cb -- end\n");
-
- /* return 0;*/ /* false - do not allow entries to be added to ad */
- return 1; /* true - allow entries to be added to ad */
-}
-
-static void
-test_winsync_begin_update_cb(void *cbdata, const Slapi_DN *ds_subtree,
- const Slapi_DN *ad_subtree, int is_total)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_begin_update_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_begin_update_cb -- end\n");
- return;
-}
-
-static void
-test_winsync_end_update_cb(void *cbdata, const Slapi_DN *ds_subtree,
- const Slapi_DN *ad_subtree, int is_total)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_end_update_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_end_update_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_destroy_agmt_cb(void *cbdata, const Slapi_DN *ds_subtree,
- const Slapi_DN *ad_subtree)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_destroy_agmt_cb -- begin\n");
-
- /* free(cbdata); */
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_destroy_agmt_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ad_mod_user_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ad_mod_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of modifying AD entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ad_mod_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ad_mod_group_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ad_mod_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of modifying AD entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ad_mod_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ds_mod_user_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ds_mod_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of modifying DS entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ds_mod_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ds_mod_group_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, Slapi_Mods *smods, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ds_mod_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of modifying DS entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ds_mod_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ds_add_user_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ds_add_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of adding DS entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ds_add_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ds_add_group_cb(void *cookie, const Slapi_Entry *rawentry, Slapi_Entry *ad_entry, Slapi_Entry *ds_entry, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ds_add_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of adding DS entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ds_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ds_add_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ad_add_user_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_add_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Adding AD entry [%s] from add of DS entry [%s]\n",
- slapi_entry_get_dn(ad_entry), slapi_entry_get_dn(ds_entry));
- /* make modifications to ad_entry here */
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_add_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_pre_ad_add_group_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_pre_ad_add_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Adding AD entry [%s] from add of DS entry [%s]\n",
- slapi_entry_get_dn(ad_entry), slapi_entry_get_dn(ds_entry));
- /* make modifications to ad_entry here */
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_pre_ad_add_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ad_add_user_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ad_add_user_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of adding AD entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ad_add_user_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ad_add_group_cb(void *cookie, Slapi_Entry *ds_entry, Slapi_Entry *ad_entry, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ad_add_group_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of adding AD entry [%s] was [%d:%s]\n",
- slapi_entry_get_dn(ad_entry), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ad_add_group_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ad_mod_user_mods_cb(void *cookie, const Slapi_Entry *rawentry, const Slapi_DN *local_dn, const Slapi_Entry *ds_entry, LDAPMod * const *origmods, Slapi_DN *remote_dn, LDAPMod ***modstosend, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ad_mod_user_mods_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of modifying AD entry [%s] was [%d:%s]\n",
- slapi_sdn_get_dn(remote_dn), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ad_mod_user_mods_cb -- end\n");
-
- return;
-}
-
-static void
-test_winsync_post_ad_mod_group_mods_cb(void *cookie, const Slapi_Entry *rawentry, const Slapi_DN *local_dn, const Slapi_Entry *ds_entry, LDAPMod * const *origmods, Slapi_DN *remote_dn, LDAPMod ***modstosend, int *result)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_post_ad_mod_group_mods_cb -- begin\n");
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "Result of modifying AD entry [%s] was [%d:%s]\n",
- slapi_sdn_get_dn(remote_dn), *result, ldap_err2string(*result));
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_post_ad_mod_group_mods_cb -- end\n");
-
- return;
-}
-
-/**
- * Plugin identifiers
- */
-static Slapi_PluginDesc test_winsync_pdesc = {
- "test-winsync-plugin",
- VENDOR,
- DS_PACKAGE_VERSION,
- "test winsync plugin"
-};
-
-static Slapi_ComponentId *test_winsync_plugin_id = NULL;
-
-#ifdef TEST_V1_WINSYNC_API
-static void *test_winsync_api_v1[] = {
- NULL, /* reserved for api broker use, must be zero */
- test_winsync_api_init,
- test_winsync_dirsync_search_params_cb,
- test_winsync_pre_ad_search_cb,
- test_winsync_pre_ds_search_entry_cb,
- test_winsync_pre_ds_search_all_cb,
- test_winsync_pre_ad_mod_user_cb,
- test_winsync_pre_ad_mod_group_cb,
- test_winsync_pre_ds_mod_user_cb,
- test_winsync_pre_ds_mod_group_cb,
- test_winsync_pre_ds_add_user_cb,
- test_winsync_pre_ds_add_group_cb,
- test_winsync_get_new_ds_user_dn_cb,
- test_winsync_get_new_ds_group_dn_cb,
- test_winsync_pre_ad_mod_user_mods_cb,
- test_winsync_pre_ad_mod_group_mods_cb,
- test_winsync_can_add_entry_to_ad_cb,
- test_winsync_begin_update_cb,
- test_winsync_end_update_cb,
- test_winsync_destroy_agmt_cb
-};
-#endif /* TEST_V1_WINSYNC_API */
-
-static void *test_winsync_api_v2[] = {
- NULL, /* reserved for api broker use, must be zero */
- test_winsync_api_init,
- test_winsync_dirsync_search_params_cb,
- test_winsync_pre_ad_search_cb,
- test_winsync_pre_ds_search_entry_cb,
- test_winsync_pre_ds_search_all_cb,
- test_winsync_pre_ad_mod_user_cb,
- test_winsync_pre_ad_mod_group_cb,
- test_winsync_pre_ds_mod_user_cb,
- test_winsync_pre_ds_mod_group_cb,
- test_winsync_pre_ds_add_user_cb,
- test_winsync_pre_ds_add_group_cb,
- test_winsync_get_new_ds_user_dn_cb,
- test_winsync_get_new_ds_group_dn_cb,
- test_winsync_pre_ad_mod_user_mods_cb,
- test_winsync_pre_ad_mod_group_mods_cb,
- test_winsync_can_add_entry_to_ad_cb,
- test_winsync_begin_update_cb,
- test_winsync_end_update_cb,
- test_winsync_destroy_agmt_cb,
- test_winsync_post_ad_mod_user_cb,
- test_winsync_post_ad_mod_group_cb,
- test_winsync_post_ds_mod_user_cb,
- test_winsync_post_ds_mod_group_cb,
- test_winsync_post_ds_add_user_cb,
- test_winsync_post_ds_add_group_cb,
- test_winsync_pre_ad_add_user_cb,
- test_winsync_pre_ad_add_group_cb,
- test_winsync_post_ad_add_user_cb,
- test_winsync_post_ad_add_group_cb,
- test_winsync_post_ad_mod_user_mods_cb,
- test_winsync_post_ad_mod_group_mods_cb
-};
-
-static int
-test_winsync_plugin_start(Slapi_PBlock *pb)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_plugin_start -- begin\n");
-
- if( slapi_apib_register(WINSYNC_v2_0_GUID, test_winsync_api_v2) ) {
- slapi_log_error( SLAPI_LOG_FATAL, test_winsync_plugin_name,
- "<-- test_winsync_plugin_start -- failed to register winsync api -- end\n");
- return -1;
- }
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_plugin_start -- end\n");
- return 0;
-}
-
-static int
-test_winsync_plugin_close(Slapi_PBlock *pb)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_plugin_close -- begin\n");
-
- slapi_apib_unregister(WINSYNC_v2_0_GUID);
-
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_plugin_close -- end\n");
- return 0;
-}
-
-/* this is the slapi plugin init function,
- not the one used by the winsync api
-*/
-int test_winsync_plugin_init(Slapi_PBlock *pb)
-{
- slapi_log_error(SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "--> test_winsync_plugin_init -- begin\n");
-
- if ( slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION,
- SLAPI_PLUGIN_VERSION_01 ) != 0 ||
- slapi_pblock_set(pb, SLAPI_PLUGIN_START_FN,
- (void *) test_winsync_plugin_start ) != 0 ||
- slapi_pblock_set(pb, SLAPI_PLUGIN_CLOSE_FN,
- (void *) test_winsync_plugin_close ) != 0 ||
- slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION,
- (void *)&test_winsync_pdesc ) != 0 )
- {
- slapi_log_error( SLAPI_LOG_FATAL, test_winsync_plugin_name,
- "<-- test_winsync_plugin_init -- failed to register plugin -- end\n");
- return -1;
- }
-
- /* Retrieve and save the plugin identity to later pass to
- internal operations */
- if (slapi_pblock_get(pb, SLAPI_PLUGIN_IDENTITY, &test_winsync_plugin_id) != 0) {
- slapi_log_error(SLAPI_LOG_FATAL, test_winsync_plugin_name,
- "<-- test_winsync_plugin_init -- failed to retrieve plugin identity -- end\n");
- return -1;
- }
-
- slapi_log_error( SLAPI_LOG_PLUGIN, test_winsync_plugin_name,
- "<-- test_winsync_plugin_init -- end\n");
- return 0;
-}
-
-/*
-dn: cn=Test Winsync API,cn=plugins,cn=config
-objectclass: top
-objectclass: nsSlapdPlugin
-objectclass: extensibleObject
-cn: Test Winsync API
-nsslapd-pluginpath: libtestwinsync-plugin
-nsslapd-plugininitfunc: test_winsync_plugin_init
-nsslapd-plugintype: preoperation
-nsslapd-pluginenabled: on
-nsslapd-plugin-depends-on-type: database
-nsslapd-plugin-depends-on-named: Multimaster Replication Plugin
-*/
+typedef int (*winsync_plugin_precedence_cb)(void);
+#define WINSYNC_PLUGIN_PRECEDENCE_CB 32
+#define WINSYNC_PLUGIN_VERSION_3_END WINSYNC_PLUGIN_PRECEDENCE_CB
-#endif /* WINSYNC_SAMPLE_CODE */
+/* precedence works like regular slapi plugin precedence */
+#define WINSYNC_PLUGIN_DEFAULT_PRECEDENCE 50
#endif /* WINSYNC_PLUGIN_PUBLIC_API */
diff --git a/ldap/servers/slapd/apibroker.c b/ldap/servers/slapd/apibroker.c
index 2987716..9937b88 100644
--- a/ldap/servers/slapd/apibroker.c
+++ b/ldap/servers/slapd/apibroker.c
@@ -72,6 +72,7 @@ typedef struct _API_FEATURES
static ABAPI *head = NULL;
static ABAPI **ABAPIBroker_FindInterface(char *guid);
+static void ***ABAPIBroker_FindInterface_All(char *guid);
int slapi_apib_register(char *guid, void **api )
{
@@ -188,6 +189,39 @@ int slapi_apib_get_interface(char *guid, void ***api)
return ret;
}
+int slapi_apib_get_interface_all(char *guid, void ****api)
+{
+ void ***retapi = NULL;
+ int idx = 0;
+
+ if(buffer_lock == 0)
+ return -1;
+
+ if(buffer_lock == 0)
+ {
+ if(0 == (buffer_lock = slapi_new_mutex())) /* we never free this mutex */
+ /* badness */
+ return -1;
+ }
+
+ slapi_lock_mutex(buffer_lock);
+
+ retapi = ABAPIBroker_FindInterface_All(guid);
+ for (idx = 0; retapi && retapi[idx]; ++idx) {
+ void **theapi = retapi[idx];
+ if(theapi[0])
+ {
+ slapi_apib_addref(theapi);
+ }
+ }
+
+ *api = retapi;
+
+ slapi_unlock_mutex(buffer_lock);
+
+ return 0;
+}
+
int slapi_apib_make_reference_counted(void **api, slapi_apib_callback_on_zero callback_on_zero)
{
int ret = -1;
@@ -280,3 +314,27 @@ static ABAPI **ABAPIBroker_FindInterface(char *guid)
return 0;
}
+
+static void ***ABAPIBroker_FindInterface_All(char *guid)
+{
+ ABAPI *api = NULL;
+ ABAPI *start_api = head;
+ void ***apilist = NULL;
+ int idx = 0;
+
+ api = start_api;
+ if (!api) {
+ return NULL;
+ }
+
+ do {
+ if(0 == strcmp(guid, api->guid)) {
+ apilist = (void ***)slapi_ch_realloc((char *)apilist, (idx+2)*sizeof(void **));
+ apilist[idx++] = api->api;
+ apilist[idx] = NULL;
+ }
+ api = api->next;
+ } while(api != start_api);
+
+ return apilist;
+}
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index f238bef..a9d7dfe 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -5082,6 +5082,20 @@ int slapi_apib_unregister(char *guid); /* remove interface from published list *
*/
int slapi_apib_get_interface(char *guid, void ***api); /* retrieve an interface for use */
+/* Function: slapi_apib_get_interface_all
+ Description: this function allows retrieval of a published interface,
+ if the api reference counted, then the reference
+ count is incremented
+ This will return all published interfaces for a given guid
+ Parameters: guid - a string constant that uniquely identifies the
+ interface requested
+ apilist - the retrieved list of vtables for the published api - caller
+ must free the apilist, but not the apilist elements
+ Return: 0 if function succeeds
+ non-zero otherwise
+*/
+int slapi_apib_get_interface_all(char *guid, void ****apilist); /* retrieve all interfaces for guid */
+
/* Function: slapi_apib_make_reference_counted
Description: this function makes an interface a reference counted interface
commit d68b40c3b5638f5160ff12584bb535dac6cb6628
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Fri Aug 3 11:28:43 2012 -0400
Ticket 403 - cleanallruv coverity fixes
Fixed coverity issues
Reviewed by: richm(Thanks Rich!)
(cherry picked from commit 75e5d3d1dba984f0219512d908d1a624096c7acc)
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index 5a16083..5817f99 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -434,7 +434,8 @@ agmt_new_from_entry(Slapi_Entry *e)
for (i = 0; i < CLEANRIDSIZ && clean_vals[i]; i++){
ra->cleanruv_notified[i] = atoi(clean_vals[i]);
}
- ra->cleanruv_notified[i + 1] = 0;
+ if(i <= CLEANRIDSIZ)
+ ra->cleanruv_notified[i + 1] = 0;
slapi_ch_array_free(clean_vals);
} else {
ra->cleanruv_notified[0] = 0;
@@ -2587,7 +2588,7 @@ agmt_set_attrs_to_strip(Repl_Agmt *ra, Slapi_Entry *e)
tmpstr = slapi_entry_attr_get_charptr(e, type_nsds5ReplicaStripAttrs);
if (NULL != tmpstr){
if(ra->attrs_to_strip){
- slapi_ch_array_free(&ra->attrs_to_strip);
+ slapi_ch_array_free(ra->attrs_to_strip);
}
ra->attrs_to_strip = slapi_str2charray_ext(tmpstr, " ", 0);
PR_Unlock(ra->lock);
@@ -2675,7 +2676,9 @@ agmt_set_cleanruv_notified_from_entry(Repl_Agmt *ra, Slapi_Entry *e){
for (i = 0; i < CLEANRIDSIZ && attr_vals[i]; i++){
ra->cleanruv_notified[i] = atoi(attr_vals[i]);
}
- ra->cleanruv_notified[i + 1] = 0;
+ if( i <= CLEANRIDSIZ )
+ ra->cleanruv_notified[i + 1] = 0;
+ slapi_ch_array_free(attr_vals);
} else {
ra->cleanruv_notified[0] = 0;
}
diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
index 27cdacd..75f82ab 100644
--- a/ldap/servers/plugins/replication/repl5_replica.c
+++ b/ldap/servers/plugins/replication/repl5_replica.c
@@ -1825,7 +1825,7 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
ReplicaId rid;
int i;
- for(i = 0; clean_vals[i]; i++){
+ for(i = 0; i < CLEANRIDSIZ && clean_vals[i]; i++){
cleanruv_data *data = NULL;
/*
@@ -1863,7 +1863,8 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
if(payload == NULL){
slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: Startup: Failed to "
"create extended op payload, aborting task");
- return;
+ csn_free(&maxcsn);
+ goto done;
}
/*
* Setup the data struct, and fire off the thread.
@@ -1886,12 +1887,20 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
(void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
if (thread == NULL) {
+ /* log an error and free everything */
slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV: unable to create cleanAllRUV "
"thread for rid(%d)\n", (int)data->rid);
+ csn_free(&maxcsn);
+ slapi_sdn_free(&data->sdn);
+ ber_bvfree(data->payload);
+ slapi_ch_free((void **)&data);
}
}
}
r->repl_cleanruv_data[i] = NULL;
+
+done:
+ slapi_ch_array_free(clean_vals);
}
if ((clean_vals = slapi_entry_attr_get_charray(e, type_replicaAbortCleanRUV)) != NULL)
@@ -1915,12 +1924,12 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
if(rid <= 0 || rid >= READ_ONLY_REPLICA_ID){
slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: invalid replica id(%d) "
"aborting task.\n", rid);
- goto done;
+ goto done2;
}
} else {
slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: unable to parse cleanallruv "
"data (%s), aborting task.\n",clean_vals[i]);
- goto done;
+ goto done2;
}
repl_root = ldap_utf8strtok_r(iter, ":", &iter);
@@ -1961,14 +1970,18 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
if (thread == NULL) {
slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: unable to create abort cleanAllRUV "
"thread for rid(%d)\n", (int)data->rid);
+ slapi_sdn_free(&data->sdn);
+ ber_bvfree(data->payload);
+ slapi_ch_free_string(&data->repl_root);
+ slapi_ch_free((void **)&data);
}
}
}
}
- }
-done:
- slapi_ch_array_free(clean_vals);
+done2:
+ slapi_ch_array_free(clean_vals);
+ }
}
/* This function updates the entry to contain information generated
@@ -3783,8 +3796,10 @@ replica_add_cleanruv_data(Replica *r, char *val)
PR_Lock(r->repl_lock);
for (i = 0; i < CLEANRIDSIZ && r->repl_cleanruv_data[i] != NULL; i++); /* goto the end of the list */
- r->repl_cleanruv_data[i] = slapi_ch_strdup(val); /* append to list */
- r->repl_cleanruv_data[i + 1] = NULL;
+ if( i < CLEANRIDSIZ)
+ r->repl_cleanruv_data[i] = slapi_ch_strdup(val); /* append to list */
+ if(i <= CLEANRIDSIZ)
+ r->repl_cleanruv_data[i + 1] = NULL;
PR_Unlock(r->repl_lock);
}
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index 89651cf..a03740b 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -1319,21 +1319,13 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, c
/* we are already running the maximum number of tasks */
cleanruv_log(pre_task, CLEANALLRUV_ID,
"Exceeded maximum number of active CLEANALLRUV tasks(%d)",CLEANRIDSIZ);
- returntext = PR_smprintf("Exceeded maximum number of active CLEANALLRUV tasks(%d), "
- "you must wait for one to finish.", CLEANRIDSIZ);
return LDAP_UNWILLING_TO_PERFORM;
}
/*
* Grab the replica
*/
- if(r){
- replica = (Replica*)object_get_data (r);
- } else {
- cleanruv_log(pre_task, CLEANALLRUV_ID, "Replica is NULL, aborting task");
- rc = -1;
- goto fail;
- }
+ replica = (Replica*)object_get_data (r);
/*
* Check if this is a consumer
*/
@@ -1419,7 +1411,8 @@ fail:
ber_bvfree(payload);
}
csn_free(&maxcsn);
- object_release (r);
+ if(task) /* only the task acquires the r obj */
+ object_release (r);
done:
@@ -1476,7 +1469,7 @@ replica_cleanallruv_thread(void *arg)
if(data->replica == NULL && data->repl_obj){
data->replica = (Replica*)object_get_data(data->repl_obj);
}
- if( data->replica && data->repl_obj == NULL){
+ if( data->repl_obj == NULL){
data->repl_obj = object_new(data->replica, NULL);
free_obj = 1;
}
@@ -1819,7 +1812,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
Repl_Connection *conn;
ConnResult crc = 0;
LDAP *ld;
- Slapi_DN *dn;
+ Slapi_DN *sdn;
struct berval *vals[2];
struct berval val;
LDAPMod *mods[2];
@@ -1842,7 +1835,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
return;
}
val.bv_len = PR_snprintf(data, sizeof(data), "CLEANRUV%d", rid);
- dn = agmt_get_replarea(agmt);
+ sdn = agmt_get_replarea(agmt);
mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
mod.mod_type = "nsds5task";
mod.mod_bvalues = vals;
@@ -1851,7 +1844,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
val.bv_val = data;
mods[0] = &mod;
mods[1] = NULL;
- repl_dn = PR_smprintf("cn=replica,cn=\"%s\",cn=mapping tree,cn=config", slapi_sdn_get_dn(dn));
+ repl_dn = slapi_create_dn_string("cn=replica,cn=%s,cn=mapping tree,cn=config", slapi_sdn_get_dn(sdn));
/*
* Add task to remote replica
*/
@@ -1863,6 +1856,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
agmt_get_long_name(agmt), agmt_get_hostname(agmt), rc);
}
slapi_ch_free_string(&repl_dn);
+ slapi_sdn_free(&sdn);
conn_delete_internal_ext(conn);
}
@@ -1940,6 +1934,9 @@ add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
char *dn;
int rc;
+ if(r == NULL || maxcsn == NULL){
+ return;
+ }
/*
* Write the rid & maxcsn to the config entry
*/
@@ -2068,13 +2065,12 @@ delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root){
slapi_modify_internal_set_pb(pb, dn, mods, NULL, NULL, repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
slapi_modify_internal_pb (pb);
- slapi_pblock_destroy (pb);
slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
if (rc != LDAP_SUCCESS){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to remove replica "
"config (%d), rid (%d)\n", rc, rid);
}
-
+ slapi_pblock_destroy (pb);
slapi_ch_free_string(&dn);
slapi_ch_free_string(&data);
}
@@ -2166,7 +2162,7 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
Replica *replica;
ReplicaId rid;
cleanruv_data *data = NULL;
- const Slapi_DN *dn;
+ Slapi_DN *sdn;
Object *r;
CSN *maxcsn;
const char *base_dn;
@@ -2178,8 +2174,6 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
/* we are already running the maximum number of tasks */
cleanruv_log(task, ABORT_CLEANALLRUV_ID,
"Exceeded maximum number of active ABORT CLEANALLRUV tasks(%d)",CLEANRIDSIZ);
- returntext = PR_smprintf("Exceeded maximum number of active ABORT CLEANALLRUV tasks(%d), "
- "you must wait for one to finish.", CLEANRIDSIZ);
*returncode = LDAP_OPERATIONS_ERROR;
return SLAPI_DSE_CALLBACK_ERROR;
}
@@ -2216,8 +2210,8 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
/*
* Get the replica object
*/
- dn = slapi_sdn_new_dn_byval(base_dn);
- if((r = replica_get_replica_from_dn(dn)) == NULL){
+ sdn = slapi_sdn_new_dn_byval(base_dn);
+ if((r = replica_get_replica_from_dn(sdn)) == NULL){
cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Failed to find replica from dn(%s)", base_dn);
*returncode = LDAP_OPERATIONS_ERROR;
rc = SLAPI_DSE_CALLBACK_ERROR;
@@ -2275,6 +2269,7 @@ out:
csn_free(&maxcsn);
slapi_ch_free_string(&ridstr);
+ slapi_sdn_free(&sdn);
if(rc != SLAPI_DSE_CALLBACK_OK){
cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Abort Task failed (%d)", rc);
@@ -2477,7 +2472,7 @@ replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn,
{
Repl_Connection *conn = NULL;
LDAP *ld;
- Slapi_DN *dn = agmt_get_replarea(agmt);
+ Slapi_DN *sdn;
struct berval **vals;
LDAPMessage *result = NULL, *entry = NULL;
BerElement *ber;
@@ -2501,10 +2496,11 @@ replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn,
conn_delete_internal_ext(conn);
return -1;
}
- rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(dn), LDAP_SCOPE_SUBTREE,
+ sdn = agmt_get_replarea(agmt);
+ rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(sdn), LDAP_SCOPE_SUBTREE,
"(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))",
attrs, 0, NULL, NULL, NULL, 0, &result);
- slapi_sdn_free(&dn);
+ slapi_sdn_free(&sdn);
if(rc != LDAP_SUCCESS){
cleanruv_log(task, CLEANALLRUV_ID,"Failed to contact "
"agmt (%s) error (%d), will retry later.", agmt_get_long_name(agmt), rc);
@@ -2530,7 +2526,7 @@ replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn,
for(part_count = 1; ruv_part && part_count < 5; part_count++){
ruv_part = ldap_utf8strtok_r(iter, " ", &iter);
}
- if(part_count == 5){
+ if(part_count == 5 && ruv_part){
/* we have the maxcsn */
if(strcmp(ruv_part, maxcsn)){
/* we are not caught up yet, free, and return */
@@ -2618,7 +2614,7 @@ replica_cleanallruv_check_ruv(Repl_Agmt *ra, char *rid_text, Slapi_Task *task)
struct berval **vals = NULL;
LDAPMessage *result = NULL, *entry = NULL;
LDAP *ld = NULL;
- Slapi_DN *dn = agmt_get_replarea(ra);
+ Slapi_DN *sdn;
char *attrs[2];
char *attr = NULL;
int rc = 0, i;
@@ -2637,10 +2633,11 @@ replica_cleanallruv_check_ruv(Repl_Agmt *ra, char *rid_text, Slapi_Task *task)
goto done;
}
- rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(dn), LDAP_SCOPE_SUBTREE,
+ sdn = agmt_get_replarea(ra);
+ rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(sdn), LDAP_SCOPE_SUBTREE,
"(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))",
attrs, 0, NULL, NULL, NULL, 0, &result);
- slapi_sdn_free(&dn);
+ slapi_sdn_free(&sdn);
if(rc != LDAP_SUCCESS){
cleanruv_log(task, CLEANALLRUV_ID,"Failed to contact "
"agmt (%s) error (%d), will retry later.", agmt_get_long_name(ra), rc);
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index 88bb9e3..db94ba7 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -1499,7 +1499,7 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
PRThread *thread = NULL;
Replica *r = NULL;
cleanruv_data *data = NULL;
- CSN *maxcsn;
+ CSN *maxcsn = NULL;
struct berval *extop_payload;
struct berval *resp_bval = NULL;
BerElement *resp_bere = NULL;
@@ -1656,6 +1656,8 @@ free_and_return:
if (mtnode_ext->replica)
object_release (mtnode_ext->replica);
}
+ if(rc)
+ csn_free(&maxcsn);
slapi_ch_free_string(&payload);
/*
commit ec473e3b35b4326e08eea466f5cd4a4e1e584984
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Aug 1 18:08:29 2012 -0400
Ticket 407 - memory leak in dna plugin
Bug Description: Valgrind reported a memory leak in dna_pre_op()
Fix Description: Moved the slapi mod allocation, and freed the mods on error.
https://fedorahosted.org/389/ticket/407
Reviewed by: ?
(cherry picked from commit 9229db23f5491bf8320967387e88903334dfed94)
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
index ce2486e..70d9c6b 100644
--- a/ldap/servers/plugins/dna/dna.c
+++ b/ldap/servers/plugins/dna/dna.c
@@ -3247,12 +3247,8 @@ dna_pre_op(Slapi_PBlock * pb, int modtype)
"dna_pre_op: no pre op entry set for modify\n");
goto bail;
}
- /* grab the mods - we'll put them back later with
- * our modifications appended
- */
+ /* grab the mods - we'll put them back later with our modifications appended */
slapi_pblock_get(pb, SLAPI_MODIFY_MODS, &mods);
- smods = slapi_mods_new();
- slapi_mods_init_passin(smods, mods);
/* We need the resulting entry after the mods are applied to
* see if the entry is within the scope. */
@@ -3263,6 +3259,8 @@ dna_pre_op(Slapi_PBlock * pb, int modtype)
* to let the main server handle it. */
goto bail;
}
+ smods = slapi_mods_new();
+ slapi_mods_init_passin(&smods, mods);
}
/* For a MOD, we need to check the resulting entry */
@@ -3292,7 +3290,9 @@ dna_pre_op(Slapi_PBlock * pb, int modtype)
if (LDAP_CHANGETYPE_ADD == modtype) {
ret = _dna_pre_op_add(pb, test_e);
} else {
- ret = _dna_pre_op_modify(pb, test_e, smods);
+ if((ret = _dna_pre_op_modify(pb, test_e, smods))){
+ slapi_mods_free(&smods);
+ }
}
if (ret) {
goto bail;
commit 74b25ce9c7bf2fc05e401896238f6039c3aefb03
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Aug 1 16:12:01 2012 -0400
Ticket 403 - CLEANALLRUV feature
This is a rewrite of the first version of CLEANALLRUV. The task is now an official slapi task, but the
older/original method still works as well. You can run multiple tasks(4) at the same time. The task can handle
situations where a replica is down, or "older"replicas are in the topology. I've also added an "abort"
task to cancel a particular cleanallruv task, as the task can potentially run for a long time while
waiting for a server to come online or be cleaned.
https://fedorahosted.org/389/ticket/403
Reviewed by: richm & noriko (Thanks!)
(cherry picked from commit 657efc69487cc1b04d82642dddd47f93b7a37cf1)
diff --git a/Makefile.am b/Makefile.am
index d90cd4b..000fef0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -374,6 +374,7 @@ task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \
ldap/admin/src/scripts/template-db2ldif.pl \
ldap/admin/src/scripts/template-fixup-linkedattrs.pl \
ldap/admin/src/scripts/template-fixup-memberof.pl \
+ ldap/admin/src/scripts/template-cleanallruv.pl \
ldap/admin/src/scripts/template-ldif2db.pl \
ldap/admin/src/scripts/template-ns-accountstatus.pl \
ldap/admin/src/scripts/template-ns-activate.pl \
diff --git a/Makefile.in b/Makefile.in
index 915e978..3b16974 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1590,6 +1590,7 @@ task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \
ldap/admin/src/scripts/template-db2ldif.pl \
ldap/admin/src/scripts/template-fixup-linkedattrs.pl \
ldap/admin/src/scripts/template-fixup-memberof.pl \
+ ldap/admin/src/scripts/template-cleanallruv.pl \
ldap/admin/src/scripts/template-ldif2db.pl \
ldap/admin/src/scripts/template-ns-accountstatus.pl \
ldap/admin/src/scripts/template-ns-activate.pl \
diff --git a/ldap/admin/src/scripts/template-cleanallruv.pl.in b/ldap/admin/src/scripts/template-cleanallruv.pl.in
new file mode 100644
index 0000000..be95a6d
--- /dev/null
+++ b/ldap/admin/src/scripts/template-cleanallruv.pl.in
@@ -0,0 +1,186 @@
+#{{PERL-EXEC}}
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2012 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+
+sub usage {
+ print(STDERR "Usage: $0 [-v] -D rootdn { -w password | -w - | -j filename } \n");
+ print(STDERR " [-b basedn | -r rid | -A]\n");
+ print(STDERR " Opts: -D rootdn - Directory Manager\n");
+ print(STDERR " : -w password - Directory Manager's password\n");
+ print(STDERR " : -w - - Prompt for Directory Manager's password\n");
+ print(STDERR " : -j filename - Read Directory Manager's password from file\n");
+ print(STDERR " : -b basedn - DN of the replica root you want to clean\n");
+ print(STDERR " : -r rid - The replica id that you want to clean\n");
+ print(STDERR " : -A - Abort an existing cleanallruv task(must use with -b and -r args\n");
+ print(STDERR " : -v - verbose\n");
+}
+
+$rootdn = "";
+$passwd = "";
+$passwdfile = "";
+$basedn = "";
+$rid = "";
+$abort = "";
+$verbose = 0;
+
+$prefix = "{{DS-ROOT}}";
+
+$ENV{'PATH'} = "$prefix@ldaptool_bindir@:$prefix/usr/bin:@ldaptool_bindir@:/usr/bin";
+
+libpath_add("$prefix@nss_libdir@");
+libpath_add("$prefix/usr/lib");
+libpath_add("@nss_libdir@");
+libpath_add("/usr/lib");
+
+$ENV{'SHLIB_PATH'} = "$ENV{'LD_LIBRARY_PATH'}";
+
+$i = 0;
+while ($i <= $#ARGV)
+{
+ if ("$ARGV[$i]" eq "-b")
+ {
+ # Base DN
+ $i++; $basedn = $ARGV[$i];
+ }
+ elsif ("$ARGV[$i]" eq "-r")
+ {
+ # rid
+ $i++; $rid = $ARGV[$i];
+ }
+ elsif ("$ARGV[$i]" eq "-A")
+ {
+ # abort
+ $abort = "yes";
+ }
+ elsif ("$ARGV[$i]" eq "-D")
+ {
+ # Directory Manager
+ $i++; $rootdn = $ARGV[$i];
+ }
+ elsif ("$ARGV[$i]" eq "-w")
+ {
+ # Directory Manager's password
+ $i++; $passwd = $ARGV[$i];
+ }
+ elsif ("$ARGV[$i]" eq "-j")
+ {
+ # Read Directory Manager's password from a file
+ $i++; $passwdfile = $ARGV[$i];
+ }
+ elsif ("$ARGV[$i]" eq "-v")
+ {
+ # verbose
+ $verbose = 1;
+ }
+ else
+ {
+ &usage; exit(1);
+ }
+ $i++;
+}
+
+if ($passwdfile ne ""){
+# Open file and get the password
+ unless (open (RPASS, $passwdfile)) {
+ die "Error, cannot open password file $passwdfile\n";
+ }
+ $passwd = <RPASS>;
+ chomp($passwd);
+ close(RPASS);
+} elsif ($passwd eq "-"){
+# Read the password from terminal
+ print "Bind Password: ";
+ # Disable console echo
+ system("@sttyexec@ -echo") if -t STDIN;
+ # read the answer
+ $passwd = <STDIN>;
+ # Enable console echo
+ system("@sttyexec@ echo") if -t STDIN;
+ print "\n";
+ chop($passwd); # trim trailing newline
+}
+
+if ( $rootdn eq "" || $passwd eq "" || $basedn eq "" || $rid eq "")
+{
+ &usage;
+ exit(1);
+}
+
+$vstr = "";
+if ($verbose != 0)
+{
+ $vstr = "-v";
+}
+
+# Use a timestamp as part of the task entry name
+($s, $m, $h, $dy, $mn, $yr, $wdy, $ydy, $r) = localtime(time);
+$mn++; $yr += 1900;
+
+if($abort eq ""){
+ # Build the task entry to add
+ $taskname = "cleanallruv_${yr}_${mn}_${dy}_${h}_${m}_${s}";
+ $dn = "dn: cn=$taskname, cn=cleanallruv, cn=tasks, cn=config\n";
+} else {
+ $taskname = "abort_cleanallruv_${yr}_${mn}_${dy}_${h}_${m}_${s}";
+ $dn = "dn: cn=$taskname, cn=abort cleanallruv, cn=tasks, cn=config\n";
+}
+$misc = "changetype: add\nobjectclass: top\nobjectclass: extensibleObject\n";
+$cn = "cn: $taskname\n";
+$basedn = "replica-base-dn: $basedn\n";
+$rid = "replica-id: $rid\n";
+
+
+$entry = "${dn}${misc}${cn}${basedn}${rid}";
+open(FOO, "| ldapmodify @ldaptool_opts@ $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" );
+print(FOO "$entry");
+close(FOO);
+
+sub libpath_add {
+ my $libpath = shift;
+
+ if ($libpath) {
+ if ($ENV{'LD_LIBRARY_PATH'}) {
+ $ENV{'LD_LIBRARY_PATH'} = "$ENV{'LD_LIBRARY_PATH'}:$libpath";
+ } else {
+ $ENV{'LD_LIBRARY_PATH'} = "$libpath";
+ }
+ }
+}
+
diff --git a/ldap/schema/01core389.ldif b/ldap/schema/01core389.ldif
index def693d..58b4b76 100644
--- a/ldap/schema/01core389.ldif
+++ b/ldap/schema/01core389.ldif
@@ -134,15 +134,10 @@ attributeTypes: ( 2.16.840.1.113730.3.1.2096 NAME 'entryusn' DESC 'Netscape defi
attributeTypes: ( 2.16.840.1.113730.3.1.2113 NAME 'internalModifiersName' DESC 'plugin dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation X-ORIGIN '389 Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.2114 NAME 'internalCreatorsName' DESC 'plugin dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation X-ORIGIN '389 Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.2133 NAME 'pwdUpdateTime' DESC 'Last password update time' SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE USAGE directoryOperation X-ORIGIN '389 Directory Server' )
-attributeTypes: ( 2.16.840.1.113730.3.1.2111 NAME 'tombstoneNumSubordinates'
- DESC 'count of immediate subordinates for tombstone entries'
- EQUALITY integerMatch
- ORDERING integerOrderingMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
- SINGLE-VALUE
- NO-USER-MODIFICATION
- USAGE directoryOperation
- X-ORIGIN '389 directory server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2135 NAME 'nsds5ReplicaCleanRUV' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2136 NAME 'nsds5ReplicaCleanRUVNotified' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2137 NAME 'nsds5ReplicaAbortCleanRUV' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2111 NAME 'tombstoneNumSubordinates' DESC 'count of immediate subordinates for tombstone entries' EQUALITY integerMatch ORDERING integerOrderingMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation X-ORIGIN '389 directory server' )
#
# objectclasses
#
@@ -152,9 +147,9 @@ objectClasses: ( 2.16.840.1.113730.3.2.44 NAME 'nsIndex' DESC 'Netscape defined
objectClasses: ( 2.16.840.1.113730.3.2.109 NAME 'nsBackendInstance' DESC 'Netscape defined objectclass' SUP top MUST ( CN ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.110 NAME 'nsMappingTree' DESC 'Netscape defined objectclass' SUP top MUST ( CN ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.104 NAME 'nsContainer' DESC 'Netscape defined objectclass' SUP top MUST ( CN ) X-ORIGIN 'Netscape Directory Server' )
-objectClasses: ( 2.16.840.1.113730.3.2.108 NAME 'nsDS5Replica' DESC 'Netscape defined objectclass' SUP top MUST ( nsDS5ReplicaRoot $ nsDS5ReplicaId ) MAY (cn $ nsDS5ReplicaType $ nsDS5ReplicaBindDN $ nsState $ nsDS5ReplicaName $ nsDS5Flags $ nsDS5Task $ nsDS5ReplicaReferral $ nsDS5ReplicaAutoReferral $ nsds5ReplicaPurgeDelay $ nsds5ReplicaTombstonePurgeInterval $ nsds5ReplicaChangeCount $ nsds5ReplicaLegacyConsumer) X-ORIGIN 'Netscape Directory Server' )
+objectClasses: ( 2.16.840.1.113730.3.2.108 NAME 'nsDS5Replica' DESC 'Netscape defined objectclass' SUP top MUST ( nsDS5ReplicaRoot $ nsDS5ReplicaId ) MAY (cn $ nsds5ReplicaCleanRUV $ nsds5ReplicaAbortCleanRUV $ nsDS5ReplicaType $ nsDS5ReplicaBindDN $ nsState $ nsDS5ReplicaName $ nsDS5Flags $ nsDS5Task $ nsDS5ReplicaReferral $ nsDS5ReplicaAutoReferral $ nsds5ReplicaPurgeDelay $ nsds5ReplicaTombstonePurgeInterval $ nsds5ReplicaChangeCount $ nsds5ReplicaLegacyConsumer) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.113 NAME 'nsTombstone' DESC 'Netscape defined objectclass' SUP top MAY ( nsParentUniqueId $ nscpEntryDN ) X-ORIGIN 'Netscape Directory Server' )
-objectClasses: ( 2.16.840.1.113730.3.2.103 NAME 'nsDS5ReplicationAgreement' DESC 'Netscape defined objectclass' SUP top MUST ( cn ) MAY ( nsDS5ReplicaHost $ nsDS5ReplicaPort $ nsDS5ReplicaTransportInfo $ nsDS5ReplicaBindDN $ nsDS5ReplicaCredentials $ nsDS5ReplicaBindMethod $ nsDS5ReplicaRoot $ nsDS5ReplicatedAttributeList $ nsDS5ReplicatedAttributeListTotal $ nsDS5ReplicaUpdateSchedule $ nsds5BeginReplicaRefresh $ description $ nsds50ruv $ nsruvReplicaLastModified $ nsds5ReplicaTimeout $ nsds5replicaChangesSentSinceStartup $ nsds5replicaLastUpdateEnd $ nsds5replicaLastUpdateStart $ nsds5replicaLastUpdateStatus $ nsds5replicaUpdateInProgress $ nsds5replicaLastInitEnd $ nsds5ReplicaEnabled $ nsds5replicaLastInitStart $ nsds5replicaLastInitStatus $ nsds5debugreplicatimeout $ nsds5replicaBusyWaitTime $ nsds5ReplicaStripAttrs $ nsds5replicaSessionPauseTime ) X-ORIGIN 'Netscape Directory Server' )
+objectClasses: ( 2.16.840.1.113730.3.2.103 NAME 'nsDS5ReplicationAgreement' DESC 'Netscape defined objectclass' SUP top MUST ( cn ) MAY ( nsds5ReplicaCleanRUVNotified $ nsDS5ReplicaHost $ nsDS5ReplicaPort $ nsDS5ReplicaTransportInfo $ nsDS5ReplicaBindDN $ nsDS5ReplicaCredentials $ nsDS5ReplicaBindMethod $ nsDS5ReplicaRoot $ nsDS5ReplicatedAttributeList $ nsDS5ReplicatedAttributeListTotal $ nsDS5ReplicaUpdateSchedule $ nsds5BeginReplicaRefresh $ description $ nsds50ruv $ nsruvReplicaLastModified $ nsds5ReplicaTimeout $ nsds5replicaChangesSentSinceStartup $ nsds5replicaLastUpdateEnd $ nsds5replicaLastUpdateStart $ nsds5replicaLastUpdateStatus $ nsds5replicaUpdateInProgress $ nsds5replicaLastInitEnd $ nsds5ReplicaEnabled $ nsds5replicaLastInitStart $ nsds5replicaLastInitStatus $ nsds5debugreplicatimeout $ nsds5replicaBusyWaitTime $ nsds5ReplicaStripAttrs $ nsds5replicaSessionPauseTime ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.39 NAME 'nsslapdConfig' DESC 'Netscape defined objectclass' SUP top MAY ( cn ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.317 NAME 'nsSaslMapping' DESC 'Netscape defined objectclass' SUP top MUST ( cn $ nsSaslMapRegexString $ nsSaslMapBaseDNTemplate $ nsSaslMapFilterTemplate ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.43 NAME 'nsSNMP' DESC 'Netscape defined objectclass' SUP top MUST ( cn $ nsSNMPEnabled ) MAY ( nsSNMPOrganization $ nsSNMPLocation $ nsSNMPContact $ nsSNMPDescription $ nsSNMPName $ nsSNMPMasterHost $ nsSNMPMasterPort ) X-ORIGIN 'Netscape Directory Server' )
diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
index 08bf771..a347c57 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.c
@@ -345,15 +345,15 @@ static int _cl5CheckMissingCSN (const CSN *minCsn, const RUV *supplierRUV, CL5DB
static int _cl5TrimInit ();
static void _cl5TrimCleanup ();
static int _cl5TrimMain (void *param);
-static void _cl5DoTrimming ();
-static void _cl5TrimFile (Object *obj, long *numToTrim);
+static void _cl5DoTrimming (ReplicaId rid);
+static void _cl5TrimFile (Object *obj, long *numToTrim, ReplicaId cleaned_rid);
static PRBool _cl5CanTrim (time_t time, long *numToTrim);
static int _cl5ReadRUV (const char *replGen, Object *obj, PRBool purge);
static int _cl5WriteRUV (CL5DBFile *file, PRBool purge);
static int _cl5ConstructRUV (const char *replGen, Object *obj, PRBool purge);
static int _cl5UpdateRUV (Object *obj, CSN *csn, PRBool newReplica, PRBool purge);
static int _cl5GetRUV2Purge2 (Object *fileObj, RUV **ruv);
-void trigger_cl_trimming_thread();
+void trigger_cl_trimming_thread(void *rid);
/* bakup/recovery, import/export */
static int _cl5LDIF2Operation (char *ldifEntry, slapi_operation_parameters *op,
@@ -699,12 +699,12 @@ int cl5DeleteDBSync (Object *replica)
}
/* Name: cl5GetUpperBoundRUV
- Description: retrieves vector for that represnts the upper bound of the changes for a replica.
+ Description: retrieves vector for that represents the upper bound of the changes for a replica.
Parameters: r - replica for which the purge vector is requested
ruv - contains a copy of the purge ruv if function is successful;
- unchanged otherwise. It is responsobility pf the caller to free
+ unchanged otherwise. It is responsibility of the caller to free
the ruv when it is no longer is in use
- Return: CL5_SUCCESS if function is successfull
+ Return: CL5_SUCCESS if function is successful
CL5_BAD_STATE if the changelog is not initialized;
CL5_BAD_DATA - if NULL id is supplied
CL5_NOTFOUND, if changelog file for replica is not found
@@ -1682,6 +1682,16 @@ cl5GetNextOperationToReplay (CL5ReplayIterator *iterator, CL5Entry *entry)
return CL5_DB_ERROR;
}
+ if(is_cleaned_rid(csn_get_replicaid(csn))){
+ /*
+ * This operation is from a deleted replica. During the cleanallruv task the
+ * replicas are cleaned first before this instance is. This can cause the
+ * server to basically do a full update over and over. So we have to watch for
+ * this, and not send these operations out.
+ */
+ return CL5_IGNORE_OP;
+ }
+
/* there is an entry we should return */
/* Callers of this function should cl5_operation_parameters_done(op) */
if ( 0 != cl5DBData2Entry ( data, datalen, entry ) )
@@ -3383,7 +3393,7 @@ static int _cl5TrimMain (void *param)
{
/* time to trim */
timePrev = timeNow;
- _cl5DoTrimming ();
+ _cl5DoTrimming (0 /* there's no cleaned rid */);
}
if (NULL == s_cl5Desc.clLock)
{
@@ -3417,7 +3427,7 @@ static int _cl5TrimMain (void *param)
*/
-static void _cl5DoTrimming ()
+static void _cl5DoTrimming (ReplicaId rid)
{
Object *obj;
long numToTrim;
@@ -3430,7 +3440,7 @@ static void _cl5DoTrimming ()
obj = objset_first_obj (s_cl5Desc.dbFiles);
while (obj && _cl5CanTrim ((time_t)0, &numToTrim))
{
- _cl5TrimFile (obj, &numToTrim);
+ _cl5TrimFile (obj, &numToTrim, rid);
obj = objset_next_obj (s_cl5Desc.dbFiles, obj);
}
@@ -3447,12 +3457,13 @@ static void _cl5DoTrimming ()
*/
#define CL5_TRIM_MAX_PER_TRANSACTION 10
-static void _cl5TrimFile (Object *obj, long *numToTrim)
+static void _cl5TrimFile (Object *obj, long *numToTrim, ReplicaId cleaned_rid)
{
DB_TXN *txnid;
RUV *ruv = NULL;
CL5Entry entry;
slapi_operation_parameters op = {0};
+ ReplicaId csn_rid;
void *it;
int finished = 0, totalTrimmed = 0, count;
PRBool abort;
@@ -3476,7 +3487,6 @@ static void _cl5TrimFile (Object *obj, long *numToTrim)
count = 0;
txnid = NULL;
abort = PR_FALSE;
- ReplicaId rid;
/* DB txn lock accessed pages until the end of the transaction. */
@@ -3497,14 +3507,13 @@ static void _cl5TrimFile (Object *obj, long *numToTrim)
* This change can be trimmed if it exceeds purge
* parameters and has been seen by all consumers.
*/
- rid = csn_get_replicaid (op.csn);
+ csn_rid = csn_get_replicaid (op.csn);
if ( (*numToTrim > 0 || _cl5CanTrim (entry.time, numToTrim)) &&
ruv_covers_csn_strict (ruv, op.csn) )
{
rc = _cl5CurrentDeleteEntry (it);
- if ( rc == CL5_SUCCESS && !is_released_rid(rid))
+ if ( rc == CL5_SUCCESS && cleaned_rid != csn_rid)
{
- /* update purge vector, unless this is a released rid */
rc = _cl5UpdateRUV (obj, op.csn, PR_FALSE, PR_TRUE);
}
if ( rc == CL5_SUCCESS)
@@ -3530,8 +3539,7 @@ static void _cl5TrimFile (Object *obj, long *numToTrim)
* the trim forever.
*/
CSN *maxcsn = NULL;
- rid = csn_get_replicaid (op.csn);
- ruv_get_largest_csn_for_replica (ruv, rid, &maxcsn);
+ ruv_get_largest_csn_for_replica (ruv, csn_rid, &maxcsn);
if ( csn_compare (op.csn, maxcsn) != 0 )
{
/* op.csn is not anchor CSN */
@@ -3895,20 +3903,18 @@ static int _cl5UpdateRUV (Object *obj, CSN *csn, PRBool newReplica, PRBool purge
/* update vector only if this replica is not yet part of RUV */
if (purge && newReplica)
{
- if (ruv_contains_replica (file->purgeRUV, rid))
+ if (ruv_contains_replica (file->purgeRUV, rid)){
return CL5_SUCCESS;
- else if(!is_cleaned_rid(rid))
- {
+ } else {
/* if the replica is not part of the purgeRUV yet, add it unless it's from a cleaned rid */
ruv_add_replica (file->purgeRUV, rid, multimaster_get_local_purl());
}
}
else
{
- if (purge)
+ if (purge){
rc = ruv_set_csns(file->purgeRUV, csn, NULL);
- else if(!is_cleaned_rid(rid)){
- /* don't update maxRuv if rid is cleaned */
+ } else {
rc = ruv_set_csns(file->maxRUV, csn, NULL);
}
}
@@ -4520,17 +4526,9 @@ static int _cl5WriteOperationTxn(const char *replName, const char *replGen,
CL5Entry entry;
CL5DBFile *file = NULL;
Object *file_obj = NULL;
- ReplicaId rid = csn_get_replicaid (op->csn);
DB_TXN *txnid = NULL;
DB_TXN *parent_txnid = (DB_TXN *)txn;
- /*
- * If the op csn contains the cleaned rid, don't write it
- */
- if(is_cleaned_rid(rid)){
- return CL5_SUCCESS;
- }
-
rc = _cl5GetDBFileByReplicaName (replName, replGen, &file_obj);
if (rc == CL5_NOTFOUND)
{
@@ -5089,7 +5087,7 @@ static int _cl5PositionCursorForReplay (ReplicaId consumerRID, const RUV *consum
* legacy consumer. In this case the supplier
* and the consumer may have the same RID.
*/
- if (rid == consumerRID && rid != MAX_REPLICA_ID)
+ if ((rid == consumerRID && rid != MAX_REPLICA_ID) || (is_cleaned_rid(rid)) )
continue;
startCSN = csns[i];
@@ -6556,13 +6554,12 @@ cl5CleanRUV(ReplicaId rid){
}
}
-void trigger_cl_trimming(){
+void trigger_cl_trimming(ReplicaId rid){
PRThread *trim_tid = NULL;
- ReplicaId rid = get_released_rid();
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "trigger_cl_trimming: rid (%d)\n",(int)rid);
trim_tid = PR_CreateThread(PR_USER_THREAD, (VFP)(void*)trigger_cl_trimming_thread,
- NULL, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ (void *)&rid, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
PR_UNJOINABLE_THREAD, DEFAULT_THREAD_STACKSIZE);
if (NULL == trim_tid){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl,
@@ -6575,7 +6572,9 @@ void trigger_cl_trimming(){
}
void
-trigger_cl_trimming_thread(){
+trigger_cl_trimming_thread(void *arg){
+ ReplicaId rid = *(ReplicaId *)arg;
+
/* make sure we have a change log, and we aren't closing it */
if(s_cl5Desc.dbState == CL5_STATE_CLOSED || s_cl5Desc.dbState == CL5_STATE_CLOSING){
return;
@@ -6585,6 +6584,6 @@ trigger_cl_trimming_thread(){
"trigger_cl_trimming: failed to increment thread count "
"NSPR error - %d\n", PR_GetError ());
}
- _cl5DoTrimming();
+ _cl5DoTrimming(rid);
_cl5RemoveThread();
}
diff --git a/ldap/servers/plugins/replication/cl5_api.h b/ldap/servers/plugins/replication/cl5_api.h
index b9c3dd8..9b285ca 100644
--- a/ldap/servers/plugins/replication/cl5_api.h
+++ b/ldap/servers/plugins/replication/cl5_api.h
@@ -145,9 +145,10 @@ enum
CL5_CSN_ERROR, /* CSN API failed */
CL5_RUV_ERROR, /* RUV API failed */
CL5_OBJSET_ERROR, /* namedobjset api failed */
- CL5_PURGED_DATA, /* requested data has been purged */
- CL5_MISSING_DATA, /* data should be in the changelog, but is missing */
- CL5_UNKNOWN_ERROR /* unclassified error */
+ CL5_PURGED_DATA, /* requested data has been purged */
+ CL5_MISSING_DATA, /* data should be in the changelog, but is missing */
+ CL5_UNKNOWN_ERROR, /* unclassified error */
+ CL5_IGNORE_OP /* ignore this updated - used by CLEANALLRUV task */
};
/***** Module APIs *****/
@@ -489,6 +490,6 @@ int cl5WriteRUV();
int cl5DeleteRUV();
void cl5CleanRUV(ReplicaId rid);
void cl5NotifyCleanup(int rid);
-void trigger_cl_trimming();
+void trigger_cl_trimming(ReplicaId rid);
#endif
diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h
index d7ba6a6..fc756b1 100644
--- a/ldap/servers/plugins/replication/repl5.h
+++ b/ldap/servers/plugins/replication/repl5.h
@@ -94,10 +94,11 @@
* new set of start and response extops. */
#define REPL_START_NSDS90_REPLICATION_REQUEST_OID "2.16.840.1.113730.3.5.12"
#define REPL_NSDS90_REPLICATION_RESPONSE_OID "2.16.840.1.113730.3.5.13"
-/* cleanruv/releaseruv extended ops */
+/* cleanallruv extended ops */
#define REPL_CLEANRUV_OID "2.16.840.1.113730.3.6.5"
-#define REPL_RELEASERUV_OID "2.16.840.1.113730.3.6.6"
-
+#define REPL_ABORT_CLEANRUV_OID "2.16.840.1.113730.3.6.6"
+#define CLEANRUV_NOTIFIED 0
+#define CLEANRUV_RELEASED 1
/* DS 5.0 replication protocol error codes */
#define NSDS50_REPL_REPLICA_READY 0x00 /* Replica ready, go ahead */
@@ -157,6 +158,7 @@ extern const char *type_nsds5ReplicaBusyWaitTime;
extern const char *type_nsds5ReplicaSessionPauseTime;
extern const char *type_nsds5ReplicaEnabled;
extern const char *type_nsds5ReplicaStripAttrs;
+extern const char *type_nsds5ReplicaCleanRUVnotified;
/* Attribute names for windows replication agreements */
extern const char *type_nsds7WindowsReplicaArea;
@@ -185,6 +187,8 @@ extern const char *type_replicaPurgeDelay;
extern const char *type_replicaChangeCount;
extern const char *type_replicaTombstonePurgeInterval;
extern const char *type_replicaLegacyConsumer;
+extern const char *type_replicaCleanRUV;
+extern const char *type_replicaAbortCleanRUV;
extern const char *type_ruvElementUpdatetime;
/* multimaster plugin points */
@@ -224,7 +228,7 @@ char* get_repl_session_id (Slapi_PBlock *pb, char *id, CSN **opcsn);
int multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb);
int multimaster_extop_EndNSDS50ReplicationRequest(Slapi_PBlock *pb);
int multimaster_extop_cleanruv(Slapi_PBlock *pb);
-int multimaster_extop_releaseruv(Slapi_PBlock *pb);
+int multimaster_extop_abort_cleanruv(Slapi_PBlock *pb);
int extop_noop(Slapi_PBlock *pb);
struct berval *NSDS50StartReplicationRequest_new(const char *protocol_oid,
const char *repl_root, char **extra_referrals, CSN *csn);
@@ -359,6 +363,10 @@ PRBool agmt_is_enabled(Repl_Agmt *ra);
int agmt_set_enabled_from_entry(Repl_Agmt *ra, Slapi_Entry *e);
char **agmt_get_attrs_to_strip(Repl_Agmt *ra);
int agmt_set_attrs_to_strip(Repl_Agmt *ra, Slapi_Entry *e);
+void agmt_set_cleanruv_notified_from_entry(Repl_Agmt *ra, Slapi_Entry *e);
+int agmt_set_cleanruv_data(Repl_Agmt *ra, ReplicaId rid, int op);
+int agmt_is_cleanruv_notified(Repl_Agmt *ra, ReplicaId rid);
+int agmt_set_timeout(Repl_Agmt *ra, long timeout);
typedef struct replica Replica;
@@ -369,7 +377,6 @@ void agmtlist_notify_all(Slapi_PBlock *pb);
Object* agmtlist_get_first_agreement_for_replica (Replica *r);
Object* agmtlist_get_next_agreement_for_replica (Replica *r, Object *prev);
-
/* In repl5_backoff.c */
typedef struct backoff_timer Backoff_Timer;
#define BACKOFF_FIXED 1
@@ -443,6 +450,7 @@ ConnResult conn_read_result_ex(Repl_Connection *conn, char **retoidp, struct ber
LDAP * conn_get_ldap(Repl_Connection *conn);
void conn_lock(Repl_Connection *conn);
void conn_unlock(Repl_Connection *conn);
+void conn_delete_internal_ext(Repl_Connection *conn);
/* In repl5_protocol.c */
typedef struct repl_protocol Repl_Protocol;
@@ -554,6 +562,9 @@ void replica_set_tombstone_reap_interval (Replica *r, long interval);
void replica_update_ruv_consumer (Replica *r, RUV *supplier_ruv);
void replica_set_ruv_dirty (Replica *r);
void replica_write_ruv (Replica *r);
+char *replica_get_dn(Replica *r);
+void replica_check_for_tasks(Replica*r, Slapi_Entry *e);
+
/* The functions below handles the state flag */
/* Current internal state flags */
/* The replica can be busy and not other flag,
@@ -594,22 +605,40 @@ int replica_config_init();
void replica_config_destroy ();
int get_replica_type(Replica *r);
int replica_execute_cleanruv_task_ext(Object *r, ReplicaId rid);
-void set_cleaned_rid(ReplicaId rid);
-void delete_cleaned_rid();
+void add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn);
int is_cleaned_rid(ReplicaId rid);
-int get_released_rid();
-void set_released_rid(int rid);
-int is_released_rid(int rid);
-int is_already_released_rid();
-void delete_released_rid();
-void replica_cleanallruv_monitor_thread(void *arg);
+int replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
+ int *returncode, char *returntext, void *arg);
+void replica_cleanallruv_thread_ext(void *arg);
+void stop_ruv_cleaning();
+int task_aborted();
+void replica_abort_task_thread(void *arg);
+void delete_cleaned_rid(Replica *r, ReplicaId rid, CSN *maxcsn);
+int process_repl_agmts(Replica *replica, int *agmt_info, char *oid, Slapi_Task *task, struct berval *payload, int op);
+int decode_cleanruv_payload(struct berval *extop_value, char **payload);
+struct berval *create_ruv_payload(char *value);
+void replica_add_cleanruv_data(Replica *r, char *val);
+void replica_remove_cleanruv_data(Replica *r, char *val);
+CSN *replica_get_cleanruv_maxcsn(Replica *r, ReplicaId rid);
+void ruv_get_cleaned_rids(RUV *ruv, ReplicaId *rids);
+void add_aborted_rid(ReplicaId rid, Replica *r, char *repl_root);
+int is_task_aborted(ReplicaId rid);
+void delete_aborted_rid(Replica *replica, ReplicaId rid, char *repl_root);
+void set_cleaned_rid(ReplicaId rid);
+void cleanruv_log(Slapi_Task *task, char *task_type, char *fmt, ...);
-#define ALREADY_RELEASED -1
+#define CLEANRIDSIZ 4 /* maximum number for concurrent CLEANALLRUV tasks */
typedef struct _cleanruv_data
{
Object *repl_obj;
+ Replica *replica;
ReplicaId rid;
+ Slapi_Task *task;
+ struct berval *payload;
+ CSN *maxcsn;
+ char *repl_root;
+ Slapi_DN *sdn;
} cleanruv_data;
/* replutil.c */
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index 2978aba..5a16083 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -141,6 +141,7 @@ typedef struct repl5agmt {
char **attrs_to_strip; /* for fractional replication, if a "mod" is empty, strip out these attributes:
* modifiersname, modifytimestamp, internalModifiersname, internalModifyTimestamp, etc */
int agreement_type;
+ int cleanruv_notified[CLEANRIDSIZ + 1]; /* specifies if the replica has been notified of a CLEANALLRUV task */
} repl5agmt;
/* Forward declarations */
@@ -251,6 +252,7 @@ agmt_new_from_entry(Slapi_Entry *e)
Repl_Agmt *ra;
Slapi_Attr *sattr;
char *tmpstr;
+ char **clean_vals = NULL;
char **denied_attrs = NULL;
char *auto_initialize = NULL;
char *val_nsds5BeginReplicaRefresh = "start";
@@ -425,6 +427,19 @@ agmt_new_from_entry(Slapi_Entry *e)
ra->last_init_start_time = 0UL;
ra->last_init_status[0] = '\0';
+ /* cleanruv notification */
+ clean_vals = slapi_entry_attr_get_charray(e, type_nsds5ReplicaCleanRUVnotified);
+ if(clean_vals){
+ int i;
+ for (i = 0; i < CLEANRIDSIZ && clean_vals[i]; i++){
+ ra->cleanruv_notified[i] = atoi(clean_vals[i]);
+ }
+ ra->cleanruv_notified[i + 1] = 0;
+ slapi_ch_array_free(clean_vals);
+ } else {
+ ra->cleanruv_notified[0] = 0;
+ }
+
/* Fractional attributes */
slapi_entry_attr_find(e, type_nsds5ReplicatedAttributeList, &sattr);
@@ -1685,6 +1700,20 @@ agmt_set_timeout_from_entry(Repl_Agmt *ra, const Slapi_Entry *e)
return return_value;
}
+int
+agmt_set_timeout(Repl_Agmt *ra, long timeout)
+{
+ PR_Lock(ra->lock);
+ if (ra->stop_in_progress){
+ PR_Unlock(ra->lock);
+ return -1;
+ }
+ ra->timeout = timeout;
+ PR_Unlock(ra->lock);
+
+ return 0;
+}
+
/*
* Set or reset the busywaittime
*
@@ -2571,3 +2600,84 @@ agmt_set_attrs_to_strip(Repl_Agmt *ra, Slapi_Entry *e)
return -1;
}
+
+int
+agmt_is_cleanruv_notified(Repl_Agmt *ra, ReplicaId rid){
+ int notified = 0;
+ int i;
+
+ PR_Lock(ra->lock);
+ for(i = 0; i < CLEANRIDSIZ && ra->cleanruv_notified[i]; i++){
+ if(ra->cleanruv_notified[i] == rid){
+ notified = 1;
+ break;
+ }
+ }
+ PR_Unlock(ra->lock);
+
+ return notified;
+}
+
+/*
+ * This will trigger agmt_set_cleanruv_notified_from_entry() to be called,
+ * which will update the in memory agmt.
+ *
+ * op can be: CLEANRUV_NOTIFIED or CLEANRUV_RELEASED
+ */
+int
+agmt_set_cleanruv_data(Repl_Agmt *ra, ReplicaId rid, int op){
+ Slapi_PBlock *pb;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ struct berval *vals[2];
+ struct berval val;
+ char data[6];
+ int rc = 0;
+
+ if(ra == NULL){
+ return -1;
+ }
+
+ if(op == CLEANRUV_NOTIFIED){
+ /* add the cleanruv data */
+ mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
+ } else {
+ /* remove the cleanruv data */
+ mod.mod_op = LDAP_MOD_DELETE|LDAP_MOD_BVALUES;
+ }
+
+ pb = slapi_pblock_new();
+ val.bv_len = PR_snprintf(data, sizeof(data), "%d", (int)rid);
+ mod.mod_type = (char *)type_nsds5ReplicaCleanRUVnotified;
+ mod.mod_bvalues = vals;
+ vals [0] = &val;
+ vals [1] = NULL;
+ val.bv_val = data;
+ mods[0] = &mod;
+ mods[1] = NULL;
+
+ slapi_modify_internal_set_pb_ext (pb, ra->dn, mods, NULL, NULL,
+ repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_modify_internal_pb (pb);
+ slapi_pblock_destroy(pb);
+
+ return rc;
+}
+
+void
+agmt_set_cleanruv_notified_from_entry(Repl_Agmt *ra, Slapi_Entry *e){
+ char **attr_vals = NULL;
+ int i;
+
+ PR_Lock(ra->lock);
+ attr_vals = slapi_entry_attr_get_charray(e, type_nsds5ReplicaCleanRUVnotified);
+ if(attr_vals){
+ for (i = 0; i < CLEANRIDSIZ && attr_vals[i]; i++){
+ ra->cleanruv_notified[i] = atoi(attr_vals[i]);
+ }
+ ra->cleanruv_notified[i + 1] = 0;
+ } else {
+ ra->cleanruv_notified[0] = 0;
+ }
+ PR_Unlock(ra->lock);
+}
diff --git a/ldap/servers/plugins/replication/repl5_agmtlist.c b/ldap/servers/plugins/replication/repl5_agmtlist.c
index 86f06bf..c0b9664 100644
--- a/ldap/servers/plugins/replication/repl5_agmtlist.c
+++ b/ldap/servers/plugins/replication/repl5_agmtlist.c
@@ -508,6 +508,10 @@ agmtlist_modify_callback(Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry
rc = SLAPI_DSE_CALLBACK_ERROR;
}
}
+ else if (slapi_attr_types_equivalent(mods[i]->mod_type, type_nsds5ReplicaCleanRUVnotified))
+ {
+ agmt_set_cleanruv_notified_from_entry(agmt, e);
+ }
else if (0 == windows_handle_modify_agreement(agmt, mods[i]->mod_type, e))
{
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: "
diff --git a/ldap/servers/plugins/replication/repl5_connection.c b/ldap/servers/plugins/replication/repl5_connection.c
index 5fdc601..51a2bc5 100644
--- a/ldap/servers/plugins/replication/repl5_connection.c
+++ b/ldap/servers/plugins/replication/repl5_connection.c
@@ -140,7 +140,7 @@ static void repl5_debug_timeout_callback(time_t when, void *arg);
static void close_connection_internal(Repl_Connection *conn);
/*
- * Create a new conenction object. Returns a pointer to the object, or
+ * Create a new connection object. Returns a pointer to the object, or
* NULL if an error occurs.
*/
Repl_Connection *
@@ -217,6 +217,17 @@ conn_delete_internal(Repl_Connection *conn)
}
/*
+ * Used by CLEANALLRUV - free it all!
+ */
+void
+conn_delete_internal_ext(Repl_Connection *conn)
+{
+ conn_delete_internal(conn);
+ PR_DestroyLock(conn->lock);
+ slapi_ch_free((void **)&conn);
+}
+
+/*
* Destroy a connection. It is an error to use the connection object
* after conn_delete() has been called.
*/
diff --git a/ldap/servers/plugins/replication/repl5_inc_protocol.c b/ldap/servers/plugins/replication/repl5_inc_protocol.c
index 7388d62..025c23f 100644
--- a/ldap/servers/plugins/replication/repl5_inc_protocol.c
+++ b/ldap/servers/plugins/replication/repl5_inc_protocol.c
@@ -466,7 +466,7 @@ repl5_inc_waitfor_async_results(result_data *rd)
int done = 0;
int loops = 0;
/* Keep pulling results off the LDAP connection until we catch up to the last message id stored in the rd */
- while (!done)
+ while (!done && !slapi_is_shutting_down())
{
/* Lock the structure to force memory barrier */
PR_Lock(rd->lock);
@@ -1473,10 +1473,10 @@ repl5_inc_update_from_op_result(Private_Repl_Protocol *prp, ConnResult replay_cr
agmt_inc_last_update_changecount (prp->agmt, replica_id, 1 /*skipped*/);
}
slapi_log_error(*finished ? SLAPI_LOG_FATAL : slapi_log_urp, repl_plugin_name,
- "%s: Consumer failed to replay change (uniqueid %s, CSN %s): %s. %s.\n",
+ "%s: Consumer failed to replay change (uniqueid %s, CSN %s): %s (%d). %s.\n",
agmt_get_long_name(prp->agmt),
uniqueid, csn_str,
- ldap_err2string(connection_error),
+ ldap_err2string(connection_error), connection_error,
*finished ? "Will retry later" : "Skipping");
}
else if (CONN_NOT_CONNECTED == replay_crc)
@@ -1487,10 +1487,11 @@ repl5_inc_update_from_op_result(Private_Repl_Protocol *prp, ConnResult replay_cr
*finished = 1;
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"%s: Consumer failed to replay change (uniqueid %s, CSN %s): "
- "%s. Will retry later.\n",
+ "%s(%d). Will retry later.\n",
agmt_get_long_name(prp->agmt),
uniqueid, csn_str,
- connection_error ? ldap_err2string(connection_error) : "Connection lost");
+ connection_error ? ldap_err2string(connection_error) : "Connection lost",
+ connection_error);
}
else if (CONN_TIMEOUT == replay_crc)
{
@@ -1533,7 +1534,7 @@ repl5_inc_update_from_op_result(Private_Repl_Protocol *prp, ConnResult replay_cr
* has already been acquired, (2) that the consumer's update vector has
* been checked and (3) that it's ok to send incremental updates.
* Returns:
- * UPDATE_NO_MORE_UPDATES - all updates were sent succussfully
+ * UPDATE_NO_MORE_UPDATES - all updates were sent successfully
* UPDATE_TRANSIENT_ERROR - some non-permanent error occurred. Try again later.
* UPDATE_FATAL_ERROR - some bad, permanent error occurred.
* UPDATE_SCHEDULE_WINDOW_CLOSED - the schedule window closed on us.
@@ -1603,7 +1604,7 @@ send_updates(Private_Repl_Protocol *prp, RUV *remote_update_vector, PRUint32 *nu
agmt_get_long_name(prp->agmt));
return_value = UPDATE_FATAL_ERROR;
break;
- case CL5_SYSTEM_ERROR: /* NSPR error occurred: use PR_GetError for furhter info */
+ case CL5_SYSTEM_ERROR: /* NSPR error occurred: use PR_GetError for further info */
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"%s: An NSPR error (%d) occurred\n",
agmt_get_long_name(prp->agmt), PR_GetError());
@@ -1642,7 +1643,7 @@ send_updates(Private_Repl_Protocol *prp, RUV *remote_update_vector, PRUint32 *nu
break;
case CL5_UNKNOWN_ERROR: /* unclassified error */
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "%s: An unknown error was ecountered\n",
+ "%s: An unknown error was encountered\n",
agmt_get_long_name(prp->agmt));
return_value = UPDATE_TRANSIENT_ERROR;
break;
@@ -1834,6 +1835,8 @@ send_updates(Private_Repl_Protocol *prp, RUV *remote_update_vector, PRUint32 *nu
agmt_get_long_name(prp->agmt));
return_value = UPDATE_FATAL_ERROR;
break;
+ case CL5_IGNORE_OP:
+ break;
default:
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"%s: Unknown error code (%d) returned from cl5GetNextOperationToReplay\n",
@@ -1865,7 +1868,7 @@ send_updates(Private_Repl_Protocol *prp, RUV *remote_update_vector, PRUint32 *nu
/* Terminate the results reading thread */
if (!prp->repl50consumer)
{
- /* We need to ensure that we wait until all the responses have been recived from our operations */
+ /* We need to ensure that we wait until all the responses have been received from our operations */
if (return_value != UPDATE_CONNECTION_LOST) {
/* if connection was lost/closed, there will be nothing to read */
repl5_inc_waitfor_async_results(rd);
diff --git a/ldap/servers/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c
index a878b19..7a80c6f 100644
--- a/ldap/servers/plugins/replication/repl5_init.c
+++ b/ldap/servers/plugins/replication/repl5_init.c
@@ -126,12 +126,12 @@ static char *cleanruv_name_list[] = {
NSDS_REPL_NAME_PREFIX " Cleanruv",
NULL
};
-static char *releaseruv_oid_list[] = {
- REPL_RELEASERUV_OID,
+static char *cleanruv_abort_oid_list[] = {
+ REPL_ABORT_CLEANRUV_OID,
NULL
};
-static char *releaseruv_name_list[] = {
- NSDS_REPL_NAME_PREFIX " Releaseruv",
+static char *cleanruv_abort_name_list[] = {
+ NSDS_REPL_NAME_PREFIX " Cleanruv Abort",
NULL
};
@@ -474,7 +474,7 @@ multimaster_cleanruv_extop_init( Slapi_PBlock *pb )
}
int
-multimaster_releaseruv_extop_init( Slapi_PBlock *pb )
+multimaster_cleanruv_abort_extop_init( Slapi_PBlock *pb )
{
int rc= 0; /* OK */
void *identity = NULL;
@@ -485,11 +485,11 @@ multimaster_releaseruv_extop_init( Slapi_PBlock *pb )
if (slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, SLAPI_PLUGIN_VERSION_01 ) != 0 ||
slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, (void *)&multimasterextopdesc ) != 0 ||
- slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_OIDLIST, (void *)releaseruv_oid_list ) != 0 ||
- slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, (void *)releaseruv_name_list ) != 0 ||
- slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_FN, (void *)multimaster_extop_releaseruv ))
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_OIDLIST, (void *)cleanruv_abort_oid_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, (void *)cleanruv_abort_name_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_FN, (void *)multimaster_extop_abort_cleanruv ))
{
- slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, "multimaster_releaseruv_extop_init failed\n" );
+ slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, "multimaster_cleanruv_abort_extop_init failed\n" );
rc= -1;
}
@@ -605,24 +605,22 @@ multimaster_stop( Slapi_PBlock *pb )
int rc= 0; /* OK */
if (!multimaster_stopped_flag)
- {
- if (!is_ldif_dump)
- {
- agmtlist_shutdown(); /* Shut down replication agreements */
- }
-
+ {
+ if (!is_ldif_dump)
+ {
+ /* Shut down replication agreements */
+ agmtlist_shutdown();
+ }
+ /* if we are cleaning a ruv, stop */
+ stop_ruv_cleaning();
/* unregister backend state change notification */
slapi_unregister_backend_state_change((void *)multimaster_be_state_change);
-
- changelog5_cleanup(); /* Shut down the changelog */
- multimaster_mtnode_extension_destroy(); /* Destroy mapping tree node exts */
+ changelog5_cleanup(); /* Shut down the changelog */
+ multimaster_mtnode_extension_destroy(); /* Destroy mapping tree node exts */
replica_destroy_name_hash(); /* destroy the hash and its remaining content */
replica_config_destroy (); /* Destroy replica config info */
- multimaster_stopped_flag = 1;
- /* JCMREPL - Wait for all our threads to stop */
- /* JCMREPL - Shut down the replication plugin */
- /* JCMREPL - Mark all the replication plugin interfaces at not enabled. */
- }
+ multimaster_stopped_flag = 1;
+ }
return rc;
}
@@ -680,7 +678,7 @@ int replication_multimaster_plugin_init(Slapi_PBlock *pb)
rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_total_extop_init", multimaster_total_extop_init, "Multimaster replication total update extended operation plugin", NULL, identity);
rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_response_extop_init", multimaster_response_extop_init, "Multimaster replication extended response plugin", NULL, identity);
rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_extop_init", multimaster_cleanruv_extop_init, "Multimaster replication cleanruv extended operation plugin", NULL, identity);
- rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_releaseruv_extop_init", multimaster_releaseruv_extop_init, "Multimaster replication releaserid extended response plugin", NULL, identity);
+ rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_abort_extop_init", multimaster_cleanruv_abort_extop_init, "Multimaster replication cleanruv abort extended operation plugin", NULL, identity);
if (0 == rc)
{
multimaster_initialised = 1;
diff --git a/ldap/servers/plugins/replication/repl5_plugins.c b/ldap/servers/plugins/replication/repl5_plugins.c
index 5ca6d90..964dd88 100644
--- a/ldap/servers/plugins/replication/repl5_plugins.c
+++ b/ldap/servers/plugins/replication/repl5_plugins.c
@@ -1010,15 +1010,6 @@ write_changelog_and_ruv (Slapi_PBlock *pb)
r = (Replica*)object_get_data (repl_obj);
PR_ASSERT (r);
- /*
- * In case we had to run cleanruv, we don't want to continue to write
- * updates to the changelog/database ruv from that replica(rid).
- */
- if( is_cleaned_rid(replica_get_rid(r))){
- /* this RID has been cleaned, just goto done */
- goto done;
- }
-
if (replica_is_flag_set (r, REPLICA_LOG_CHANGES) &&
(cl5GetState () == CL5_STATE_OPEN))
{
@@ -1073,6 +1064,12 @@ write_changelog_and_ruv (Slapi_PBlock *pb)
op_params->target_address.uniqueid = slapi_ch_strdup (uniqueid);
}
+ if( is_cleaned_rid(csn_get_replicaid(op_params->csn))){
+ /* this RID has been cleaned */
+ object_release (repl_obj);
+ return 0;
+ }
+
/* we might have stripped all the mods - in that case we do not
log the operation */
if (op_params->operation_type != SLAPI_OPERATION_MODIFY ||
@@ -1125,7 +1122,6 @@ write_changelog_and_ruv (Slapi_PBlock *pb)
update_ruv_component(r, opcsn, pb);
}
-done:
object_release (repl_obj);
return return_value;
}
@@ -1328,7 +1324,7 @@ process_operation (Slapi_PBlock *pb, const CSN *csn)
ruv = (RUV*)object_get_data (ruv_obj);
PR_ASSERT (ruv);
- rc = ruv_add_csn_inprogress (ruv, csn);
+ rc = ruv_add_csn_inprogress (ruv, csn);
object_release (ruv_obj);
object_release (r_obj);
diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
index ccaa29d..27cdacd 100644
--- a/ldap/servers/plugins/replication/repl5_replica.c
+++ b/ldap/servers/plugins/replication/repl5_replica.c
@@ -61,20 +61,20 @@
*/
struct replica {
Slapi_DN *repl_root; /* top of the replicated area */
- char *repl_name; /* unique replica name */
- PRBool new_name; /* new name was generated - need to be saved */
+ char *repl_name; /* unique replica name */
+ PRBool new_name; /* new name was generated - need to be saved */
ReplicaUpdateDNList updatedn_list; /* list of dns with which a supplier should bind
to update this replica */
ReplicaType repl_type; /* is this replica read-only ? */
- PRBool legacy_consumer; /* if true, this replica is supplied by 4.0 consumer */
- char* legacy_purl; /* partial url of the legacy supplier */
+ PRBool legacy_consumer; /* if true, this replica is supplied by 4.0 consumer */
+ char* legacy_purl; /* partial url of the legacy supplier */
ReplicaId repl_rid; /* replicaID */
Object *repl_ruv; /* replica update vector */
PRBool repl_ruv_dirty; /* Dirty flag for ruv */
CSNPL *min_csn_pl; /* Pending list for minimal CSN */
void *csn_pl_reg_id; /* registration assignment for csn callbacks */
unsigned long repl_state_flags; /* state flags */
- PRUint32 repl_flags; /* persistent, externally visible flags */
+ PRUint32 repl_flags; /* persistent, externally visible flags */
PRLock *repl_lock; /* protects entire structure */
Slapi_Eq_Context repl_eqcxt_rs; /* context to cancel event that saves ruv */
Slapi_Eq_Context repl_eqcxt_tr; /* context to cancel event that reaps tombstones */
@@ -85,9 +85,10 @@ struct replica {
PRBool tombstone_reap_active; /* TRUE when the tombstone reaper is running */
long tombstone_reap_interval; /* Time in seconds between tombstone reaping */
Slapi_ValueSet *repl_referral; /* A list of administrator provided referral URLs */
- PRBool state_update_inprogress; /* replica state is being updated */
- PRLock *agmt_lock; /* protects agreement creation, start and stop */
+ PRBool state_update_inprogress; /* replica state is being updated */
+ PRLock *agmt_lock; /* protects agreement creation, start and stop */
char *locking_purl; /* supplier who has exclusive access */
+ char *repl_cleanruv_data[CLEANRIDSIZ + 1];
};
@@ -123,6 +124,7 @@ static int replica_log_ruv_elements_nolock (const Replica *r);
static void replica_replace_ruv_tombstone(Replica *r);
static void start_agreements_for_replica (Replica *r, PRBool start);
static void _delete_tombstone(const char *tombstone_dn, const char *uniqueid, int ext_op_flags);
+static void replica_strip_cleaned_rids(Replica *r);
/* Allocates new replica and reads its state and state of its component from
* various parts of the DIT.
@@ -270,6 +272,8 @@ replica_new_from_entry (Slapi_Entry *e, char *errortext, PRBool is_add_operation
slapi_sdn_get_dn(r->repl_root));
}
+ replica_check_for_tasks(r, e);
+
done:
if (rc != 0 && r)
{
@@ -306,6 +310,7 @@ replica_destroy(void **arg)
{
Replica *r;
void *repl_name;
+ int i;
if (arg == NULL)
return;
@@ -392,6 +397,10 @@ replica_destroy(void **arg)
csnplFree(&r->min_csn_pl);;
}
+ for(i = 0;r->repl_cleanruv_data[i] != NULL; i++){
+ slapi_ch_free_string(&r->repl_cleanruv_data[i]);
+ }
+
slapi_ch_free((void **)arg);
}
@@ -1302,7 +1311,7 @@ replica_reload_ruv (Replica *r)
}
/* check if there is a changelog and whether this replica logs changes */
- if (cl5GetState () == CL5_STATE_OPEN && r->repl_flags & REPLICA_LOG_CHANGES)
+ if (cl5GetState () == CL5_STATE_OPEN && (r->repl_flags & REPLICA_LOG_CHANGES))
{
/* Compare new ruv to the changelog's upper bound ruv. We could only keep
@@ -1424,7 +1433,7 @@ int replica_check_for_data_reload (Replica *r, void *arg)
PR_ASSERT (r);
/* check that we have a changelog and if this replica logs changes */
- if (cl5GetState () == CL5_STATE_OPEN && r->repl_flags & REPLICA_LOG_CHANGES)
+ if (cl5GetState () == CL5_STATE_OPEN && (r->repl_flags & REPLICA_LOG_CHANGES))
{
/* Compare new ruv to the purge ruv. If the new contains csns which
are smaller than those in purge ruv, we need to remove old and
@@ -1558,6 +1567,12 @@ _replica_get_config_entry (const Slapi_DN *root)
return e;
}
+char *
+replica_get_dn(Replica *r)
+{
+ return _replica_get_config_dn (r->repl_root);
+}
+
static int
_replica_check_validity (const Replica *r)
{
@@ -1785,6 +1800,177 @@ _replica_init_from_config (Replica *r, Slapi_Entry *e, char *errortext)
return (_replica_check_validity (r));
}
+void
+replica_check_for_tasks(Replica *r, Slapi_Entry *e)
+{
+ char **clean_vals;
+
+ if(e == NULL){
+ return;
+ }
+ /*
+ * check if we are in the middle of a CLEANALLRUV task,
+ * if so set the cleaned rid, and fire off the thread
+ */
+ if ((clean_vals = slapi_entry_attr_get_charray(e, type_replicaCleanRUV)) != NULL)
+ {
+ PRThread *thread = NULL;
+ struct berval *payload = NULL;
+ CSN *maxcsn = NULL;
+ char *csnpart;
+ char *iter;
+ char csnstr[CSN_STRSIZE];
+ char *ridstr;
+ char *token = NULL;
+ ReplicaId rid;
+ int i;
+
+ for(i = 0; clean_vals[i]; i++){
+ cleanruv_data *data = NULL;
+
+ /*
+ * Set the cleanruv data, and add the cleaned rid
+ */
+ r->repl_cleanruv_data[i] = slapi_ch_strdup(clean_vals[i]);
+ token = ldap_utf8strtok_r(clean_vals[i], ":", &iter);
+ if(token){
+ rid = atoi(token);
+ if(rid <= 0 || rid >= READ_ONLY_REPLICA_ID){
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: invalid replica id(%d) "
+ "aborting task.\n", rid);
+ goto done;
+ }
+ } else {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: unable to parse cleanallruv "
+ "data (%s), aborting task.\n",clean_vals[i]);
+ goto done;
+ }
+ csnpart = ldap_utf8strtok_r(iter, ":", &iter);
+ maxcsn = csn_new();
+ csn_init_by_string(maxcsn, csnpart);
+ csn_as_string(maxcsn, PR_FALSE, csnstr);
+ add_cleaned_rid(rid, r, csnstr);
+
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: cleanAllRUV task found, "
+ "resuming the cleaning of rid(%d)...\n", rid);
+ /*
+ * Create payload
+ */
+ ridstr = slapi_ch_smprintf("%d:%s:%s", rid, slapi_sdn_get_dn(replica_get_root(r)), csnstr);
+ payload = create_ruv_payload(ridstr);
+ slapi_ch_free_string(&ridstr);
+
+ if(payload == NULL){
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: Startup: Failed to "
+ "create extended op payload, aborting task");
+ return;
+ }
+ /*
+ * Setup the data struct, and fire off the thread.
+ */
+ data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
+ if (data == NULL) {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV: failed to allocate cleanruv_data.\n");
+ csn_free(&maxcsn);
+ } else {
+ /* setup our data */
+ data->repl_obj = NULL;
+ data->replica = NULL;
+ data->rid = rid;
+ data->task = NULL;
+ data->maxcsn = maxcsn;
+ data->sdn = slapi_sdn_dup(r->repl_root);
+ data->payload = payload;
+
+ thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_thread_ext,
+ (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
+ if (thread == NULL) {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV: unable to create cleanAllRUV "
+ "thread for rid(%d)\n", (int)data->rid);
+ }
+ }
+ }
+ r->repl_cleanruv_data[i] = NULL;
+ }
+
+ if ((clean_vals = slapi_entry_attr_get_charray(e, type_replicaAbortCleanRUV)) != NULL)
+ {
+ PRThread *thread = NULL;
+ struct berval *payload;
+ CSN *maxcsn = NULL;
+ char *iter;
+ char *ridstr = NULL;
+ char *repl_root;
+ char *token = NULL;
+ ReplicaId rid;
+ int i;
+
+ for(i = 0; clean_vals[i]; i++){
+ cleanruv_data *data = NULL;
+
+ token = ldap_utf8strtok_r(clean_vals[i], ":", &iter);
+ if(token){
+ rid = atoi(token);
+ if(rid <= 0 || rid >= READ_ONLY_REPLICA_ID){
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: invalid replica id(%d) "
+ "aborting task.\n", rid);
+ goto done;
+ }
+ } else {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: unable to parse cleanallruv "
+ "data (%s), aborting task.\n",clean_vals[i]);
+ goto done;
+ }
+
+ repl_root = ldap_utf8strtok_r(iter, ":", &iter);
+ stop_ruv_cleaning();
+ maxcsn = replica_get_cleanruv_maxcsn(r, rid);
+ delete_cleaned_rid(r, rid, maxcsn);
+ csn_free(&maxcsn);
+
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: abort task found, "
+ "resuming abort of rid(%d).\n", rid);
+ /*
+ * Setup the data struct, and fire off the abort thread.
+ */
+ data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
+ if (data == NULL) {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to allocate cleanruv_data.\n");
+ } else {
+ ridstr = slapi_ch_smprintf("%d:%s", rid, repl_root);
+ payload = create_ruv_payload(ridstr);
+ slapi_ch_free_string(&ridstr);
+
+ if(payload == NULL){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to create extended "
+ "op payload\n");
+ } else {
+ /* setup the data */
+ data->repl_obj = NULL;
+ data->replica = NULL;
+ data->rid = rid;
+ data->task = NULL;
+ data->payload = payload;
+ data->repl_root = slapi_ch_strdup(repl_root);
+ data->sdn = slapi_sdn_dup(r->repl_root);
+
+ thread = PR_CreateThread(PR_USER_THREAD, replica_abort_task_thread,
+ (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
+ if (thread == NULL) {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: unable to create abort cleanAllRUV "
+ "thread for rid(%d)\n", (int)data->rid);
+ }
+ }
+ }
+ }
+ }
+
+done:
+ slapi_ch_array_free(clean_vals);
+}
+
/* This function updates the entry to contain information generated
during replica initialization.
Returns 0 if successful and -1 otherwise */
@@ -2782,26 +2968,25 @@ static const char *root_glue =
static int
replica_create_ruv_tombstone(Replica *r)
{
- int return_value = LDAP_LOCAL_ERROR;
- char *root_entry_str;
- Slapi_Entry *e = NULL;
+ int return_value = LDAP_LOCAL_ERROR;
+ char *root_entry_str;
+ Slapi_Entry *e = NULL;
const char *purl = NULL;
RUV *ruv;
struct berval **bvals = NULL;
Slapi_PBlock *pb = NULL;
int rc;
- PR_ASSERT(NULL != r && NULL != r->repl_root);
- root_entry_str = slapi_ch_smprintf(root_glue, slapi_sdn_get_ndn(r->repl_root),
- RUV_STORAGE_ENTRY_UNIQUEID);
+ PR_ASSERT(NULL != r && NULL != r->repl_root);
- e = slapi_str2entry(root_entry_str, SLAPI_STR2ENTRY_TOMBSTONE_CHECK);
+ root_entry_str = slapi_ch_smprintf(root_glue, slapi_sdn_get_ndn(r->repl_root), RUV_STORAGE_ENTRY_UNIQUEID);
+
+ e = slapi_str2entry(root_entry_str, SLAPI_STR2ENTRY_TOMBSTONE_CHECK);
if (e == NULL)
goto done;
/* Add ruv */
- if (r->repl_ruv == NULL)
- {
+ if (r->repl_ruv == NULL){
CSNGen *gen;
CSN *csn;
char csnstr [CSN_STRSIZE];
@@ -2810,42 +2995,34 @@ replica_create_ruv_tombstone(Replica *r)
gen = (CSNGen *)object_get_data(r->repl_csngen);
PR_ASSERT (gen);
- if (csngen_new_csn(gen, &csn, PR_FALSE /* notify */) == CSN_SUCCESS)
- {
- (void)csn_as_string(csn, PR_FALSE, csnstr);
- csn_free(&csn);
+ if (csngen_new_csn(gen, &csn, PR_FALSE /* notify */) == CSN_SUCCESS){
+ (void)csn_as_string(csn, PR_FALSE, csnstr);
+ csn_free(&csn);
- /* if this is an updateable replica - add its own
- element to the RUV so that referrals work correctly */
- if (r->repl_type == REPLICA_TYPE_UPDATABLE)
- purl = multimaster_get_local_purl();
+ /*
+ * if this is an updateable replica - add its own
+ * element to the RUV so that referrals work correctly
+ */
+ if (r->repl_type == REPLICA_TYPE_UPDATABLE)
+ purl = multimaster_get_local_purl();
- if (ruv_init_new(csnstr, r->repl_rid, purl, &ruv) == RUV_SUCCESS)
- {
- r->repl_ruv = object_new((void*)ruv, (FNFree)ruv_destroy);
- r->repl_ruv_dirty = PR_TRUE;
- return_value = LDAP_SUCCESS;
- }
- else
- {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "Cannot create new replica update vector for %s\n",
- slapi_sdn_get_dn(r->repl_root));
- ruv_destroy(&ruv);
+ if (ruv_init_new(csnstr, r->repl_rid, purl, &ruv) == RUV_SUCCESS){
+ r->repl_ruv = object_new((void*)ruv, (FNFree)ruv_destroy);
+ r->repl_ruv_dirty = PR_TRUE;
+ return_value = LDAP_SUCCESS;
+ } else {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Cannot create new replica update vector for %s\n",
+ slapi_sdn_get_dn(r->repl_root));
+ ruv_destroy(&ruv);
goto done;
- }
- }
- else
- {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "Cannot obtain CSN for new replica update vector for %s\n",
- slapi_sdn_get_dn(r->repl_root));
- csn_free(&csn);
+ }
+ } else {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Cannot obtain CSN for new replica update vector for %s\n",
+ slapi_sdn_get_dn(r->repl_root));
+ csn_free(&csn);
goto done;
- }
- }
- else /* failed to write the entry because DB was not initialized - retry */
- {
+ }
+ } else { /* failed to write the entry because DB was not initialized - retry */
ruv = (RUV*) object_get_data (r->repl_ruv);
PR_ASSERT (ruv);
}
@@ -2853,30 +3030,22 @@ replica_create_ruv_tombstone(Replica *r)
PR_ASSERT (r->repl_ruv);
rc = ruv_to_bervals(ruv, &bvals);
- if (rc != RUV_SUCCESS)
- {
+ if (rc != RUV_SUCCESS){
goto done;
}
/* ONREPL this is depricated function but there is currently no better API to use */
rc = slapi_entry_add_values(e, type_ruvElement, bvals);
- if (rc != 0)
- {
+ if (rc != 0){
goto done;
}
-
- pb = slapi_pblock_new();
- slapi_add_entry_internal_set_pb(
- pb,
- e,
- NULL /* controls */,
- repl_get_plugin_identity(PLUGIN_MULTIMASTER_REPLICATION),
- OP_FLAG_TOMBSTONE_ENTRY | OP_FLAG_REPLICATED | OP_FLAG_REPL_FIXUP |
- OP_FLAG_REPL_RUV);
- slapi_add_internal_pb(pb);
- e = NULL; /* add consumes e, upon success or failure */
- slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &return_value);
+ pb = slapi_pblock_new();
+ slapi_add_entry_internal_set_pb(pb, e, NULL /* controls */, repl_get_plugin_identity(PLUGIN_MULTIMASTER_REPLICATION),
+ OP_FLAG_TOMBSTONE_ENTRY | OP_FLAG_REPLICATED | OP_FLAG_REPL_FIXUP | OP_FLAG_REPL_RUV);
+ slapi_add_internal_pb(pb);
+ e = NULL; /* add consumes e, upon success or failure */
+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &return_value);
if (return_value == LDAP_SUCCESS)
r->repl_ruv_dirty = PR_FALSE;
@@ -2889,50 +3058,50 @@ done:
if (pb)
slapi_pblock_destroy(pb);
- slapi_ch_free((void **) &root_entry_str);
+ slapi_ch_free_string(&root_entry_str);
- return return_value;
+ return return_value;
}
static void
assign_csn_callback(const CSN *csn, void *data)
{
- Replica *r = (Replica *)data;
+ Replica *r = (Replica *)data;
Object *ruv_obj;
RUV *ruv;
- PR_ASSERT(NULL != csn);
- PR_ASSERT(NULL != r);
+ PR_ASSERT(NULL != csn);
+ PR_ASSERT(NULL != r);
ruv_obj = replica_get_ruv (r);
PR_ASSERT (ruv_obj);
ruv = (RUV*)object_get_data (ruv_obj);
PR_ASSERT (ruv);
- PR_Lock(r->repl_lock);
+ PR_Lock(r->repl_lock);
- r->repl_csn_assigned = PR_TRUE;
+ r->repl_csn_assigned = PR_TRUE;
- if (NULL != r->min_csn_pl)
- {
- if (csnplInsert(r->min_csn_pl, csn) != 0)
- {
- char csn_str[CSN_STRSIZE]; /* For logging only */
- /* Ack, we can't keep track of min csn. Punt. */
- if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) {
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "assign_csn_callback: "
- "failed to insert csn %s for replica %s\n",
- csn_as_string(csn, PR_FALSE, csn_str),
- slapi_sdn_get_dn(r->repl_root));
- }
- csnplFree(&r->min_csn_pl);
- }
- }
+ if (NULL != r->min_csn_pl)
+ {
+ if (csnplInsert(r->min_csn_pl, csn) != 0)
+ {
+ char csn_str[CSN_STRSIZE]; /* For logging only */
+ /* Ack, we can't keep track of min csn. Punt. */
+ if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "assign_csn_callback: "
+ "failed to insert csn %s for replica %s\n",
+ csn_as_string(csn, PR_FALSE, csn_str),
+ slapi_sdn_get_dn(r->repl_root));
+ }
+ csnplFree(&r->min_csn_pl);
+ }
+ }
ruv_add_csn_inprogress (ruv, csn);
- PR_Unlock(r->repl_lock);
+ PR_Unlock(r->repl_lock);
object_release (ruv_obj);
}
@@ -3167,19 +3336,41 @@ replica_set_tombstone_reap_interval (Replica *r, long interval)
PR_Unlock(r->repl_lock);
}
+static void
+replica_strip_cleaned_rids(Replica *r)
+{
+ Object *RUVObj;
+ RUV *ruv = NULL;
+ ReplicaId rid[32] = {0};
+ int i = 0;
+
+ RUVObj = replica_get_ruv(r);
+ ruv = (RUV*)object_get_data (RUVObj);
+
+ ruv_get_cleaned_rids(ruv, rid);
+ while(rid[i] != 0){
+ ruv_delete_replica(ruv, rid[i]);
+ replica_set_ruv_dirty(r);
+ replica_write_ruv(r);
+ i++;
+ }
+ object_release(RUVObj);
+}
+
/* Update the tombstone entry to reflect the content of the ruv */
static void
replica_replace_ruv_tombstone(Replica *r)
{
Slapi_PBlock *pb = NULL;
- char *dn;
- int rc;
-
Slapi_Mod smod;
Slapi_Mod smod_last_modified;
LDAPMod *mods [3];
+ char *dn;
+ int rc;
+
+ PR_ASSERT(NULL != r && NULL != r->repl_root);
- PR_ASSERT(NULL != r && NULL != r->repl_root);
+ replica_strip_cleaned_rids(r);
PR_Lock(r->repl_lock);
@@ -3188,14 +3379,14 @@ replica_replace_ruv_tombstone(Replica *r)
ruv_last_modified_to_smod ((RUV*)object_get_data(r->repl_ruv), &smod_last_modified);
dn = _replica_get_config_dn (r->repl_root);
- if (NULL == dn) {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "replica_replace_ruv_tombstone: "
- "failed to get the config dn for %s\n",
- slapi_sdn_get_dn (r->repl_root));
- PR_Unlock(r->repl_lock);
- goto bail;
- }
+ if (NULL == dn) {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ "replica_replace_ruv_tombstone: "
+ "failed to get the config dn for %s\n",
+ slapi_sdn_get_dn (r->repl_root));
+ PR_Unlock(r->repl_lock);
+ goto bail;
+ }
mods[0] = (LDAPMod*)slapi_mod_get_ldapmod_byref(&smod);
mods[1] = (LDAPMod*)slapi_mod_get_ldapmod_byref(&smod_last_modified);
@@ -3219,12 +3410,12 @@ replica_replace_ruv_tombstone(Replica *r)
if (rc != LDAP_SUCCESS)
{
- if ((rc != LDAP_NO_SUCH_OBJECT) || !replica_is_state_flag_set(r, REPLICA_IN_USE))
- {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_replace_ruv_tombstone: "
- "failed to update replication update vector for replica %s: LDAP "
- "error - %d\n", (char*)slapi_sdn_get_dn (r->repl_root), rc);
- }
+ if ((rc != LDAP_NO_SUCH_OBJECT) || !replica_is_state_flag_set(r, REPLICA_IN_USE))
+ {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_replace_ruv_tombstone: "
+ "failed to update replication update vector for replica %s: LDAP "
+ "error - %d\n", (char*)slapi_sdn_get_dn (r->repl_root), rc);
+ }
}
slapi_ch_free ((void**)&dn);
@@ -3240,14 +3431,18 @@ replica_update_ruv_consumer(Replica *r, RUV *supplier_ruv)
ReplicaId supplier_id = 0;
char *supplier_purl = NULL;
- if ( ruv_get_first_id_and_purl(supplier_ruv, &supplier_id, &supplier_purl) == RUV_SUCCESS )
+ if ( ruv_get_first_id_and_purl(supplier_ruv, &supplier_id, &supplier_purl) == RUV_SUCCESS)
{
RUV *local_ruv = NULL;
PR_Lock(r->repl_lock);
local_ruv = (RUV*)object_get_data (r->repl_ruv);
- PR_ASSERT (local_ruv);
+
+ if(is_cleaned_rid(supplier_id) || local_ruv == NULL){
+ PR_Unlock(r->repl_lock);
+ return;
+ }
if ( ruv_local_contains_supplier(local_ruv, supplier_id) == 0 )
{
@@ -3579,3 +3774,67 @@ replica_get_attr ( Slapi_PBlock *pb, const char* type, void *value )
return rc;
}
+
+void
+replica_add_cleanruv_data(Replica *r, char *val)
+{
+ int i;
+
+ PR_Lock(r->repl_lock);
+
+ for (i = 0; i < CLEANRIDSIZ && r->repl_cleanruv_data[i] != NULL; i++); /* goto the end of the list */
+ r->repl_cleanruv_data[i] = slapi_ch_strdup(val); /* append to list */
+ r->repl_cleanruv_data[i + 1] = NULL;
+
+ PR_Unlock(r->repl_lock);
+}
+
+void
+replica_remove_cleanruv_data(Replica *r, char *val)
+{
+ int i;
+
+ PR_Lock(r->repl_lock);
+
+ for(i = 0; i < CLEANRIDSIZ && r->repl_cleanruv_data[i] && strcmp(r->repl_cleanruv_data[i], val) != 0; i++);
+ if( i < CLEANRIDSIZ ){
+ slapi_ch_free_string(&r->repl_cleanruv_data[i]);
+ for(; i < CLEANRIDSIZ; i++){
+ /* rewrite entire array */
+ r->repl_cleanruv_data[i] = r->repl_cleanruv_data[i + 1];
+ }
+ }
+
+ PR_Unlock(r->repl_lock);
+}
+
+CSN *
+replica_get_cleanruv_maxcsn(Replica *r, ReplicaId rid)
+{
+ CSN *newcsn;
+ char *csnstr;
+ char *token;
+ char *iter;
+ int repl_rid = 0;
+ int i;
+
+ PR_Lock(r->repl_lock);
+
+ for(i = 0; i < CLEANRIDSIZ && r->repl_cleanruv_data[i]; i++){
+ token = ldap_utf8strtok_r(r->repl_cleanruv_data[i], ":", &iter);
+ if(token){
+ repl_rid = atoi(token);
+ }
+ csnstr = ldap_utf8strtok_r(iter, ":", &iter);
+ if(repl_rid == rid){
+ newcsn = csn_new();
+ csn_init_by_string(newcsn, csnstr);
+ PR_Unlock(r->repl_lock);
+ return newcsn;
+ }
+ }
+
+ PR_Unlock(r->repl_lock);
+
+ return NULL;
+}
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index 771af61..89651cf 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -2,15 +2,15 @@
* This Program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; version 2 of the License.
- *
+ *
* This Program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License along with
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
- *
+ *
* In addition, as a special exception, Red Hat, Inc. gives You the additional
* right to link the code of this Program with code not covered under the GNU
* General Public License ("Non-GPL Code") and to distribute linked combinations
@@ -28,9 +28,9 @@
* version of the file, but you are not obligated to do so. If you do not wish to
* provide this exception without modification, you must delete this exception
* statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
+ * exception.
+ *
+ *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
@@ -58,13 +58,17 @@
#define CLEANRUVLEN 8
#define CLEANALLRUV "CLEANALLRUV"
#define CLEANALLRUVLEN 11
-#define RELEASERUV "RELEASERUV"
-#define RELEASERUVLEN 10
#define REPLICA_RDN "cn=replica"
+#define CLEANALLRUV_ID "CleanAllRUV Task"
+#define ABORT_CLEANALLRUV_ID "Abort CleanAllRUV Task"
int slapi_log_urp = SLAPI_LOG_REPL;
-static ReplicaId cleaned_rid = 0;
-static int released_rid = 0;
+static ReplicaId cleaned_rids[CLEANRIDSIZ + 1] = {0};
+static ReplicaId aborted_rids[CLEANRIDSIZ + 1] = {0};
+static Slapi_RWLock *rid_lock = NULL;
+static Slapi_RWLock *abort_rid_lock = NULL;
+static PRLock *notify_lock = NULL;
+static PRCondVar *notify_cvar = NULL;
/* Forward Declartions */
static int replica_config_add (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg);
@@ -72,7 +76,7 @@ static int replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry*
static int replica_config_post_modify (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg);
static int replica_config_delete (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg);
static int replica_config_search (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg);
-
+static int replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, char *returntext, void *arg);
static int replica_config_change_type_and_id (Replica *r, const char *new_type, const char *new_id, char *returntext, int apply_mods);
static int replica_config_change_updatedn (Replica *r, const LDAPMod *mod, char *returntext, int apply_mods);
static int replica_config_change_flags (Replica *r, const char *new_flags, char *returntext, int apply_mods);
@@ -80,9 +84,18 @@ static int replica_execute_task (Object *r, const char *task_name, char *returnt
static int replica_execute_cl2ldif_task (Object *r, char *returntext);
static int replica_execute_ldif2cl_task (Object *r, char *returntext);
static int replica_execute_cleanruv_task (Object *r, ReplicaId rid, char *returntext);
-static int replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, char *returntext);
-static int replica_execute_release_ruv_task(Object *r, ReplicaId rid);
-static struct berval *create_ruv_payload(char *value);
+static int replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, char *returntext);
+static void replica_cleanallruv_thread(void *arg);
+static void replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task);
+static int check_agmts_are_alive(Replica *replica, ReplicaId rid, Slapi_Task *task);
+static int check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_Task *task);
+static int replica_cleanallruv_send_extop(Repl_Agmt *ra, ReplicaId rid, Slapi_Task *task, struct berval *payload, int check_result);
+static int replica_cleanallruv_send_abort_extop(Repl_Agmt *ra, Slapi_Task *task, struct berval *payload);
+static int replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn, Slapi_Task *task);
+static int replica_cleanallruv_replica_alive(Repl_Agmt *agmt);
+static int replica_cleanallruv_check_ruv(Repl_Agmt *ra, char *rid_text, Slapi_Task *task);
+static int get_cleanruv_task_count();
+static int get_abort_cleanruv_task_count();
static int replica_cleanup_task (Object *r, const char *task_name, char *returntext, int apply_mods);
static int replica_task_done(Replica *replica);
static multimaster_mtnode_extension * _replica_config_get_mtnode_ext (const Slapi_Entry *e);
@@ -105,29 +118,59 @@ int
replica_config_init()
{
s_configLock = PR_NewLock ();
+
if (s_configLock == NULL)
{
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_init: "
- "failed to cretate configuration lock; NSPR error - %d\n",
+ "failed to create configuration lock; NSPR error - %d\n",
PR_GetError ());
return -1;
}
+ rid_lock = slapi_new_rwlock();
+ if(rid_lock == NULL)
+ {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_init: "
+ "failed to create rid_lock; NSPR error - %d\n", PR_GetError ());
+ return -1;
+ }
+ abort_rid_lock = slapi_new_rwlock();
+ if(abort_rid_lock == NULL)
+ {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_init: "
+ "failed to create abort_rid_lock; NSPR error - %d\n", PR_GetError ());
+ return -1;
+ }
+ if ( ( notify_lock = PR_NewLock()) == NULL ) {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_init: "
+ "failed to create notify lock; NSPR error - %d\n", PR_GetError ());
+ return -1;
+ }
+ if ( ( notify_cvar = PR_NewCondVar( notify_lock )) == NULL ) {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_init: "
+ "failed to create notify cond var; NSPR error - %d\n", PR_GetError ());
+ return -1;
+ }
/* config DSE must be initialized before we get here */
slapi_config_register_callback(SLAPI_OPERATION_ADD, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
- CONFIG_FILTER, replica_config_add, NULL);
+ CONFIG_FILTER, replica_config_add, NULL);
slapi_config_register_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
CONFIG_FILTER, replica_config_modify,NULL);
slapi_config_register_callback(SLAPI_OPERATION_MODRDN, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
CONFIG_FILTER, dont_allow_that, NULL);
slapi_config_register_callback(SLAPI_OPERATION_DELETE, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
- CONFIG_FILTER, replica_config_delete,NULL);
+ CONFIG_FILTER, replica_config_delete,NULL);
slapi_config_register_callback(SLAPI_OPERATION_SEARCH, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
- CONFIG_FILTER, replica_config_search,NULL);
- slapi_config_register_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_POSTOP,
+ CONFIG_FILTER, replica_config_search,NULL);
+ slapi_config_register_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_POSTOP,
CONFIG_BASE, LDAP_SCOPE_SUBTREE,
CONFIG_FILTER, replica_config_post_modify,
NULL);
+
+ /* register the CLEANALLRUV & ABORT task */
+ slapi_task_register_handler("cleanallruv", replica_cleanall_ruv_task);
+ slapi_task_register_handler("abort cleanallruv", replica_cleanall_ruv_abort);
+
return 0;
}
@@ -142,7 +185,7 @@ replica_config_destroy ()
/* config DSE must be initialized before we get here */
slapi_config_remove_callback(SLAPI_OPERATION_ADD, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
- CONFIG_FILTER, replica_config_add);
+ CONFIG_FILTER, replica_config_add);
slapi_config_remove_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
CONFIG_FILTER, replica_config_modify);
slapi_config_remove_callback(SLAPI_OPERATION_MODRDN, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
@@ -151,26 +194,26 @@ replica_config_destroy ()
CONFIG_FILTER, replica_config_delete);
slapi_config_remove_callback(SLAPI_OPERATION_SEARCH, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
CONFIG_FILTER, replica_config_search);
- slapi_config_remove_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_PREOP,
+ slapi_config_remove_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_PREOP,
CONFIG_BASE, LDAP_SCOPE_SUBTREE,
CONFIG_FILTER, replica_config_post_modify);
}
-static int
-replica_config_add (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter,
+static int
+replica_config_add (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter,
int *returncode, char *errorbuf, void *arg)
{
Replica *r = NULL;
- multimaster_mtnode_extension *mtnode_ext;
+ multimaster_mtnode_extension *mtnode_ext;
char *replica_root = (char*)slapi_entry_attr_get_charptr (e, attr_replicaRoot);
char buf [SLAPI_DSE_RETURNTEXT_SIZE];
char *errortext = errorbuf ? errorbuf : buf;
-
+
if (errorbuf)
{
errorbuf[0] = '\0';
- }
-
+ }
+
*returncode = LDAP_SUCCESS;
PR_Lock (s_configLock);
@@ -185,16 +228,16 @@ replica_config_add (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter,
{
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "replica already configured for %s", replica_root);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_add: %s\n", errortext);
- *returncode = LDAP_UNWILLING_TO_PERFORM;
- goto done;
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ goto done;
}
/* create replica object */
r = replica_new_from_entry (e, errortext, PR_TRUE /* is a newly added entry */);
if (r == NULL)
{
- *returncode = LDAP_OPERATIONS_ERROR;
- goto done;
+ *returncode = LDAP_OPERATIONS_ERROR;
+ goto done;
}
/* Set the mapping tree node state, and the referrals from the RUV */
@@ -220,24 +263,24 @@ done:
if (*returncode != LDAP_SUCCESS)
{
- if (mtnode_ext->replica)
+ if (mtnode_ext->replica)
object_release (mtnode_ext->replica);
return SLAPI_DSE_CALLBACK_ERROR;
}
- else
+ else
return SLAPI_DSE_CALLBACK_OK;
}
-static int
-replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry* e,
+static int
+replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry* e,
int *returncode, char *returntext, void *arg)
{
int rc= 0;
LDAPMod **mods;
int i, apply_mods;
- multimaster_mtnode_extension *mtnode_ext;
+ multimaster_mtnode_extension *mtnode_ext;
Replica *r = NULL;
- char *replica_root = NULL;
+ char *replica_root = NULL;
char buf [SLAPI_DSE_RETURNTEXT_SIZE];
char *errortext = returntext ? returntext : buf;
char *config_attr, *config_attr_value;
@@ -252,7 +295,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
/* just let internal operations originated from replication plugin to go through */
slapi_pblock_get (pb, SLAPI_OPERATION, &op);
- slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
+ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
if (operation_is_flag_set(op, OP_FLAG_INTERNAL) &&
(identity == repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION)))
@@ -264,7 +307,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
replica_root = (char*)slapi_entry_attr_get_charptr (e, attr_replicaRoot);
PR_Lock (s_configLock);
-
+
mtnode_ext = _replica_config_get_mtnode_ext (e);
PR_ASSERT (mtnode_ext);
@@ -276,7 +319,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "replica does not exist for %s", replica_root);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
errortext);
- *returncode = LDAP_OPERATIONS_ERROR;
+ *returncode = LDAP_OPERATIONS_ERROR;
goto done;
}
@@ -287,7 +330,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
for (apply_mods = 0; apply_mods <= 1; apply_mods++)
{
/* we only allow the replica ID and type to be modified together e.g.
- if converting a read only replica to a master or vice versa -
+ if converting a read only replica to a master or vice versa -
we will need to change both the replica ID and the type at the same
time - we must disallow changing the replica ID if the type is not
being changed and vice versa
@@ -304,7 +347,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
break;
config_attr = (char *) mods[i]->mod_type;
- PR_ASSERT (config_attr);
+ PR_ASSERT (config_attr);
/* disallow modifications or removal of replica root,
replica name and replica state attributes */
@@ -313,14 +356,14 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
strcasecmp (config_attr, attr_state) == 0)
{
*returncode = LDAP_UNWILLING_TO_PERFORM;
- PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "modification of %s attribute is not allowed",
- config_attr);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
+ PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "modification of %s attribute is not allowed",
+ config_attr);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
errortext);
}
/* this is a request to delete an attribute */
- else if (mods[i]->mod_op & LDAP_MOD_DELETE || mods[i]->mod_bvalues == NULL
- || mods[i]->mod_bvalues[0]->bv_val == NULL)
+ else if ((mods[i]->mod_op & LDAP_MOD_DELETE) || mods[i]->mod_bvalues == NULL
+ || mods[i]->mod_bvalues[0]->bv_val == NULL)
{
/* currently, you can only remove referral,
legacy consumer or bind dn attribute */
@@ -345,10 +388,9 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
else
{
*returncode = LDAP_UNWILLING_TO_PERFORM;
- PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "deletion of %s attribute is not allowed", config_attr);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
- errortext);
- }
+ PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "deletion of %s attribute is not allowed", config_attr);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
+ }
}
else /* modify an attribute */
{
@@ -356,8 +398,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
if (strcasecmp (config_attr, attr_replicaBindDn) == 0)
{
- *returncode = replica_config_change_updatedn (r, mods[i],
- errortext, apply_mods);
+ *returncode = replica_config_change_updatedn (r, mods[i], errortext, apply_mods);
}
else if (strcasecmp (config_attr, attr_replicaType) == 0)
{
@@ -367,16 +408,14 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
{
new_repl_id = slapi_ch_strdup(config_attr_value);
}
- else if (strcasecmp (config_attr, attr_flags) == 0)
+ else if (strcasecmp (config_attr, attr_flags) == 0)
{
- *returncode = replica_config_change_flags (r, config_attr_value,
- errortext, apply_mods);
+ *returncode = replica_config_change_flags (r, config_attr_value, errortext, apply_mods);
}
- else if (strcasecmp (config_attr, TASK_ATTR) == 0)
+ else if (strcasecmp (config_attr, TASK_ATTR) == 0)
{
- *returncode = replica_execute_task (mtnode_ext->replica, config_attr_value,
- errortext, apply_mods);
- }
+ *returncode = replica_execute_task (mtnode_ext->replica, config_attr_value, errortext, apply_mods);
+ }
else if (strcasecmp (config_attr, attr_replicaReferral) == 0)
{
if (apply_mods)
@@ -391,14 +430,14 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
if (!replica_is_legacy_consumer (r)) {
consumer5_set_mapping_tree_state_for_replica(r, NULL);
}
- }
+ }
}
else if (strcasecmp (config_attr, type_replicaPurgeDelay) == 0)
{
- if (apply_mods && config_attr_value && config_attr_value[0])
+ if (apply_mods && config_attr_value && config_attr_value[0])
{
PRUint32 delay;
- if (isdigit (config_attr_value[0]))
+ if (isdigit (config_attr_value[0]))
{
delay = (unsigned int)atoi(config_attr_value);
replica_set_purge_delay(r, delay);
@@ -409,7 +448,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
}
else if (strcasecmp (config_attr, type_replicaTombstonePurgeInterval) == 0)
{
- if (apply_mods && config_attr_value && config_attr_value[0])
+ if (apply_mods && config_attr_value && config_attr_value[0])
{
long interval;
interval = atol (config_attr_value);
@@ -439,17 +478,14 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
"modification of attribute %s is not allowed in replica entry", config_attr);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
- errortext);
- }
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
+ }
}
}
if (new_repl_id || new_repl_type)
{
- *returncode = replica_config_change_type_and_id(r, new_repl_type,
- new_repl_id, errortext,
- apply_mods);
+ *returncode = replica_config_change_type_and_id(r, new_repl_type, new_repl_id, errortext, apply_mods);
slapi_ch_free_string(&new_repl_id);
slapi_ch_free_string(&new_repl_type);
}
@@ -458,9 +494,9 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
done:
if (mtnode_ext->replica)
object_release (mtnode_ext->replica);
-
+
/* slapi_ch_free accepts NULL pointer */
- slapi_ch_free ((void**)&replica_root);
+ slapi_ch_free_string(&replica_root);
PR_Unlock (s_configLock);
@@ -474,9 +510,9 @@ done:
}
}
-static int
+static int
replica_config_post_modify(Slapi_PBlock *pb,
- Slapi_Entry* entryBefore,
+ Slapi_Entry* entryBefore,
Slapi_Entry* e,
int *returncode,
char *returntext,
@@ -485,9 +521,9 @@ replica_config_post_modify(Slapi_PBlock *pb,
int rc= 0;
LDAPMod **mods;
int i, apply_mods;
- multimaster_mtnode_extension *mtnode_ext;
+ multimaster_mtnode_extension *mtnode_ext;
Replica *r = NULL;
- char *replica_root = NULL;
+ char *replica_root = NULL;
char buf [SLAPI_DSE_RETURNTEXT_SIZE];
char *errortext = returntext ? returntext : buf;
char *config_attr, *config_attr_value;
@@ -503,7 +539,7 @@ replica_config_post_modify(Slapi_PBlock *pb,
/* just let internal operations originated from replication plugin to go through */
slapi_pblock_get (pb, SLAPI_OPERATION, &op);
- slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
+ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
if (operation_is_flag_set(op, OP_FLAG_INTERNAL) &&
(identity == repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION)))
@@ -515,7 +551,7 @@ replica_config_post_modify(Slapi_PBlock *pb,
replica_root = (char*)slapi_entry_attr_get_charptr (e, attr_replicaRoot);
PR_Lock (s_configLock);
-
+
mtnode_ext = _replica_config_get_mtnode_ext (e);
PR_ASSERT (mtnode_ext);
@@ -529,7 +565,7 @@ replica_config_post_modify(Slapi_PBlock *pb,
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_config_post_modify: %s\n",
errortext);
- *returncode = LDAP_OPERATIONS_ERROR;
+ *returncode = LDAP_OPERATIONS_ERROR;
goto done;
}
@@ -540,7 +576,7 @@ replica_config_post_modify(Slapi_PBlock *pb,
for (apply_mods = 0; apply_mods <= 1; apply_mods++)
{
/* we only allow the replica ID and type to be modified together e.g.
- if converting a read only replica to a master or vice versa -
+ if converting a read only replica to a master or vice versa -
we will need to change both the replica ID and the type at the same
time - we must disallow changing the replica ID if the type is not
being changed and vice versa
@@ -554,7 +590,7 @@ replica_config_post_modify(Slapi_PBlock *pb,
break;
config_attr = (char *) mods[i]->mod_type;
- PR_ASSERT (config_attr);
+ PR_ASSERT (config_attr);
/* disallow modifications or removal of replica root,
replica name and replica state attributes */
@@ -564,16 +600,16 @@ replica_config_post_modify(Slapi_PBlock *pb,
{
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
- "modification of %s attribute is not allowed",
- config_attr);
+ "modification of %s attribute is not allowed",
+ config_attr);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "replica_config_post_modify: %s\n",
+ "replica_config_post_modify: %s\n",
errortext);
}
/* this is a request to delete an attribute */
- else if (mods[i]->mod_op & LDAP_MOD_DELETE ||
+ else if ((mods[i]->mod_op & LDAP_MOD_DELETE) ||
mods[i]->mod_bvalues == NULL ||
- mods[i]->mod_bvalues[0]->bv_val == NULL)
+ mods[i]->mod_bvalues[0]->bv_val == NULL)
{
;
}
@@ -581,7 +617,7 @@ replica_config_post_modify(Slapi_PBlock *pb,
{
config_attr_value = (char *) mods[i]->mod_bvalues[0]->bv_val;
- if (strcasecmp (config_attr, TASK_ATTR) == 0)
+ if (strcasecmp (config_attr, TASK_ATTR) == 0)
{
flag_need_cleanup = 1;
}
@@ -605,7 +641,7 @@ done:
if (mtnode_ext->replica)
object_release (mtnode_ext->replica);
-
+
if (*returncode != LDAP_SUCCESS)
{
return SLAPI_DSE_CALLBACK_ERROR;
@@ -616,8 +652,8 @@ done:
}
}
-static int
-replica_config_delete (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter,
+static int
+replica_config_delete (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter,
int *returncode, char *returntext, void *arg)
{
multimaster_mtnode_extension *mtnode_ext;
@@ -650,26 +686,26 @@ replica_config_delete (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter
return SLAPI_DSE_CALLBACK_OK;
}
-static int
-replica_config_search (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter, int *returncode,
+static int
+replica_config_search (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter, int *returncode,
char *returntext, void *arg)
{
- multimaster_mtnode_extension *mtnode_ext;
+ multimaster_mtnode_extension *mtnode_ext;
int changeCount = 0;
PRBool reapActive = PR_FALSE;
char val [64];
/* add attribute that contains number of entries in the changelog for this replica */
-
+
PR_Lock (s_configLock);
-
+
mtnode_ext = _replica_config_get_mtnode_ext (e);
PR_ASSERT (mtnode_ext);
-
+
if (mtnode_ext->replica) {
Replica *replica;
object_acquire (mtnode_ext->replica);
- if (cl5GetState () == CL5_STATE_OPEN) {
+ if (cl5GetState () == CL5_STATE_OPEN) {
changeCount = cl5GetOperationCount (mtnode_ext->replica);
}
replica = (Replica*)object_get_data (mtnode_ext->replica);
@@ -688,9 +724,9 @@ replica_config_search (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter
return SLAPI_DSE_CALLBACK_OK;
}
-static int
+static int
replica_config_change_type_and_id (Replica *r, const char *new_type,
- const char *new_id, char *returntext,
+ const char *new_id, char *returntext,
int apply_mods)
{
int type;
@@ -770,8 +806,8 @@ replica_config_change_type_and_id (Replica *r, const char *new_type,
return LDAP_SUCCESS;
}
-static int
-replica_config_change_updatedn (Replica *r, const LDAPMod *mod, char *returntext,
+static int
+replica_config_change_updatedn (Replica *r, const LDAPMod *mod, char *returntext,
int apply_mods)
{
PR_ASSERT (r);
@@ -790,7 +826,7 @@ replica_config_change_updatedn (Replica *r, const LDAPMod *mod, char *returntext
return LDAP_SUCCESS;
}
-static int replica_config_change_flags (Replica *r, const char *new_flags,
+static int replica_config_change_flags (Replica *r, const char *new_flags,
char *returntext, int apply_mods)
{
PR_ASSERT (r);
@@ -807,10 +843,10 @@ static int replica_config_change_flags (Replica *r, const char *new_flags,
return LDAP_SUCCESS;
}
-static int replica_execute_task (Object *r, const char *task_name, char *returntext,
+static int replica_execute_task (Object *r, const char *task_name, char *returntext,
int apply_mods)
{
-
+
if (strcasecmp (task_name, CL2LDIF_TASK) == 0)
{
if (apply_mods)
@@ -848,13 +884,14 @@ static int replica_execute_task (Object *r, const char *task_name, char *returnt
{
int temprid = atoi(&(task_name[CLEANALLRUVLEN]));
if (temprid <= 0 || temprid >= READ_ONLY_REPLICA_ID){
- PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Invalid replica id (%d) for task - (%s)", temprid, task_name);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_execute_task: %s\n", returntext);
- return LDAP_OPERATIONS_ERROR;
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Invalid replica id (%d) for task - (%s)", temprid, task_name);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_execute_task: %s\n", returntext);
+ return LDAP_OPERATIONS_ERROR;
}
if (apply_mods)
{
- return replica_execute_cleanall_ruv_task(r, (ReplicaId)temprid, returntext);
+ Slapi_Task *empty_task = NULL;
+ return replica_execute_cleanall_ruv_task(r, (ReplicaId)temprid, empty_task, returntext);
}
else
return LDAP_SUCCESS;
@@ -862,22 +899,22 @@ static int replica_execute_task (Object *r, const char *task_name, char *returnt
else
{
PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "unsupported replica task - %s", task_name);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "replica_execute_task: %s\n", returntext);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ "replica_execute_task: %s\n", returntext);
return LDAP_OPERATIONS_ERROR;
}
-
+
}
-static int
-replica_cleanup_task (Object *r, const char *task_name, char *returntext,
+static int
+replica_cleanup_task (Object *r, const char *task_name, char *returntext,
int apply_mods)
{
int rc = LDAP_SUCCESS;
if (apply_mods) {
Replica *replica = (Replica*)object_get_data (r);
if (NULL == replica) {
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
} else {
rc = replica_task_done(replica);
}
@@ -913,19 +950,19 @@ replica_task_done(Replica *replica)
mod.mod_type = (char *)TASK_ATTR;
mod.mod_bvalues = NULL;
- slapi_modify_internal_set_pb_ext(pb, replica_sdn, mods, NULL/* controls */,
- NULL/* uniqueid */,
+ slapi_modify_internal_set_pb_ext(pb, replica_sdn, mods, NULL/* controls */,
+ NULL/* uniqueid */,
repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION),
0/* flags */);
slapi_modify_internal_pb (pb);
slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
if ((rc != LDAP_SUCCESS) && (rc != LDAP_NO_SUCH_ATTRIBUTE)) {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_task_done: "
"failed to remove (%s) attribute from (%s) entry; "
"LDAP error - %d\n",
- TASK_ATTR, replica_dn, rc);
+ TASK_ATTR, replica_dn, rc);
}
slapi_pblock_destroy (pb);
@@ -945,9 +982,9 @@ static int replica_execute_cl2ldif_task (Object *r, char *returntext)
if (cl5GetState () != CL5_STATE_OPEN)
{
PR_snprintf (returntext, SLAPI_DSE_RETURNTEXT_SIZE, "changelog is not open");
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "replica_execute_cl2ldif_task: %s\n", returntext);
- rc = LDAP_OPERATIONS_ERROR;
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ "replica_execute_cl2ldif_task: %s\n", returntext);
+ rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
@@ -958,25 +995,25 @@ static int replica_execute_cl2ldif_task (Object *r, char *returntext)
<replica name>.ldif */
clDir = cl5GetDir ();
if (NULL == clDir) {
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
replica = (Replica*)object_get_data (r);
if (NULL == replica) {
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
PR_snprintf (fName, MAXPATHLEN, "%s/%s.ldif", clDir, replica_get_name (replica));
slapi_ch_free_string (&clDir);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"Beginning changelog export of replica \"%s\"\n",
replica_get_name(replica));
rc = cl5ExportLDIF (fName, rlist);
if (rc == CL5_SUCCESS) {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"Finished changelog export of replica \"%s\"\n",
replica_get_name(replica));
rc = LDAP_SUCCESS;
@@ -984,9 +1021,9 @@ static int replica_execute_cl2ldif_task (Object *r, char *returntext)
PR_snprintf (returntext, SLAPI_DSE_RETURNTEXT_SIZE,
"Failed changelog export replica %s; "
"changelog error - %d", replica_get_name(replica), rc);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_execute_cl2ldif_task: %s\n", returntext);
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
}
bail:
return rc;
@@ -1004,8 +1041,8 @@ static int replica_execute_ldif2cl_task (Object *r, char *returntext)
if (cl5GetState () != CL5_STATE_OPEN)
{
PR_snprintf (returntext, SLAPI_DSE_RETURNTEXT_SIZE, "changelog is not open");
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "replica_execute_ldif2cl_task: %s\n", returntext);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ "replica_execute_ldif2cl_task: %s\n", returntext);
rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
@@ -1017,13 +1054,13 @@ static int replica_execute_ldif2cl_task (Object *r, char *returntext)
<replica name>.ldif */
clDir = cl5GetDir ();
if (NULL == clDir) {
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
replica = (Replica*)object_get_data (r);
if (NULL == replica) {
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
@@ -1035,19 +1072,19 @@ static int replica_execute_ldif2cl_task (Object *r, char *returntext)
PR_snprintf (returntext, SLAPI_DSE_RETURNTEXT_SIZE,
"failed to close changelog to import changelog data; "
"changelog error - %d", rc);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_execute_ldif2cl_task: %s\n", returntext);
rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"Beginning changelog import of replica \"%s\"\n",
replica_get_name(replica));
imprc = cl5ImportLDIF (clDir, fName, rlist);
slapi_ch_free_string (&clDir);
if (CL5_SUCCESS == imprc)
{
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"Finished changelog import of replica \"%s\"\n",
replica_get_name(replica));
}
@@ -1056,7 +1093,7 @@ static int replica_execute_ldif2cl_task (Object *r, char *returntext)
PR_snprintf (returntext, SLAPI_DSE_RETURNTEXT_SIZE,
"Failed changelog import replica %s; "
"changelog error - %d", replica_get_name(replica), rc);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_execute_ldif2cl_task: %s\n", returntext);
imprc = LDAP_OPERATIONS_ERROR;
}
@@ -1069,10 +1106,10 @@ static int replica_execute_ldif2cl_task (Object *r, char *returntext)
}
else
{
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_execute_ldif2cl_task: failed to start changelog at %s\n",
config.dir?config.dir:"null config dir");
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
}
bail:
changelog5_config_done(&config);
@@ -1080,7 +1117,7 @@ bail:
return imprc?imprc:rc;
}
-static multimaster_mtnode_extension *
+static multimaster_mtnode_extension *
_replica_config_get_mtnode_ext (const Slapi_Entry *e)
{
const char *replica_root;
@@ -1095,7 +1132,7 @@ _replica_config_get_mtnode_ext (const Slapi_Entry *e)
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_add: "
"configuration entry %s missing %s attribute\n",
slapi_entry_get_dn((Slapi_Entry *)e),
- attr_replicaRoot);
+ attr_replicaRoot);
return NULL;
}
@@ -1107,14 +1144,14 @@ _replica_config_get_mtnode_ext (const Slapi_Entry *e)
{
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_add: "
"failed to locate mapping tree node for dn %s\n",
- slapi_sdn_get_dn(sdn));
+ slapi_sdn_get_dn(sdn));
}
else
{
/* check if replica object already exists for the specified subtree */
- ext = (multimaster_mtnode_extension *)repl_con_get_ext (REPL_CON_EXT_MTNODE, mtnode);
+ ext = (multimaster_mtnode_extension *)repl_con_get_ext (REPL_CON_EXT_MTNODE, mtnode);
}
-
+
slapi_sdn_free (&sdn);
return ext;
@@ -1123,26 +1160,24 @@ _replica_config_get_mtnode_ext (const Slapi_Entry *e)
int
replica_execute_cleanruv_task_ext(Object *r, ReplicaId rid)
{
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "cleanruv_extop: calling clean_ruv_ext\n");
- return replica_execute_cleanruv_task(r, rid, NULL);
+ return replica_execute_cleanruv_task(r, rid, NULL);
}
static int
replica_execute_cleanruv_task (Object *r, ReplicaId rid, char *returntext /* not used */)
{
- int rc = 0;
Object *RUVObj;
RUV *local_ruv = NULL;
Replica *replica = (Replica*)object_get_data (r);
-
+ int rc = 0;
PR_ASSERT (replica);
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "cleanruv_task: cleaning rid (%d)...\n",(int)rid);
RUVObj = replica_get_ruv(replica);
PR_ASSERT(RUVObj);
local_ruv = (RUV*)object_get_data (RUVObj);
- /* Need to check that :
- * - rid is not the local one
+ /* Need to check that :
+ * - rid is not the local one
* - rid is not the last one
*/
if ((replica_get_rid(replica) == rid) ||
@@ -1156,12 +1191,11 @@ replica_execute_cleanruv_task (Object *r, ReplicaId rid, char *returntext /* not
/* Update Mapping Tree to reflect RUV changes */
consumer5_set_mapping_tree_state_for_replica(replica, NULL);
-
+
/*
- * Clean the changelog RUV's, and set the rids
+ * Clean the changelog RUV's
*/
cl5CleanRUV(rid);
- delete_released_rid();
if (rc != RUV_SUCCESS){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanruv_task: task failed(%d)\n",rc);
@@ -1171,506 +1205,1566 @@ replica_execute_cleanruv_task (Object *r, ReplicaId rid, char *returntext /* not
return LDAP_SUCCESS;
}
-static int
-replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, char *returntext)
+const char *
+fetch_attr(Slapi_Entry *e, const char *attrname, const char *default_val)
{
- PRThread *thread = NULL;
- Repl_Connection *conn;
- Replica *replica;
- Object *agmt_obj;
- Repl_Agmt *agmt;
- ConnResult crc;
- cleanruv_data *data = NULL;
- const Slapi_DN *dn = NULL;
- struct berval *payload = NULL;
- char *ridstr = NULL;
- int send_msgid = 0;
- int agmt_count = 0;
- int rc = 0;
+ Slapi_Attr *attr;
+ Slapi_Value *val = NULL;
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: cleaning rid (%d)...\n",(int)rid);
+ if (slapi_entry_attr_find(e, attrname, &attr) != 0)
+ return default_val;
- /*
- * Grab the replica
- */
- if(r){
- replica = (Replica*)object_get_data (r);
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica is NULL, aborting task\n");
- return -1;
- }
- /*
- * Create payload
- */
- ridstr = slapi_ch_smprintf("%d:%s", rid, slapi_sdn_get_dn(replica_get_root(replica)));
- payload = create_ruv_payload(ridstr);
- if(payload == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to create ext op payload, aborting task\n");
- slapi_ch_free_string(&ridstr);
- return -1;
- }
+ slapi_attr_first_value(attr, &val);
+ return slapi_value_get_string(val);
+}
+static int
+replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
+ int *returncode, char *returntext, void *arg)
+{
+ Slapi_Task *task = NULL;
+ const Slapi_DN *task_dn;
+ Slapi_DN *dn = NULL;
+ Object *r;
+ const char *base_dn;
+ const char *rid_str;
+ ReplicaId rid;
+ int rc = SLAPI_DSE_CALLBACK_OK;
+
+ /* allocate new task now */
+ task = slapi_new_task(slapi_entry_get_ndn(e));
+ if(task == NULL){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Failed to create new task\n");
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
- set_cleaned_rid(rid);
+ /*
+ * Get our task settings
+ */
+ if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
+ *returncode = LDAP_OBJECT_CLASS_VIOLATION;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ if ((rid_str = fetch_attr(e, "replica-id", 0)) == NULL){
+ *returncode = LDAP_OBJECT_CLASS_VIOLATION;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
- agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
- while (agmt_obj)
- {
- agmt = (Repl_Agmt*)object_get_data (agmt_obj);
- if(!agmt_is_enabled(agmt)){
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- continue;
- }
- dn = agmt_get_dn_byref(agmt);
- conn = (Repl_Connection *)agmt_get_connection(agmt);
- if(conn == NULL){
- /* no connection for this agreement, and move on */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: the replica (%s), is "
- "missing the connection. This replica will not be cleaned.\n", slapi_sdn_get_dn(dn));
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- continue;
- }
- crc = conn_connect(conn);
- if (CONN_OPERATION_FAILED == crc ){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to connect "
- "to repl agreement connection (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_TRANSIENT_ERROR);
- } else if (CONN_SSL_NOT_ENABLED == crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to acquire "
- "repl agmt connection (%s), errror %d\n",slapi_sdn_get_dn(dn), ACQUIRE_FATAL_ERROR);
- } else {
- conn_cancel_linger(conn);
- crc = conn_send_extended_operation(conn, REPL_CLEANRUV_OID, payload, NULL, &send_msgid);
- if (CONN_OPERATION_SUCCESS != crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to send "
- "cleanruv extended op to repl agmt (%s), error %d\n", slapi_sdn_get_dn(dn), crc);
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: successfully sent "
- "cleanruv extended op to (%s)\n",slapi_sdn_get_dn(dn));
- agmt_count++;
- }
- conn_start_linger(conn);
- }
- if(crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica (%s) has not "
- "been cleaned. You will need to rerun the CLEANALLRUV task on this replica.\n", slapi_sdn_get_dn(dn));
- rc = crc;
- }
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- }
+ task_dn = slapi_entry_get_sdn(e);
+ /*
+ * Check the rid
+ */
+ rid = atoi(rid_str);
+ if (rid <= 0 || rid >= READ_ONLY_REPLICA_ID){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Invalid replica id (%d) for task - (%s)",
+ rid, slapi_sdn_get_dn(task_dn));
+ cleanruv_log(task, CLEANALLRUV_ID, "%s", returntext);
+ rc = LDAP_OPERATIONS_ERROR;
+ goto out;
+ }
+ /*
+ * Get the replica object
+ */
+ dn = slapi_sdn_new_dn_byval(base_dn);
+ if((r = replica_get_replica_from_dn(dn)) == NULL){
+ *returncode = LDAP_OPERATIONS_ERROR ;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
- /*
- * We're done with the payload, free it.
- */
- if(payload){
- ber_bvfree(payload);
- }
- slapi_ch_free_string(&ridstr);
+ /* clean the RUV's */
+ rc = replica_execute_cleanall_ruv_task (r, rid, task, returntext);
- /*
- * Now run the cleanruv task
- */
- replica_execute_cleanruv_task (r, rid, returntext);
-
- if(rc == 0 && agmt_count > 0){ /* success, but we need to check our replicas */
- /*
- * Launch the cleanruv monitoring thread. Once all the replicas are cleaned it will release the rid
- */
- data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
- if (data == NULL) {
- slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to allocate "
- "cleanruv_data. Aborting task.\n");
- return -1;
- }
- data->repl_obj = r;
- data->rid = rid;
-
- thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_monitor_thread,
- (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
- PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
- if (thread == NULL) {
- slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: unable to create cleanAllRUV "
- "monitoring thread. Aborting task.\n");
- }
- } else if(rc == 0){ /* success */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Successfully Finished.\n");
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Task failed (%d)\n",rc);
- }
+out:
+ if(rc){
+ cleanruv_log(task, CLEANALLRUV_ID, "Task failed...(%d)", rc);
+ *returncode = rc;
+ slapi_task_finish(task, *returncode);
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ } else {
+ rc = SLAPI_DSE_CALLBACK_OK;
+ }
+ slapi_sdn_free(&dn);
- return rc;
+ return rc;
}
/*
- * After all the cleanAllRUV extended ops have been sent, we need to monitoring those replicas'
- * RUVs. Once the rid is cleaned, then we need to release it, and push this "release"
- * to the other replicas
+ * CLEANALLRUV task
+ *
+ * [1] Get the maxcsn from the RUV of the rid we want to clean
+ * [2] Create the payload for the "cleanallruv" extended ops
+ * [3] Create "monitor" thread to do the real work.
+ *
*/
-void
-replica_cleanallruv_monitor_thread(void *arg)
+static int
+replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, char *returntext)
{
- Object *agmt_obj;
- LDAP *ld;
- Repl_Connection *conn;
- Repl_Agmt *agmt;
- Replica *replica;;
- cleanruv_data *data = arg;
- LDAPMessage *result, *entry;
- BerElement *ber;
- time_t start_time;
- struct berval **vals;
- char *rid_text;
- char *attrs[2];
- char *attr;
- int replicas_cleaned = 0;
- int found = 0;
- int crc;
- int rc = 0;
- int i;
+ PRThread *thread = NULL;
+ Slapi_Task *pre_task = NULL; /* this is supposed to be null for logging */
+ Replica *replica;
+ Object *ruv_obj;
+ cleanruv_data *data = NULL;
+ CSN *maxcsn = NULL;
+ const RUV *ruv;
+ struct berval *payload = NULL;
+ char *ridstr = NULL;
+ char csnstr[CSN_STRSIZE];
+ int rc = 0;
+
+ if(get_cleanruv_task_count() >= CLEANRIDSIZ){
+ /* we are already running the maximum number of tasks */
+ cleanruv_log(pre_task, CLEANALLRUV_ID,
+ "Exceeded maximum number of active CLEANALLRUV tasks(%d)",CLEANRIDSIZ);
+ returntext = PR_smprintf("Exceeded maximum number of active CLEANALLRUV tasks(%d), "
+ "you must wait for one to finish.", CLEANRIDSIZ);
+ return LDAP_UNWILLING_TO_PERFORM;
+ }
- /*
- * Initialize our settings
- */
- attrs[0] = "nsds50ruv";
- attrs[1] = NULL;
- rid_text = slapi_ch_smprintf("{replica %d ldap", data->rid);
- replica = (Replica*)object_get_data (data->repl_obj);
- start_time = current_time();
+ /*
+ * Grab the replica
+ */
+ if(r){
+ replica = (Replica*)object_get_data (r);
+ } else {
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Replica is NULL, aborting task");
+ rc = -1;
+ goto fail;
+ }
+ /*
+ * Check if this is a consumer
+ */
+ if(replica_get_type(replica) == REPLICA_TYPE_READONLY){
+ /* this is a consumer, send error */
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Failed to clean rid (%d), task can not be run on a consumer",rid);
+ if(task){
+ rc = -1;
+ slapi_task_finish(task, rc);
+ }
+ return -1;
+ }
+ /*
+ * Grab the max csn of the deleted replica
+ */
+ ruv_obj = replica_get_ruv(replica);
+ ruv = object_get_data (ruv_obj);
+ if(ruv_get_rid_max_csn(ruv, &maxcsn, rid) == RUV_BAD_DATA){
+ /* no maxcsn, can not proceed */
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Could not find maxcsn for rid (%d)", rid);
+ rc = -1;
+ object_release(ruv_obj);
+ goto fail;
+ } else {
+ object_release(ruv_obj);
+ if(maxcsn == NULL || csn_get_replicaid(maxcsn) == 0){
+ /*
+ * This is for consistency with extop csn creation, where
+ * we want the csn string to be "0000000000000000000" not ""
+ */
+ csn_free(&maxcsn);
+ maxcsn = csn_new();
+ csn_init_by_string(maxcsn, "");
+ }
+ csn_as_string(maxcsn, PR_FALSE, csnstr);
+ }
+ /*
+ * Create payload
+ */
+ ridstr = slapi_ch_smprintf("%d:%s:%s", rid, slapi_sdn_get_dn(replica_get_root(replica)), csnstr);
+ payload = create_ruv_payload(ridstr);
+ slapi_ch_free_string(&ridstr);
+
+ if(payload == NULL){
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Failed to create extended op payload, aborting task");
+ rc = -1;
+ goto fail;
+ }
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Waiting for all the replicas to get cleaned...\n");
+ /*
+ * Launch the cleanallruv thread. Once all the replicas are cleaned it will release the rid
+ */
+ data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
+ if (data == NULL) {
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Failed to allocate cleanruv_data. Aborting task.");
+ rc = -1;
+ goto fail;
+ }
+ data->repl_obj = r;
+ data->replica = replica;
+ data->rid = rid;
+ data->task = task;
+ data->maxcsn = maxcsn;
+ data->payload = payload;
+ data->sdn = NULL;
+
+ thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_thread,
+ (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
+ if (thread == NULL) {
+ rc = -1;
+ goto fail;
+ } else {
+ goto done;
+ }
- while(!slapi_is_shutting_down())
- {
- DS_Sleep(PR_SecondsToInterval(10));
- found = 0;
- agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
- while (agmt_obj){
- agmt = (Repl_Agmt*)object_get_data (agmt_obj);
- if(!agmt_is_enabled(agmt)){
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- continue;
- }
- /*
- * Get the replication connection
- */
- conn = (Repl_Connection *)agmt_get_connection(agmt);
- crc = conn_connect(conn);
- if (CONN_OPERATION_FAILED == crc ){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: monitor thread failed to connect "
- "to repl agreement connection (%s), error %d\n","", ACQUIRE_TRANSIENT_ERROR);
- continue;
- } else if (CONN_SSL_NOT_ENABLED == crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: monitor thread failed to acquire "
- "repl agmt connection (%s), error %d\n","", ACQUIRE_FATAL_ERROR);
- continue;
- }
- /*
- * Get the LDAP connection handle from the conn
- */
- ld = conn_get_ldap(conn);
- if(ld == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: monitor thread failed to get LDAP "
- "handle from the replication agmt (%s). Moving on to the next agmt.\n",agmt_get_long_name(agmt));
- continue;
- }
- /*
- * Search this replica for its tombstone/ruv entry
- */
- conn_cancel_linger(conn);
- conn_lock(conn);
- rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(agmt_get_replarea(agmt)), LDAP_SCOPE_SUBTREE,
- "(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))",
- attrs, 0, NULL, NULL, NULL, 0, &result);
- if(rc != LDAP_SUCCESS){
- /*
- * Couldn't contact ldap server, what should we do?
- *
- * Skip it and move on! It's the admin's job to make sure all the replicas are up and running
- */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: monitor thread failed to contact "
- "agmt (%s), moving on to the next agmt.\n", agmt_get_long_name(agmt));
- conn_unlock(conn);
- conn_start_linger(conn);
- continue;
- }
- /*
- * There is only one entry. Check its "nsds50ruv" for our cleaned rid
- */
- entry = ldap_first_entry( ld, result );
- if ( entry != NULL ) {
- for ( attr = ldap_first_attribute( ld, entry, &ber ); attr != NULL; attr = ldap_next_attribute( ld, entry, ber ) ){
- /* make sure the attribute is nsds50ruv */
- if(strcasecmp(attr,"nsds50ruv") != 0){
- continue;
- }
- if ((vals = ldap_get_values_len( ld, entry, attr)) != NULL ) {
- for ( i = 0; vals[i] && vals[i]->bv_val; i++ ) {
- /* look for this replica */
- if(strstr(rid_text, vals[i]->bv_val)){
- /* rid has not been cleaned yet, start over */
- found = 1;
- break;
- }
- }
- ldap_value_free_len(vals);
- }
- ldap_memfree( attr );
- }
- if ( ber != NULL ) {
- ber_free( ber, 0 );
- }
- }
- ldap_msgfree( result );
- /*
- * Unlock the connection, and start the linger timer
- */
- conn_unlock(conn);
- conn_start_linger(conn);
-
- if(found){
- /*
- * If we've been trying to clean these replicas for over an hour, just quit
- */
- if( (current_time() - start_time) > 3600){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: timed out checking if replicas have "
- "been cleaned. The rid has not been released, you need to rerun the task.\n");
- goto done;
- }
- /*
- * a rid has not been cleaned yet, go back to sleep and check them again
- */
- break;
- }
+fail:
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Failed to clean rid (%d)",rid);
+ if(task){
+ slapi_task_finish(task, rc);
+ }
+ if(payload){
+ ber_bvfree(payload);
+ }
+ csn_free(&maxcsn);
+ object_release (r);
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- }
- if(!found){
- /*
- * The replicas have been cleaned! Next, release the rid
- */
- replicas_cleaned = 1;
- break;
- }
- } /* while */
+done:
- /*
- * If the replicas are cleaned, release the rid
- */
- if(replicas_cleaned){
- rc = replica_execute_release_ruv_task(data->repl_obj, data->rid);
- if(rc == 0){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Successfully Finished. All active "
- "replicas have been cleaned.\n");
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Failed: Replica ID was not released (%d) "
- "You will need to rerun the task.\n", rc);
- }
- } else {
- /*
- * Shutdown
- */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: slapd shutting down, you will need to rerun the task.\n");
- }
+ return rc;
+}
-done:
- slapi_ch_free((void **)&rid_text);
- slapi_ch_free((void **)&data);
+void
+replica_cleanallruv_thread_ext(void *arg)
+{
+ replica_cleanallruv_thread(arg);
}
/*
- * This function releases the cleaned rid so that it can be reused.
- * We send this operation to all the known active replicas.
+ * CLEANALLRUV Thread
+ *
+ * [1] Wait for the maxcsn to be covered
+ * [2] Make sure all the replicas are alive
+ * [3] Set the cleaned rid
+ * [4] Send the cleanAllRUV extop to all the replicas
+ * [5] Manually send the CLEANRUV task to replicas that do not support CLEANALLRUV
+ * [6] Wait for all the replicas to be cleaned.
+ * [7] Trigger cl trimming, release the rid, and remove all the "cleanallruv" attributes
+ * from the config.
*/
-static int
-replica_execute_release_ruv_task(Object *r, ReplicaId rid)
+static void
+replica_cleanallruv_thread(void *arg)
{
- Repl_Connection *conn;
- Replica *replica = (Replica*)object_get_data (r);
- Object *agmt_obj;
- Repl_Agmt *agmt;
- ConnResult crc;
- const Slapi_DN *dn = NULL;
- struct berval *payload = NULL;
- char *ridstr = NULL;
- int send_msgid = 0;
- int rc = 0;
+ Object *ruv_obj = NULL;
+ Object *agmt_obj = NULL;
+ Repl_Agmt *agmt = NULL;
+ RUV *ruv = NULL;
+ cleanruv_data *data = arg;
+ char csnstr[CSN_STRSIZE];
+ char *returntext = NULL;
+ char *rid_text = NULL;
+ int found_dirty_rid = 1;
+ int agmt_not_notified = 1;
+ int interval = 10;
+ int free_obj = 0;
+ int rc = 0;
+
+ /*
+ * Initialize our settings
+ */
+ if(data->replica == NULL && data->repl_obj == NULL){
+ /*
+ * This thread was initiated at startup because the process did not finish. Due
+ * to timing issues, we need to wait to grab the replica obj until we get here.
+ */
+ data->repl_obj = replica_get_replica_from_dn(data->sdn);
+ data->replica = (Replica*)object_get_data(data->repl_obj);
+ free_obj = 1;
+ }
+ if(data->replica == NULL && data->repl_obj){
+ data->replica = (Replica*)object_get_data(data->repl_obj);
+ }
+ if( data->replica && data->repl_obj == NULL){
+ data->repl_obj = object_new(data->replica, NULL);
+ free_obj = 1;
+ }
+ if(data->task){
+ slapi_task_begin(data->task, 1);
+ }
+ rid_text = slapi_ch_smprintf("{replica %d ldap", data->rid);
+ csn_as_string(data->maxcsn, PR_FALSE, csnstr);
+
+ /*
+ * Add the cleanallruv task to the repl config - so we can handle restarts
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Cleaning rid (%d)...", data->rid);
+ add_cleaned_rid(data->rid, data->replica, csnstr); /* marks config that we started cleaning a rid */
+ /*
+ * First, wait for the maxcsn to be covered
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Waiting to process all the updates from the deleted replica...");
+ ruv_obj = replica_get_ruv(data->replica);
+ ruv = object_get_data (ruv_obj);
+ while(data->maxcsn && !is_task_aborted(data->rid) && !is_cleaned_rid(data->rid) && !slapi_is_shutting_down()){
+ if(csn_get_replicaid(data->maxcsn) == 0 || ruv_covers_csn(ruv,data->maxcsn)){
+ /* We are caught up, now we can clean the ruv's */
+ break;
+ }
+ DS_Sleep(PR_SecondsToInterval(5));
+ }
+ object_release(ruv_obj);
+ /*
+ * Next, make sure all the replicas are up and running before sending off the clean ruv tasks
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Waiting for all the replicas to be online...");
+ if(check_agmts_are_alive(data->replica, data->rid, data->task)){
+ /* error, aborted or shutdown */
+ goto done;
+ }
+ /*
+ * Make sure all the replicas have seen the max csn
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Waiting for all the replicas to receive all the deleted replica updates...");
+ if(check_agmts_are_caught_up(data->replica, data->rid, csnstr, data->task)){
+ /* error, aborted or shutdown */
+ goto done;
+ }
+ /*
+ * Set the rid as notified - this blocks the changelog from sending out updates
+ * during this process, as well as prevents the db ruv from getting polluted.
+ */
+ set_cleaned_rid(data->rid);
+ /*
+ * Now send the cleanruv extended op to all the agreements
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Sending cleanAllRUV task to all the replicas...");
+ while(agmt_not_notified && !is_task_aborted(data->rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
+ if(agmt_obj == NULL){
+ /* no agmts, just clean this replica */
+ break;
+ }
+ while (agmt_obj){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt)){ /* skip disabled replicas */
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ continue;
+ }
+ if(replica_cleanallruv_send_extop(agmt, data->rid, data->task, data->payload, 1) == 0){
+ agmt_not_notified = 0;
+ } else {
+ agmt_not_notified = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ }
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: releasing rid (%d)...\n", rid);
+ if(is_task_aborted(data->rid)){
+ goto done;
+ }
+ if(agmt_not_notified == 0){
+ break;
+ }
+ /*
+ * need to sleep between passes
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Not all replicas have received the "
+ "cleanallruv extended op, retrying in %d seconds",interval);
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(interval) );
+ PR_Unlock( notify_lock );
+
+ if(interval < 14400){ /* 4 hour max */
+ interval = interval * 2;
+ } else {
+ interval = 14400;
+ }
+ }
+ /*
+ * Run the CLEANRUV task
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Cleaning local ruv's...");
+ replica_execute_cleanruv_task (data->repl_obj, data->rid, returntext);
+ /*
+ * Wait for all the replicas to be cleaned
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Waiting for all the replicas to be cleaned...");
+
+ interval = 10;
+ while(found_dirty_rid && !is_task_aborted(data->rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
+ if(agmt_obj == NULL){
+ break;
+ }
+ while (agmt_obj && !slapi_is_shutting_down()){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt)){ /* skip disabled replicas */
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ continue;
+ }
+ if(replica_cleanallruv_check_ruv(agmt, rid_text, data->task) == 0){
+ found_dirty_rid = 0;
+ } else {
+ found_dirty_rid = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ }
+ /* If the task is abort or everyone is cleaned, break out */
+ if(is_task_aborted(data->rid)){
+ goto done;
+ }
+ if(found_dirty_rid == 0){
+ break;
+ }
+ /*
+ * need to sleep between passes
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Replicas have not been cleaned yet, "
+ "retrying in %d seconds", interval);
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(interval) );
+ PR_Unlock( notify_lock );
+
+ if(interval < 14400){ /* 4 hour max */
+ interval = interval * 2;
+ } else {
+ interval = 14400;
+ }
+ } /* while */
- /*
- * Set the released rid, and trigger cl trimmming
- */
- set_released_rid((int)rid);
- trigger_cl_trimming();
- /*
- * Create payload
- */
- ridstr = slapi_ch_smprintf("%d:%s", rid, slapi_sdn_get_dn(replica_get_root(replica)));
- payload = create_ruv_payload(ridstr);
- if(payload == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_task: failed to create ext op payload, aborting op\n");
- rc = -1;
- goto done;
- }
+done:
+ /*
+ * If the replicas are cleaned, release the rid, and trim the changelog
+ */
+ if(!found_dirty_rid){
+ trigger_cl_trimming(data->rid);
+ delete_cleaned_rid(data->replica, data->rid, data->maxcsn);
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Successfully cleaned rid(%d).", data->rid);
+ slapi_task_finish(data->task, rc);
+ } else {
+ /*
+ * Shutdown or abort
+ */
+ if(!is_task_aborted(data->rid)){
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Server shutting down. Process will resume at server startup");
+ } else {
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Task aborted for rid(%d).",data->rid);
+ }
+ if(data->task){
+ slapi_task_finish(data->task, rc);
+ }
+ }
- agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
- while (agmt_obj)
- {
- agmt = (Repl_Agmt*)object_get_data (agmt_obj);
- if(!agmt_is_enabled(agmt)){
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- continue;
- }
- dn = agmt_get_dn_byref(agmt);
- conn = (Repl_Connection *)agmt_get_connection(agmt);
- if(conn == NULL){
- /* no connection for this agreement, log error, and move on */
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- continue;
- }
- crc = conn_connect(conn);
- if (CONN_OPERATION_FAILED == crc ){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_task: failed to connect "
- "to repl agmt (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_TRANSIENT_ERROR);
- rc = LDAP_OPERATIONS_ERROR;
- } else if (CONN_SSL_NOT_ENABLED == crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_task: failed to acquire "
- "repl agmt (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_FATAL_ERROR);
- rc = LDAP_OPERATIONS_ERROR;
- } else {
- conn_cancel_linger(conn);
- crc = conn_send_extended_operation(conn, REPL_RELEASERUV_OID, payload, NULL, &send_msgid);
- if (CONN_OPERATION_SUCCESS != crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to send "
- "releaseRUV extended op to repl agmt (%s), error %d\n", slapi_sdn_get_dn(dn), crc);
- rc = LDAP_OPERATIONS_ERROR;
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: successfully sent "
- "releaseRUV extended op to (%s)\n",slapi_sdn_get_dn(dn));
- }
- conn_start_linger(conn);
- }
- if(crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica (%s) has not "
- "been released. You will need to rerun the task\n",
- slapi_sdn_get_dn(dn));
- rc = crc;
- }
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- }
+ if(data->payload){
+ ber_bvfree(data->payload);
+ }
+ if(data->repl_obj && free_obj){
+ object_release(data->repl_obj);
+ }
+ slapi_sdn_free(&data->sdn);
+ slapi_ch_free_string(&rid_text);
+ csn_free(&data->maxcsn);
+ slapi_ch_free((void **)&data);
+}
-done:
- /*
- * reset the released/clean rid
- */
- if(rc == 0){
- set_released_rid(ALREADY_RELEASED);
- delete_cleaned_rid();
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Successfully released rid (%d)\n", rid);
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Failed to release rid (%d), error (%d)\n", rid, rc);
- }
+/*
+ * Waits for all the repl agmts to be have have the maxcsn. Returns error only on abort or shutdown
+ */
+static int
+check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_Task *task)
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ char *rid_text;
+ int not_all_caughtup = 1;
+ int interval = 10;
+
+ rid_text = slapi_ch_smprintf("{replica %d ldap", rid);
+
+ while(not_all_caughtup && !is_task_aborted(rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
+ if(agmt_obj == NULL){
+ not_all_caughtup = 0;
+ break;
+ }
+ while (agmt_obj){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt)){ /* skip disabled replicas */
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ continue;
+ }
+ if(replica_cleanallruv_check_maxcsn(agmt, rid_text, maxcsn, task) == 0){
+ not_all_caughtup = 0;
+ } else {
+ not_all_caughtup = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ } /* agmt while */
- if(payload)
- ber_bvfree(payload);
+ if(not_all_caughtup == 0 || is_task_aborted(rid) ){
+ break;
+ }
+ cleanruv_log(task, CLEANALLRUV_ID, "Not all replicas caught up, retrying in %d seconds",interval);
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(interval) );
+ PR_Unlock( notify_lock );
+
+ if(interval < 14400){ /* 4 hour max */
+ interval = interval * 2;
+ } else {
+ interval = 14400;
+ }
+ }
+ slapi_ch_free_string(&rid_text);
- slapi_ch_free_string(&ridstr);
+ if(is_task_aborted(rid)){
+ return -1;
+ }
- return rc;
+ return not_all_caughtup;
}
-static struct berval *
-create_ruv_payload(char *value){
- struct berval *req_data = NULL;
- BerElement *tmp_bere = NULL;
+/*
+ * Waits for all the repl agmts to be online. Returns error only on abort or shutdown
+ */
+static int
+check_agmts_are_alive(Replica *replica, ReplicaId rid, Slapi_Task *task)
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ int not_all_alive = 1;
+ int interval = 10;
+
+ while(not_all_alive && is_task_aborted(rid) == 0 && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
+ if(agmt_obj == NULL){
+ not_all_alive = 0;
+ break;
+ }
+ while (agmt_obj){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt)){ /* skip disabled replicas */
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ continue;
+ }
+ if(replica_cleanallruv_replica_alive(agmt) == 0){
+ not_all_alive = 0;
+ } else {
+ not_all_alive = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ }
- if ((tmp_bere = der_alloc()) == NULL){
- goto error;
- }
- if (ber_printf(tmp_bere, "{s", value) == -1){
- goto error;
- }
+ if(not_all_alive == 0 || is_task_aborted(rid)){
+ break;
+ }
+ cleanruv_log(task, CLEANALLRUV_ID, "Not all replicas online, retrying in %d seconds...",interval);
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(interval) );
+ PR_Unlock( notify_lock );
- if (ber_printf(tmp_bere, "}") == -1){
- goto error;
- }
+ if(interval < 14400){ /* 4 hour max */
+ interval = interval * 2;
+ } else {
+ interval = 14400;
+ }
+ }
+ if(is_task_aborted(rid)){
+ return -1;
+ }
- if (ber_flatten(tmp_bere, &req_data) == -1){
- goto error;
- }
+ return not_all_alive;
+}
- goto done;
+/*
+ * Create the CLEANALLRUV extended op payload
+ */
+struct berval *
+create_ruv_payload(char *value)
+{
+ struct berval *req_data = NULL;
+ BerElement *tmp_bere = NULL;
+
+ if ((tmp_bere = der_alloc()) == NULL){
+ goto error;
+ }
+ if (ber_printf(tmp_bere, "{s", value) == -1){
+ goto error;
+ }
+ if (ber_printf(tmp_bere, "}") == -1){
+ goto error;
+ }
+ if (ber_flatten(tmp_bere, &req_data) == -1){
+ goto error;
+ }
+ goto done;
error:
- if (NULL != req_data){
- ber_bvfree(req_data);
- req_data = NULL;
- }
+ if (NULL != req_data){
+ ber_bvfree(req_data);
+ req_data = NULL;
+ }
done:
- if (NULL != tmp_bere){
- ber_free(tmp_bere, 1);
- tmp_bere = NULL;
- }
+ if (NULL != tmp_bere){
+ ber_free(tmp_bere, 1);
+ tmp_bere = NULL;
+ }
+
+ return req_data;
+}
+
+/*
+ * Manually add the CLEANRUV task to replicas that do not support
+ * the CLEANALLRUV task.
+ */
+static void
+replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
+{
+ Repl_Connection *conn;
+ ConnResult crc = 0;
+ LDAP *ld;
+ Slapi_DN *dn;
+ struct berval *vals[2];
+ struct berval val;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ char *repl_dn = NULL;
+ char data[15];
+ int rc;
- return req_data;
+ if((conn = conn_new(agmt)) == NULL){
+ return;
+ }
+ crc = conn_connect(conn);
+ if (CONN_OPERATION_SUCCESS != crc){
+ conn_delete_internal_ext(conn);
+ return;
+ }
+ ld = conn_get_ldap(conn);
+ if(ld == NULL){
+ conn_delete_internal_ext(conn);
+ return;
+ }
+ val.bv_len = PR_snprintf(data, sizeof(data), "CLEANRUV%d", rid);
+ dn = agmt_get_replarea(agmt);
+ mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
+ mod.mod_type = "nsds5task";
+ mod.mod_bvalues = vals;
+ vals [0] = &val;
+ vals [1] = NULL;
+ val.bv_val = data;
+ mods[0] = &mod;
+ mods[1] = NULL;
+ repl_dn = PR_smprintf("cn=replica,cn=\"%s\",cn=mapping tree,cn=config", slapi_sdn_get_dn(dn));
+ /*
+ * Add task to remote replica
+ */
+ rc = ldap_modify_ext_s( ld, repl_dn, mods, NULL, NULL);
+
+ if(rc != LDAP_SUCCESS){
+ cleanruv_log(task, CLEANALLRUV_ID, "Failed to add CLEANRUV task replica "
+ "(%s). You will need to manually run the CLEANRUV task on this replica (%s) error (%d)",
+ agmt_get_long_name(agmt), agmt_get_hostname(agmt), rc);
+ }
+ slapi_ch_free_string(&repl_dn);
+ conn_delete_internal_ext(conn);
}
+/*
+ * Check if the rid is in our list of "cleaned" rids
+ */
int
is_cleaned_rid(ReplicaId rid)
{
- if(rid == cleaned_rid){
- return 1;
- } else {
- return 0;
- }
+ int i;
+
+ slapi_rwlock_rdlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ && cleaned_rids[i] != 0; i++){
+ if(rid == cleaned_rids[i]){
+ slapi_rwlock_unlock(rid_lock);
+ return 1;
+ }
+ }
+ slapi_rwlock_unlock(rid_lock);
+
+ return 0;
}
+int
+is_task_aborted(ReplicaId rid)
+{
+ int i;
+
+ if(rid == 0){
+ return 0;
+ }
+ slapi_rwlock_rdlock(abort_rid_lock);
+ for(i = 0; i < CLEANRIDSIZ && aborted_rids[i] != 0; i++){
+ if(rid == aborted_rids[i]){
+ slapi_rwlock_unlock(abort_rid_lock);
+ return 1;
+ }
+ }
+ slapi_rwlock_unlock(abort_rid_lock);
+ return 0;
+}
+
+/*
+ * Just add the rid to the in memory, as we don't want it to survive after a restart,
+ * This prevent the changelog from sending updates from this rid, and the local ruv
+ * will not be updated either.
+ */
void
-set_cleaned_rid( ReplicaId rid )
+set_cleaned_rid(ReplicaId rid)
{
- cleaned_rid = rid;
+ int i;
+
+ slapi_rwlock_wrlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ; i++){
+ if(cleaned_rids[i] == 0){
+ cleaned_rids[i] = rid;
+ cleaned_rids[i + 1] = 0;
+ }
+ }
+ slapi_rwlock_unlock(rid_lock);
}
+/*
+ * Add the rid and maxcsn to the repl config (so we can resume after a server restart)
+ */
void
-delete_cleaned_rid()
+add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
{
- cleaned_rid = 0;
+ Slapi_PBlock *pb;
+ struct berval *vals[2];
+ struct berval val;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ char data[CSN_STRSIZE + 10];
+ char *dn;
+ int rc;
+
+ /*
+ * Write the rid & maxcsn to the config entry
+ */
+ val.bv_len = PR_snprintf(data, sizeof(data),"%d:%s", rid, maxcsn);
+ dn = replica_get_dn(r);
+ pb = slapi_pblock_new();
+ mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
+ mod.mod_type = (char *)type_replicaCleanRUV;
+ mod.mod_bvalues = vals;
+ vals [0] = &val;
+ vals [1] = NULL;
+ val.bv_val = data;
+ mods[0] = &mod;
+ mods[1] = NULL;
+
+ replica_add_cleanruv_data(r, val.bv_val);
+
+ slapi_modify_internal_set_pb (pb, dn, mods, NULL, NULL,
+ repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_modify_internal_pb (pb);
+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
+ if (rc != LDAP_SUCCESS){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to update replica "
+ "config (%d), rid (%d)\n", rc, rid);
+ }
+ slapi_ch_free_string(&dn);
+ slapi_pblock_destroy(pb);
}
-int
-get_released_rid()
+/*
+ * Add aborted rid and repl root to config in case of a server restart
+ */
+void
+add_aborted_rid(ReplicaId rid, Replica *r, char *repl_root)
{
- return released_rid;
+ Slapi_PBlock *pb;
+ struct berval *vals[2];
+ struct berval val;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ char *data;
+ char *dn;
+ int rc;
+ int i;
+
+ slapi_rwlock_wrlock(abort_rid_lock);
+ for(i = 0; i < CLEANRIDSIZ; i++){
+ if(aborted_rids[i] == 0){
+ aborted_rids[i] = rid;
+ aborted_rids[i + 1] = 0;
+ break;
+ }
+ }
+ slapi_rwlock_unlock(abort_rid_lock);
+ /*
+ * Write the rid to the config entry
+ */
+ dn = replica_get_dn(r);
+ pb = slapi_pblock_new();
+ data = PR_smprintf("%d:%s", rid, repl_root);
+ mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
+ mod.mod_type = (char *)type_replicaAbortCleanRUV;
+ mod.mod_bvalues = vals;
+ vals [0] = &val;
+ vals [1] = NULL;
+ val.bv_val = data;
+ val.bv_len = strlen (data);
+ mods[0] = &mod;
+ mods[1] = NULL;
+
+ slapi_modify_internal_set_pb (pb, dn, mods, NULL, NULL,
+ repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_modify_internal_pb (pb);
+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
+ if (rc != LDAP_SUCCESS){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to update "
+ "replica config (%d), rid (%d)\n", rc, rid);
+ }
+
+ slapi_ch_free_string(&dn);
+ slapi_ch_free_string(&data);
+ slapi_pblock_destroy(pb);
}
-int
-is_released_rid(int rid)
+void
+delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root){
+ Slapi_PBlock *pb;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ struct berval *vals[2];
+ struct berval val;
+ char *data;
+ char *dn;
+ int rc;
+ int i;
+
+ if(r == NULL)
+ return;
+
+ /*
+ * Remove this rid, and optimize the array
+ */
+ slapi_rwlock_wrlock(abort_rid_lock);
+ for(i = 0; i < CLEANRIDSIZ && aborted_rids[i] != rid; i++); /* found rid, stop */
+ for(; i < CLEANRIDSIZ; i++){
+ /* rewrite entire array */
+ aborted_rids[i] = aborted_rids[i + 1];
+ }
+ slapi_rwlock_unlock(abort_rid_lock);
+ /*
+ * Prepare the mods for the config entry
+ */
+ dn = replica_get_dn(r);
+ pb = slapi_pblock_new();
+ data = PR_smprintf("%d:%s", (int)rid, repl_root);
+
+ mod.mod_op = LDAP_MOD_DELETE|LDAP_MOD_BVALUES;
+ mod.mod_type = (char *)type_replicaAbortCleanRUV;
+ mod.mod_bvalues = vals;
+ vals [0] = &val;
+ vals [1] = NULL;
+ val.bv_val = data;
+ val.bv_len = strlen (data);
+ mods[0] = &mod;
+ mods[1] = NULL;
+
+ slapi_modify_internal_set_pb(pb, dn, mods, NULL, NULL, repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_modify_internal_pb (pb);
+ slapi_pblock_destroy (pb);
+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
+ if (rc != LDAP_SUCCESS){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to remove replica "
+ "config (%d), rid (%d)\n", rc, rid);
+ }
+
+ slapi_ch_free_string(&dn);
+ slapi_ch_free_string(&data);
+}
+
+/*
+ * Remove the rid from our list, and the config
+ */
+void
+delete_cleaned_rid(Replica *r, ReplicaId rid, CSN *maxcsn)
{
- if(rid == released_rid){
- return 1;
- } else {
- return 0;
- }
+ Slapi_PBlock *pb;
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ struct berval *vals[2];
+ struct berval val;
+ char *dn;
+ char data[CSN_STRSIZE + 10];
+ char csnstr[CSN_STRSIZE];
+ int rc;
+ int i;
+
+ if(r == NULL || maxcsn == NULL)
+ return;
+
+ /*
+ * Remove this rid, and optimize the array
+ */
+ slapi_rwlock_wrlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ && cleaned_rids[i] != rid; i++); /* found rid, stop */
+ for(; i < CLEANRIDSIZ; i++){
+ /* rewrite entire array */
+ cleaned_rids[i] = cleaned_rids[i + 1];
+ }
+ slapi_rwlock_unlock(rid_lock);
+ /*
+ * Prepare the mods for the config entry
+ */
+ csn_as_string(maxcsn, PR_FALSE, csnstr);
+ val.bv_len = PR_snprintf(data, sizeof(data), "%d:%s", (int)rid, csnstr);
+ dn = replica_get_dn(r);
+ pb = slapi_pblock_new();
+ mod.mod_op = LDAP_MOD_DELETE|LDAP_MOD_BVALUES;
+ mod.mod_type = (char *)type_replicaCleanRUV;
+ mod.mod_bvalues = vals;
+ vals [0] = &val;
+ vals [1] = NULL;
+ val.bv_val = data;
+ mods[0] = &mod;
+ mods[1] = NULL;
+
+ replica_remove_cleanruv_data(r, data);
+
+ slapi_modify_internal_set_pb(pb, dn, mods, NULL, NULL, repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_modify_internal_pb (pb);
+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
+ if (rc != LDAP_SUCCESS){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to remove replica config "
+ "(%d), rid (%d)\n", rc, rid);
+ }
+ slapi_pblock_destroy (pb);
+ slapi_ch_free_string(&dn);
+ /*
+ * Now release the cleaned rid from the repl agmts
+ */
+ agmt_obj = agmtlist_get_first_agreement_for_replica (r);
+ while (agmt_obj){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt)){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
+ continue;
+ }
+ agmt_set_cleanruv_data(agmt, rid, CLEANRUV_RELEASED);
+ agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
+ }
}
+/*
+ * Abort the CLEANALLRUV task
+ */
int
-is_already_released_rid()
+replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
+ int *returncode, char *returntext, void *arg)
{
- if(released_rid == ALREADY_RELEASED){
- return 1;
- } else {
- return 0;
- }
+ PRThread *thread = NULL;
+ struct berval *payload = NULL;
+ Slapi_Task *task = NULL;
+ Replica *replica;
+ ReplicaId rid;
+ cleanruv_data *data = NULL;
+ const Slapi_DN *dn;
+ Object *r;
+ CSN *maxcsn;
+ const char *base_dn;
+ const char *rid_str;
+ char *ridstr;
+ int rc = SLAPI_DSE_CALLBACK_OK;
+
+ if(get_abort_cleanruv_task_count() >= CLEANRIDSIZ){
+ /* we are already running the maximum number of tasks */
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,
+ "Exceeded maximum number of active ABORT CLEANALLRUV tasks(%d)",CLEANRIDSIZ);
+ returntext = PR_smprintf("Exceeded maximum number of active ABORT CLEANALLRUV tasks(%d), "
+ "you must wait for one to finish.", CLEANRIDSIZ);
+ *returncode = LDAP_OPERATIONS_ERROR;
+ return SLAPI_DSE_CALLBACK_ERROR;
+ }
+
+ /* allocate new task now */
+ task = slapi_new_task(slapi_entry_get_ndn(e));
+ /*
+ * Get our task settings
+ */
+ if ((rid_str = fetch_attr(e, "replica-id", 0)) == NULL){
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Missing required attr \"replica-id\"");
+ *returncode = LDAP_OBJECT_CLASS_VIOLATION;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Missing required attr \"replica-base-dn\"");
+ *returncode = LDAP_OBJECT_CLASS_VIOLATION;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ /*
+ * Check the rid
+ */
+ rid = atoi(rid_str);
+ if (rid <= 0 || rid >= READ_ONLY_REPLICA_ID){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Invalid replica id (%d) for task - (%s)",
+ rid, slapi_sdn_get_dn(slapi_entry_get_sdn(e)));
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,"%s", returntext);
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ /*
+ * Get the replica object
+ */
+ dn = slapi_sdn_new_dn_byval(base_dn);
+ if((r = replica_get_replica_from_dn(dn)) == NULL){
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Failed to find replica from dn(%s)", base_dn);
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ /*
+ * Create payload
+ */
+ ridstr = slapi_ch_smprintf("%d:%s", rid, base_dn);
+ payload = create_ruv_payload(ridstr);
+
+ if(payload == NULL){
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Failed to create extended op payload, aborting task");
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ /*
+ * Stop the cleaning, and delete the rid
+ */
+ replica = (Replica*)object_get_data (r);
+ maxcsn = replica_get_cleanruv_maxcsn(replica, rid);
+ delete_cleaned_rid(replica, rid, maxcsn);
+ add_aborted_rid(rid, replica, (char *)base_dn);
+ stop_ruv_cleaning();
+ /*
+ * Prepare the abort struct and fire off the thread
+ */
+ data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
+ if (data == NULL) {
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Failed to allocate abort_cleanruv_data. Aborting task.");
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ data->repl_obj = r; /* released in replica_abort_task_thread() */
+ data->replica = replica;
+ data->task = task;
+ data->payload = payload;
+ data->rid = rid;
+ data->repl_root = slapi_ch_strdup(base_dn);
+ data->sdn = NULL;
+
+ thread = PR_CreateThread(PR_USER_THREAD, replica_abort_task_thread,
+ (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
+ if (thread == NULL) {
+ object_release(r);
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Unable to create abort thread. Aborting task.");
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ }
+
+out:
+
+ csn_free(&maxcsn);
+ slapi_ch_free_string(&ridstr);
+
+ if(rc != SLAPI_DSE_CALLBACK_OK){
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Abort Task failed (%d)", rc);
+ slapi_task_finish(task, rc);
+ }
+
+ return rc;
+}
+
+/*
+ * Abort CLEANALLRUV task thread
+ */
+void
+replica_abort_task_thread(void *arg)
+{
+ cleanruv_data *data = (cleanruv_data *)arg;
+ Repl_Agmt *agmt;
+ Object *agmt_obj;
+ int agmt_not_notified = 1;
+ int interval = 10;
+ int release_it = 0;
+
+ /*
+ * Need to build the replica from the dn
+ */
+ if(data->replica == NULL && data->repl_obj == NULL){
+ /*
+ * This thread was initiated at startup because the process did not finish. Due
+ * to timing issues, we need to wait to grab the replica obj until we get here.
+ */
+ if((data->repl_obj = replica_get_replica_from_dn(data->sdn)) == NULL){
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Failed to get replica from dn (%s).", slapi_sdn_get_dn(data->sdn));
+ goto done;
+ }
+ if(data->replica == NULL && data->repl_obj){
+ data->replica = (Replica*)object_get_data(data->repl_obj);
+ }
+ release_it = 1;
+ }
+
+ /*
+ * Now send the cleanruv extended op to all the agreements
+ */
+ while(agmt_not_notified && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
+ while (agmt_obj){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt)){ /* skip disabled replicas */
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ continue;
+ }
+ if(replica_cleanallruv_send_abort_extop(agmt, data->task, data->payload)){
+ agmt_not_notified = 1;
+ break;
+ } else {
+ /* success */
+ agmt_not_notified = 0;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ } /* while loop for agmts */
+
+ if(agmt_not_notified == 0){
+ /* everybody has been contacted */
+ break;
+ }
+ /*
+ * need to sleep between passes
+ */
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID,"Retrying in %d seconds",interval);
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(interval) );
+ PR_Unlock( notify_lock );
+
+ if(interval < 14400){ /* 4 hour max */
+ interval = interval * 2;
+ } else {
+ interval = 14400;
+ }
+ } /* while */
+
+done:
+ if(agmt_not_notified){
+ /* failure */
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID,"Abort task failed, will resume the task at the next server startup.");
+ } else {
+ /*
+ * Clean up the config
+ */
+ delete_aborted_rid(data->replica, data->rid, data->repl_root);
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Successfully aborted cleanAllRUV task for rid(%d)", data->rid);
+ }
+ if(data->task){
+ slapi_task_finish(data->task, agmt_not_notified);
+ }
+ if(data->repl_obj && release_it)
+ object_release(data->repl_obj);
+ if(data->payload){
+ ber_bvfree(data->payload);
+ }
+ slapi_ch_free_string(&data->repl_root);
+ slapi_sdn_free(&data->sdn);
+ slapi_ch_free((void **)&data);
+}
+
+static int
+replica_cleanallruv_send_abort_extop(Repl_Agmt *ra, Slapi_Task *task, struct berval *payload)
+{
+ Repl_Connection *conn = NULL;
+ ConnResult crc = 0;
+ int msgid = 0;
+ int rc = 0;
+
+ if((conn = conn_new(ra)) == NULL){
+ return -1;
+ }
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ crc = conn_send_extended_operation(conn, REPL_ABORT_CLEANRUV_OID, payload, NULL, &msgid);
+ /*
+ * success or failure, just return the error code
+ */
+ rc = crc;
+ if(rc){
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Failed to send extop to replica(%s).", agmt_get_long_name(ra));
+ }
+ } else {
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Failed to connect to replica(%s).", agmt_get_long_name(ra));
+ rc = -1;
+ }
+ conn_delete_internal_ext(conn);
+
+ return rc;
+}
+
+
+static int
+replica_cleanallruv_send_extop(Repl_Agmt *ra, ReplicaId rid, Slapi_Task *task, struct berval *payload, int check_result)
+{
+ Repl_Connection *conn = NULL;
+ ConnResult crc = 0;
+ int msgid = 0;
+ int rc = 0;
+
+ if((conn = conn_new(ra)) == NULL){
+ return -1;
+ }
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS && check_result){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
+
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ struct berval **ruv_bervals = NULL;
+ struct berval *data = NULL;
+ char *data_guid = NULL;
+
+ decode_repl_ext_response(retsdata, &rc, &ruv_bervals, &data_guid, &data);
+ /* just free everything, we only wanted "rc" */
+ slapi_ch_free_string(&data_guid);
+ if(data)
+ ber_bvfree(data);
+ if (ruv_bervals)
+ ber_bvecfree(ruv_bervals);
+
+ if(rc == 0 ){ /* rc == 1 is success */
+ cleanruv_log(task, CLEANALLRUV_ID,"Replica %s does not support the CLEANALLRUV task. Sending replica CLEANRUV task...",
+ slapi_sdn_get_dn(agmt_get_dn_byref(ra)));
+ /*
+ * Ok, this replica doesn't know about CLEANALLRUV, so just manually
+ * add the CLEANRUV task to the replica.
+ */
+ replica_send_cleanruv_task(ra, rid, task);
+ } else {
+ /* extop was accepted */
+ rc = 0;
+ }
+ if (NULL != retoid)
+ ldap_memfree(retoid);
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
+ }
+ agmt_set_cleanruv_data(ra, rid, CLEANRUV_NOTIFIED);
+ } else {
+ /*
+ * success or failure, just return the error code
+ */
+ rc = crc;
+ }
+ } else {
+ rc =-1;
+ }
+ conn_delete_internal_ext(conn);
+
+ return rc;
+}
+
+static int
+replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn, Slapi_Task *task)
+{
+ Repl_Connection *conn = NULL;
+ LDAP *ld;
+ Slapi_DN *dn = agmt_get_replarea(agmt);
+ struct berval **vals;
+ LDAPMessage *result = NULL, *entry = NULL;
+ BerElement *ber;
+ char *attrs[2];
+ char *attr = NULL;
+ char *iter = NULL;
+ char *ruv_part = NULL;
+ int found_rid = 0;
+ int part_count = 0;
+ int rc = 0, i;
+
+ if((conn = conn_new(agmt)) == NULL){
+ return -1;
+ }
+
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ attrs[0] = "nsds50ruv";
+ attrs[1] = NULL;
+ ld = conn_get_ldap(conn);
+ if(ld == NULL){
+ conn_delete_internal_ext(conn);
+ return -1;
+ }
+ rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(dn), LDAP_SCOPE_SUBTREE,
+ "(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))",
+ attrs, 0, NULL, NULL, NULL, 0, &result);
+ slapi_sdn_free(&dn);
+ if(rc != LDAP_SUCCESS){
+ cleanruv_log(task, CLEANALLRUV_ID,"Failed to contact "
+ "agmt (%s) error (%d), will retry later.", agmt_get_long_name(agmt), rc);
+ conn_delete_internal_ext(conn);
+ return -1;
+ }
+ entry = ldap_first_entry( ld, result );
+ if ( entry != NULL ) {
+ for ( attr = ldap_first_attribute( ld, entry, &ber ); attr != NULL; attr = ldap_next_attribute( ld, entry, ber ) ){
+ /* make sure the attribute is nsds50ruv */
+ if(strcasecmp(attr,"nsds50ruv") != 0){
+ ldap_memfree( attr );
+ continue;
+ }
+ found_rid = 0;
+ if ((vals = ldap_get_values_len( ld, entry, attr)) != NULL ) {
+ for ( i = 0; vals[i] && vals[i]->bv_val; i++ ) {
+ /* look for this replica */
+ if(strstr(vals[i]->bv_val, rid_text)){
+ found_rid = 1;
+ /* get the max csn compare it to our known max csn */
+ ruv_part = ldap_utf8strtok_r(vals[i]->bv_val, " ", &iter);
+ for(part_count = 1; ruv_part && part_count < 5; part_count++){
+ ruv_part = ldap_utf8strtok_r(iter, " ", &iter);
+ }
+ if(part_count == 5){
+ /* we have the maxcsn */
+ if(strcmp(ruv_part, maxcsn)){
+ /* we are not caught up yet, free, and return */
+ ldap_value_free_len(vals);
+ ldap_memfree( attr );
+ ldap_msgfree( result );
+ if(ber){
+ ber_free( ber, 0 );
+ }
+ conn_delete_internal_ext(conn);
+ return -1;
+ } else {
+ /* ok this replica has all the updates from the deleted replica */
+ rc = 0;
+ }
+ } else {
+ /* there is no maxcsn for this rid - treat it as caught up */
+ rc = 0;
+ }
+ }
+ }
+ if(!found_rid){
+ /* must have been cleaned already */
+ rc = 0;
+ }
+ ldap_value_free_len(vals);
+ }
+ ldap_memfree( attr );
+ }
+ if ( ber != NULL ) {
+ ber_free( ber, 0 );
+ }
+ }
+ if(result)
+ ldap_msgfree( result );
+ } else {
+ rc = -1;
+ }
+ conn_delete_internal_ext(conn);
+
+ return rc;
+}
+
+static int
+replica_cleanallruv_replica_alive(Repl_Agmt *agmt)
+{
+ Repl_Connection *conn = NULL;
+ LDAP *ld = NULL;
+ LDAPMessage *result = NULL;
+ int rc = 0;
+
+ if((conn = conn_new(agmt)) == NULL){
+ return -1;
+ }
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ ld = conn_get_ldap(conn);
+ if(ld == NULL){
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "cleanAllRUV_task: failed to get LDAP "
+ "handle from the replication agmt (%s). Moving on to the next agmt.\n",agmt_get_long_name(agmt));
+ conn_delete_internal_ext(conn);
+ return -1;
+ }
+ if(ldap_search_ext_s(ld, "", LDAP_SCOPE_BASE, "objectclass=top",
+ NULL, 0, NULL, NULL, NULL, 0, &result) == LDAP_SUCCESS)
+ {
+ rc = 0;
+ } else {
+ rc = -1;
+ }
+ if(result)
+ ldap_msgfree( result );
+ } else {
+ rc = -1;
+ }
+ conn_delete_internal_ext(conn);
+
+ return rc;
}
+static int
+replica_cleanallruv_check_ruv(Repl_Agmt *ra, char *rid_text, Slapi_Task *task)
+{
+ Repl_Connection *conn = NULL;
+ BerElement *ber = NULL;
+ struct berval **vals = NULL;
+ LDAPMessage *result = NULL, *entry = NULL;
+ LDAP *ld = NULL;
+ Slapi_DN *dn = agmt_get_replarea(ra);
+ char *attrs[2];
+ char *attr = NULL;
+ int rc = 0, i;
+
+ if((conn = conn_new(ra)) == NULL){
+ return -1;
+ }
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ attrs[0] = "nsds50ruv";
+ attrs[1] = NULL;
+ ld = conn_get_ldap(conn);
+ if(ld == NULL){
+ cleanruv_log(task, CLEANALLRUV_ID,"Failed to get LDAP handle from "
+ "the replication agmt (%s). Moving on to the next agmt.",agmt_get_long_name(ra));
+ rc = -1;
+ goto done;
+ }
+
+ rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(dn), LDAP_SCOPE_SUBTREE,
+ "(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))",
+ attrs, 0, NULL, NULL, NULL, 0, &result);
+ slapi_sdn_free(&dn);
+ if(rc != LDAP_SUCCESS){
+ cleanruv_log(task, CLEANALLRUV_ID,"Failed to contact "
+ "agmt (%s) error (%d), will retry later.", agmt_get_long_name(ra), rc);
+ rc = -1;
+ goto done;
+ }
+ entry = ldap_first_entry( ld, result );
+ if ( entry != NULL ) {
+ for ( attr = ldap_first_attribute( ld, entry, &ber ); attr != NULL; attr = ldap_next_attribute( ld, entry, ber ) ){
+ /* make sure the attribute is nsds50ruv */
+ if(strcasecmp(attr,"nsds50ruv") != 0){
+ ldap_memfree( attr );
+ continue;
+ }
+ if ((vals = ldap_get_values_len( ld, entry, attr)) != NULL ) {
+ for ( i = 0; vals[i] && vals[i]->bv_val; i++ ) {
+ /* look for this replica */
+ if(strstr(vals[i]->bv_val, rid_text)){
+ /* rid has not been cleaned yet, free and return */
+ rc = -1;
+ ldap_value_free_len(vals);
+ ldap_memfree( attr );
+ if ( ber != NULL ) {
+ ber_free( ber, 0 );
+ ber = NULL;
+ }
+ goto done;
+ } else {
+ rc = 0;
+ }
+ }
+ ldap_value_free_len(vals);
+ }
+ ldap_memfree( attr );
+ } /* for loop */
+ if ( ber != NULL ) {
+ ber_free( ber, 0 );
+ }
+ }
+done:
+ if(result)
+ ldap_msgfree( result );
+ } else {
+ return -1;
+ }
+ conn_delete_internal_ext(conn);
+
+ return rc;
+}
+
+static int
+get_cleanruv_task_count()
+{
+ int i, count = 0;
+
+ slapi_rwlock_wrlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ; i++){
+ if(cleaned_rids[i] != 0){
+ count++;
+ }
+ }
+ slapi_rwlock_unlock(rid_lock);
+
+ return count;
+}
+
+static int
+get_abort_cleanruv_task_count()
+{
+ int i, count = 0;
+
+ slapi_rwlock_wrlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ; i++){
+ if(aborted_rids[i] != 0){
+ count++;
+ }
+ }
+ slapi_rwlock_unlock(rid_lock);
+
+ return count;
+}
+
+/*
+ * Notify sleeping CLEANALLRUV threads to stop
+ */
void
-set_released_rid( int rid )
+stop_ruv_cleaning()
{
- released_rid = rid;
+ if(notify_lock){
+ PR_Lock( notify_lock );
+ PR_NotifyCondVar( notify_cvar );
+ PR_Unlock( notify_lock );
+ }
}
+/*
+ * Write our logging to the task and error log
+ */
void
-delete_released_rid()
+cleanruv_log(Slapi_Task *task, char *task_type, char *fmt, ...)
{
- released_rid = 0;
+ va_list ap1;
+ va_list ap2;
+ va_list ap3;
+ va_list ap4;
+ char *errlog_fmt;
+
+ va_start(ap1, fmt);
+ va_start(ap2, fmt);
+ va_start(ap3, fmt);
+ va_start(ap4, fmt);
+
+ if(task){
+ slapi_task_log_notice_ext(task, fmt, ap1);
+ slapi_task_log_status_ext(task, fmt, ap2);
+ slapi_task_inc_progress(task);
+ }
+ errlog_fmt = PR_smprintf("%s: %s\n",task_type, fmt);
+ slapi_log_error_ext(SLAPI_LOG_FATAL, repl_plugin_name, errlog_fmt, ap3, ap4);
+ slapi_ch_free_string(&errlog_fmt);
+
+ va_end(ap1);
+ va_end(ap2);
+ va_end(ap3);
+ va_end(ap4);
}
+
diff --git a/ldap/servers/plugins/replication/repl5_ruv.c b/ldap/servers/plugins/replication/repl5_ruv.c
index 9ad5c5a..fb8ea09 100644
--- a/ldap/servers/plugins/replication/repl5_ruv.c
+++ b/ldap/servers/plugins/replication/repl5_ruv.c
@@ -487,9 +487,9 @@ ruv_replace_replica_purl (RUV *ruv, ReplicaId rid, const char *replica_purl)
replica = ruvGetReplica (ruv, rid);
if (replica != NULL)
{
- if (strcmp(replica->replica_purl, replica_purl)) { /* purl updated */
+ if (replica->replica_purl == NULL || strcmp(replica->replica_purl, replica_purl)) { /* purl updated */
/* Replace replica_purl in RUV since supplier has been updated. */
- slapi_ch_free((void **)&(replica->replica_purl));
+ slapi_ch_free_string(&replica->replica_purl);
replica->replica_purl = slapi_ch_strdup(replica_purl);
/* Also, reset csn and min_csn. */
replica->csn = replica->min_csn = NULL;
@@ -863,10 +863,6 @@ ruv_covers_csn_internal(const RUV *ruv, const CSN *csn, PRBool strict)
{
rid = csn_get_replicaid(csn);
replica = ruvGetReplica (ruv, rid);
- if((is_released_rid(rid)) || (replica == NULL && is_already_released_rid()) ){
- /* this is a released rid, so return true */
- return PR_TRUE;
- }
if (replica == NULL)
{
/*
@@ -930,7 +926,7 @@ ruv_covers_csn_strict(const RUV *ruv, const CSN *csn)
* or max{maxcsns of all ruv elements} if get_the_max != 0.
*/
static int
-ruv_get_min_or_max_csn(const RUV *ruv, CSN **csn, int get_the_max)
+ruv_get_min_or_max_csn(const RUV *ruv, CSN **csn, int get_the_max, ReplicaId rid)
{
int return_value;
@@ -960,12 +956,18 @@ ruv_get_min_or_max_csn(const RUV *ruv, CSN **csn, int get_the_max)
{
continue;
}
-
- if (found == NULL ||
- (!get_the_max && csn_compare(found, replica->csn)>0) ||
- ( get_the_max && csn_compare(found, replica->csn)<0))
- {
- found = replica->csn;
+ if(rid){ /* we are only interested in this rid's maxcsn */
+ if(replica->rid == rid){
+ found = replica->csn;
+ break;
+ }
+ } else {
+ if (found == NULL ||
+ (!get_the_max && csn_compare(found, replica->csn)>0) ||
+ ( get_the_max && csn_compare(found, replica->csn)<0))
+ {
+ found = replica->csn;
+ }
}
}
if (found == NULL)
@@ -983,15 +985,20 @@ ruv_get_min_or_max_csn(const RUV *ruv, CSN **csn, int get_the_max)
}
int
+ruv_get_rid_max_csn(const RUV *ruv, CSN **csn, ReplicaId rid){
+ return ruv_get_min_or_max_csn(ruv, csn, 1 /* get the max */, rid);
+}
+
+int
ruv_get_max_csn(const RUV *ruv, CSN **csn)
{
- return ruv_get_min_or_max_csn(ruv, csn, 1 /* get the max */);
+ return ruv_get_min_or_max_csn(ruv, csn, 1 /* get the max */, 0 /* rid */);
}
int
ruv_get_min_csn(const RUV *ruv, CSN **csn)
{
- return ruv_get_min_or_max_csn(ruv, csn, 0 /* get the min */);
+ return ruv_get_min_or_max_csn(ruv, csn, 0 /* get the min */, 0 /* rid */);
}
int
@@ -1097,6 +1104,22 @@ ruv_to_bervals(const RUV *ruv, struct berval ***bvals)
return return_value;
}
+void
+ruv_get_cleaned_rids(RUV *ruv, ReplicaId *rids)
+{
+ RUVElement *replica;
+ int cookie;
+ int i = 0;
+
+ for (replica = dl_get_first (ruv->elements, &cookie); replica;
+ replica = dl_get_next (ruv->elements, &cookie))
+ {
+ if(is_cleaned_rid(replica->rid)){
+ rids[i++] = replica->rid;
+ }
+ }
+}
+
int
ruv_to_smod(const RUV *ruv, Slapi_Mod *smod)
{
@@ -1428,15 +1451,14 @@ int ruv_add_csn_inprogress (RUV *ruv, const CSN *csn)
slapi_rwlock_wrlock (ruv->lock);
if(is_cleaned_rid(rid)){
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_add_csn_inprogress: invalid replica ID"
- "(%d), aborting update\n", rid);
/* return success because we want to consume the update, but not perform it */
+ rc = RUV_COVERS_CSN;
goto done;
}
replica = ruvGetReplica (ruv, rid);
if (replica == NULL)
{
- replica = ruvAddReplicaNoCSN (ruv, csn_get_replicaid (csn), NULL/*purl*/);
+ replica = ruvAddReplicaNoCSN (ruv, rid, NULL/*purl*/);
if (replica == NULL)
{
if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) {
diff --git a/ldap/servers/plugins/replication/repl5_ruv.h b/ldap/servers/plugins/replication/repl5_ruv.h
index d329dc3..f2d96f3 100644
--- a/ldap/servers/plugins/replication/repl5_ruv.h
+++ b/ldap/servers/plugins/replication/repl5_ruv.h
@@ -117,6 +117,7 @@ PRBool ruv_covers_csn(const RUV *ruv, const CSN *csn);
PRBool ruv_covers_csn_strict(const RUV *ruv, const CSN *csn);
int ruv_get_min_csn(const RUV *ruv, CSN **csn);
int ruv_get_max_csn(const RUV *ruv, CSN **csn);
+int ruv_get_rid_max_csn(const RUV *ruv, CSN **csn, ReplicaId rid);
int ruv_enumerate_elements (const RUV *ruv, FNEnumRUV fn, void *arg);
int ruv_to_smod(const RUV *ruv, Slapi_Mod *smod);
int ruv_last_modified_to_smod(const RUV *ruv, Slapi_Mod *smod);
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index f6378d2..88bb9e3 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -1338,7 +1338,7 @@ replica_config_get_mtnode_by_dn(const char *dn)
/*
* Decode the ber element passed to us by the cleanAllRUV task
*/
-static int
+int
decode_cleanruv_payload(struct berval *extop_value, char **payload)
{
BerElement *tmp_bere = NULL;
@@ -1373,313 +1373,313 @@ free_and_return:
return rc;
}
-/*
- * Process the REPL_CLEANRUV_OID extended operation.
- *
- * The payload consists of the replica ID, and the repl root dn. Since this is
- * basically a replication operation, it could of originated here and bounced
- * back from another master. So check the rid against the "cleaned_rid". If
- * it's a match, then we were already here, and we can just return success.
- *
- * Otherwise, we the set the cleaned_rid from the payload, fire off extended ops
- * to all the replica agreements on this replica. Then perform the actual
- * cleanruv_task on this replica.
- */
int
-multimaster_extop_cleanruv(Slapi_PBlock *pb){
+multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
+{
multimaster_mtnode_extension *mtnode_ext;
PRThread *thread = NULL;
- Repl_Connection *conn;
- const Slapi_DN *dn;
- Replica *r = NULL;
- Object *agmt_obj;
- Repl_Agmt *agmt;
- ConnResult crc;
- cleanruv_data *data = NULL;
- struct berval *extop_value;
+ cleanruv_data *data;
+ Replica *r;
+ ReplicaId rid;
+ CSN *maxcsn;
+ struct berval *extop_payload;
char *extop_oid;
char *repl_root;
char *payload = NULL;
char *iter;
- int send_msgid = 0;
- int agmt_count = 0;
- int rid = 0;
int rc = 0;
slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
- slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_value);
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_OID) != 0 ||
- NULL == extop_value || NULL == extop_value->bv_val){
+ NULL == extop_payload || NULL == extop_payload->bv_val){
/* something is wrong, error out */
- return -1;
+ return LDAP_OPERATIONS_ERROR;
}
/*
- * Extract the rid and repl_root from the payload
+ * Decode the payload, and grab our settings
*/
- if(decode_cleanruv_payload(extop_value, &payload)){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to decode payload. Aborting ext op\n");
- return -1;
+ if(decode_cleanruv_payload(extop_payload, &payload)){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: failed to decode payload. Aborting ext op\n");
+ return LDAP_OPERATIONS_ERROR;
}
rid = atoi(ldap_utf8strtok_r(payload, ":", &iter));
repl_root = ldap_utf8strtok_r(iter, ":", &iter);
- /*
- * If we already cleaned this server, just return success
- */
- if(is_cleaned_rid(rid)){
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "cleanAllRUV_extop: rid (%d) has already been cleaned, skipping\n",rid);
- return rc;
+ if(!is_cleaned_rid(rid) || is_task_aborted(rid)){
+ /* This replica has already been aborted, or was never cleaned, or already finished cleaning */
+ goto out;
} else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: cleaning rid (%d)...\n", rid);
- set_cleaned_rid(rid);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: aborting cleanallruv task for rid(%d)\n", rid);
}
-
/*
* Get the node, so we can get the replica and its agreements
*/
if((mtnode_ext = replica_config_get_mtnode_by_dn(repl_root)) == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to get replication node "
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: failed to get replication node "
"from (%s), aborting operation\n", repl_root);
- return -1;
+ rc = LDAP_OPERATIONS_ERROR;
+ goto out;
}
- if (mtnode_ext->replica)
+ if (mtnode_ext->replica){
object_acquire (mtnode_ext->replica);
- if (mtnode_ext->replica == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: replica is missing from (%s), "
+ } else {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: replica is missing from (%s), "
"aborting operation\n",repl_root);
rc = LDAP_OPERATIONS_ERROR;
- goto free_and_return;
+ goto out;
}
r = (Replica*)object_get_data (mtnode_ext->replica);
+ if(r == NULL){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: replica is NULL, aborting task\n");
+ rc = LDAP_OPERATIONS_ERROR;
+ goto out;
+ }
/*
- * Send out extended ops to each repl agreement
+ * Prepare the abort data
*/
- agmt_obj = agmtlist_get_first_agreement_for_replica (r);
- while (agmt_obj)
- {
- agmt = (Repl_Agmt*)object_get_data (agmt_obj);
- if(!agmt_is_enabled(agmt)){
- agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
- continue;
- }
- dn = agmt_get_dn_byref(agmt);
- conn = (Repl_Connection *)agmt_get_connection(agmt);
- if(conn == NULL){
- /* no connection for this agreement, move on to the next agmt */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: the replica (%s), is "
- "missing the connection. This replica will not be cleaned.\n", slapi_sdn_get_dn(dn));
- agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
- continue;
- }
- crc = conn_connect(conn);
- if (CONN_OPERATION_FAILED == crc ){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to connect "
- "to repl agreement connection (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_TRANSIENT_ERROR);
- rc = LDAP_OPERATIONS_ERROR;
- } else if (CONN_SSL_NOT_ENABLED == crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to acquire "
- "repl agmt connection (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_FATAL_ERROR);
- rc = LDAP_OPERATIONS_ERROR;
- } else {
- conn_cancel_linger(conn);
- crc = conn_send_extended_operation(conn, REPL_CLEANRUV_OID, extop_value, NULL, &send_msgid);
- if (CONN_OPERATION_SUCCESS != crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to send "
- "clean_ruv extended op to repl agmt (%s), error %d\n", slapi_sdn_get_dn(dn), crc);
- rc = LDAP_OPERATIONS_ERROR;
- } else {
- /* success */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: successfully sent "
- "extended op to (%s)\n",slapi_sdn_get_dn(dn) );
- agmt_count++;
- }
- conn_start_linger(conn);
- }
- if(crc != CONN_OPERATION_SUCCESS){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: replica (%s) has not "
- "been cleaned. You will need to rerun the CLEANALLRUV task on this replica\n",
- slapi_sdn_get_dn(dn) );
- rc = LDAP_OPERATIONS_ERROR;
- }
- agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
- }
-
- /* now clean the ruv */
- replica_execute_cleanruv_task_ext(mtnode_ext->replica, rid);
-
-free_and_return:
-
- if(rc == 0 && agmt_count > 0){
- /*
- * Launch the cleanruv monitoring thread. Once all the replicas are cleaned it will release the rid
- */
- data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
- if (data == NULL) {
- slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to allocate "
- "cleanruv_Data\n");
- return -1;
- }
- data->repl_obj = mtnode_ext->replica;
- data->rid = rid;
-
- thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_monitor_thread,
- (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
- PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
- if (thread == NULL) {
- slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: unable to create cleanAllRUV "
- "monitoring thread. Aborting task.\n");
+ data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
+ if (data == NULL) {
+ slapi_log_error( SLAPI_LOG_REPL, repl_plugin_name, "Abort cleanAllRUV task: failed to allocate "
+ "abort_cleanruv_data. Aborting task.\n");
+ rc = LDAP_OPERATIONS_ERROR;
+ goto out;
+ }
+ data->repl_obj = mtnode_ext->replica; /* released in replica_abort_task_thread() */
+ data->replica = r;
+ data->task = NULL;
+ data->payload = slapi_ch_bvdup(extop_payload);
+ data->rid = rid;
+ data->repl_root = slapi_ch_strdup(repl_root);
+ /*
+ * Stop the cleaning, and delete the rid
+ */
+ maxcsn = replica_get_cleanruv_maxcsn(r, rid);
+ delete_cleaned_rid(r, rid, maxcsn);
+ csn_free(&maxcsn);
+ add_aborted_rid(rid, r, repl_root);
+ stop_ruv_cleaning();
+ /*
+ * Send out the extended ops to the replicas
+ */
+ thread = PR_CreateThread(PR_USER_THREAD, replica_abort_task_thread,
+ (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
+ if (thread == NULL) {
+ if(mtnode_ext->replica){
+ object_release(mtnode_ext->replica);
}
- } else if (rc == 0){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: Successfully Finished.\n");
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanALLRUV_extop: failed to clean rid (%d), error (%d)\n",rid, rc);
+ slapi_log_error( SLAPI_LOG_REPL, repl_plugin_name, "Abort cleanAllRUV task: unable to create abort "
+ "thread. Aborting task.\n");
+ rc = LDAP_OPERATIONS_ERROR;
}
- if (mtnode_ext->replica)
- object_release (mtnode_ext->replica);
+out:
+ slapi_ch_free_string(&payload);
return rc;
}
-
/*
- * Process the REPL_RELEASERUV_OID extended operation
+ * Process the REPL_CLEANRUV_OID extended operation.
*
- * Once, all the replicas in the replication farm have been cleaned, then
- * we need to "release" the cleaned_rid, or else we will reject all updates
- * that come from that rid until we restart the server.
+ * The payload consists of the replica ID, repl root dn, and the maxcsn. Since this is
+ * basically a replication operation, it could of originated here and bounced
+ * back from another master. So check the rid against the "cleaned_rid". If
+ * it's a match, then we were already here, and we can just return success.
*
- * We set the cleaned_ruv to zero(invalid rid), and then fire off extended
- * operations to all of the replicas
+ * Otherwise, we the set the cleaned_rid from the payload, fire off extended ops
+ * to all the replica agreements on this replica. Then perform the actual
+ * cleanruv_task on this replica.
*/
int
-multimaster_extop_releaseruv(Slapi_PBlock *pb){
+multimaster_extop_cleanruv(Slapi_PBlock *pb)
+{
multimaster_mtnode_extension *mtnode_ext;
- Repl_Connection *conn;
- const Slapi_DN *dn;
+ PRThread *thread = NULL;
Replica *r = NULL;
- Object *agmt_obj;
- Repl_Agmt *agmt;
- ConnResult crc;
- struct berval *extop_value;
- char *payload = NULL;
+ cleanruv_data *data = NULL;
+ CSN *maxcsn;
+ struct berval *extop_payload;
+ struct berval *resp_bval = NULL;
+ BerElement *resp_bere = NULL;
char *extop_oid;
char *repl_root;
+ char *payload = NULL;
+ char *csnstr = NULL;
char *iter;
- int send_msgid = 0;
+ int release_it = 0;
int rid = 0;
int rc = 0;
slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
- slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_value);
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
- if (NULL == extop_oid || strcmp(extop_oid, REPL_RELEASERUV_OID) != 0 ||
- NULL == extop_value || NULL == extop_value->bv_val){
+ if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_OID) != 0 ||
+ NULL == extop_payload || NULL == extop_payload->bv_val){
/* something is wrong, error out */
- return -1;
+ rc = -1;
+ goto free_and_return;
}
-
- if(decode_cleanruv_payload(extop_value, &payload)){
- slapi_log_error(SLAPI_LOG_FATAL,repl_plugin_name, "releaseRUV_extop: failed to decode payload, aborting ext op.\n");
- return -1;
+ /*
+ * Decode the payload
+ */
+ if(decode_cleanruv_payload(extop_payload, &payload)){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to decode payload. Aborting ext op\n");
+ rc = -1;
+ goto free_and_return;
}
rid = atoi(ldap_utf8strtok_r(payload, ":", &iter));
repl_root = ldap_utf8strtok_r(iter, ":", &iter);
-
+ csnstr = ldap_utf8strtok_r(iter, ":", &iter);
+ maxcsn = csn_new();
+ csn_init_by_string(maxcsn, csnstr);
/*
- * If we already released this ruv, just return.
+ * If we already cleaned this server, just return success
*/
- if(is_released_rid(rid) || is_already_released_rid()){
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "cleanAllRUV_extop: rid (%d) has already been released, skipping.\n",rid);
- return 0;
+ if(is_cleaned_rid(rid)){
+ csn_free(&maxcsn);
+ rc = 1;
+ goto free_and_return;
} else {
- /* set the released rid, and trigger trimming */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: releasing rid (%d)...\n", rid);
- set_released_rid((int)rid);
- trigger_cl_trimming();
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: cleaning rid (%d)...\n", rid);
}
+ /*
+ * Get the node, so we can get the replica and its agreements
+ */
if((mtnode_ext = replica_config_get_mtnode_by_dn(repl_root)) == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_extop: failed to get node "
- "from replication root dn(%s), aborting operation.\n", repl_root);
- return -1;
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to get replication node "
+ "from (%s), aborting operation\n", repl_root);
+ rc = -1;
+ goto free_and_return;
}
- if (mtnode_ext->replica)
+
+ if (mtnode_ext->replica){
object_acquire (mtnode_ext->replica);
+ release_it = 1;
+ }
if (mtnode_ext->replica == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_extop: replica is missing from (%s), "
- "aborting operation.\n", repl_root);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica is missing from (%s), "
+ "aborting operation\n",repl_root);
rc = LDAP_OPERATIONS_ERROR;
goto free_and_return;
}
+
r = (Replica*)object_get_data (mtnode_ext->replica);
- /*
- * Loop over the agreements, and send out extended ops
- */
- agmt_obj = agmtlist_get_first_agreement_for_replica (r);
- while (agmt_obj)
- {
- agmt = (Repl_Agmt*)object_get_data (agmt_obj);
- if(!agmt_is_enabled(agmt)){
- agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
- continue;
+ if(r == NULL){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica is NULL, aborting task\n");
+ rc = -1;
+ goto free_and_return;
+ }
+
+ if(replica_get_type(r) != REPLICA_TYPE_READONLY){
+ /*
+ * Launch the cleanruv monitoring thread. Once all the replicas are cleaned it will release the rid
+ *
+ * This will also release mtnode_ext->replica
+ */
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: launching cleanAllRUV thread...\n");
+ data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
+ if (data == NULL) {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to allocate "
+ "cleanruv_Data\n");
+ rc = -1;
+ goto free_and_return;
}
- dn = agmt_get_dn_byref(agmt);
- conn = (Repl_Connection *)agmt_get_connection(agmt);
- if(conn == NULL){
- /* no connection for this agreement, log error, and move on */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: the replica (%s), is "
- "missing the connection. This replica will not be released.\n", slapi_sdn_get_dn(dn));
- agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
- continue;
+ data->repl_obj = mtnode_ext->replica;
+ data->replica = r;
+ data->rid = rid;
+ data->task = NULL;
+ data->maxcsn = maxcsn;
+ data->payload = slapi_ch_bvdup(extop_payload);
+
+ thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_thread_ext,
+ (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
+ if (thread == NULL) {
+ rc = -1;
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: unable to create cleanAllRUV "
+ "monitoring thread. Aborting task.\n");
}
- crc = conn_connect(conn);
- if (CONN_OPERATION_FAILED == crc ){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_extop: failed to connect "
- "to repl agreement connection (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_TRANSIENT_ERROR);
- rc = LDAP_OPERATIONS_ERROR;
- } else if (CONN_SSL_NOT_ENABLED == crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_extop: failed to acquire "
- "repl agmt connection (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_FATAL_ERROR);
- rc = LDAP_OPERATIONS_ERROR;
- } else {
- conn_cancel_linger(conn);
- crc = conn_send_extended_operation(conn, REPL_RELEASERUV_OID, extop_value, NULL, &send_msgid);
- if (CONN_OPERATION_SUCCESS != crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to send "
- "releaseRUV extended op to repl agmt (%s), error %d\n", slapi_sdn_get_dn(dn), crc);
- rc = LDAP_OPERATIONS_ERROR;
+ } else { /* this is a read-only consumer */
+ /*
+ * wait for the maxcsn to be covered
+ */
+ Object *ruv_obj;
+ const RUV *ruv;
+
+ ruv_obj = replica_get_ruv(r);
+ ruv = object_get_data (ruv_obj);
+
+ while(!is_task_aborted(rid) && !slapi_is_shutting_down()){
+ if(!ruv_contains_replica(ruv, rid)){
+ /* we've already been cleaned */
+ break;
+ }
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: checking if we're caught up...\n");
+ if(ruv_covers_csn(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
+ /* We are caught up */
+ break;
} else {
- /* success */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: successfully sent "
- "releaseRUV extended op to (%s)\n",slapi_sdn_get_dn(dn) );
- rc = 0;
+ char csnstr[CSN_STRSIZE];
+ csn_as_string(maxcsn, PR_FALSE, csnstr);
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: not ruv caught up maxcsn(%s)\n", csnstr);
}
- conn_start_linger(conn);
- }
- if(crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: replica (%s) has not "
- "been released. You will need to rerun the task.\n",
- slapi_sdn_get_dn(dn) );
+ DS_Sleep(PR_SecondsToInterval(5));
}
- agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: we're caught up...\n");
+ /*
+ * Set cleaned rid in memory only - does not survive a server restart
+ */
+ set_cleaned_rid(rid);
+ /*
+ * Clean the ruv
+ */
+ replica_execute_cleanruv_task_ext(mtnode_ext->replica, rid);
+
+ /* free everything */
+ object_release(ruv_obj);
+ csn_free(&maxcsn);
+ if (mtnode_ext->replica && release_it)
+ object_release (mtnode_ext->replica);
+ /*
+ * This read-only replica has no easy way to tell when it's safe to release the rid.
+ * So we won't release it, not until a server restart.
+ */
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: You must restart the server if you want to reuse rid(%d).\n", rid);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Successfully cleaned rid(%d).\n", rid);
}
free_and_return:
+ if(rc && release_it){
+ if (mtnode_ext->replica)
+ object_release (mtnode_ext->replica);
+ }
+ slapi_ch_free_string(&payload);
+
/*
- * Set the rid as "ALREADY_RELEASED, and remove the cleaned ruv
+ * Craft a message so we know this replica supports the task
*/
- if(rc == 0){
- set_released_rid(ALREADY_RELEASED);
- delete_cleaned_rid();
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: Successfully released rid (%d)\n", rid);
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: Failed to release rid(%d), error (%d), "
- "please retry the task.\n",rid, rc);
- }
+ if ((resp_bere = der_alloc())){
- if(mtnode_ext->replica)
- object_release (mtnode_ext->replica);
+ ber_int_t response = 1;
+
+ ber_printf(resp_bere, "{e}", response);
+ ber_flatten(resp_bere, &resp_bval);
+ slapi_pblock_set(pb, SLAPI_EXT_OP_RET_VALUE, resp_bval);
+ slapi_send_ldap_result(pb, LDAP_SUCCESS, NULL, NULL, 0, NULL);
+ /* resp_bere */
+ if (NULL != resp_bere)
+ {
+ ber_free(resp_bere, 1);
+ }
+ /* resp_bval */
+ if (NULL != resp_bval)
+ {
+ ber_bvfree(resp_bval);
+ }
+ }
return rc;
}
diff --git a/ldap/servers/plugins/replication/repl_globals.c b/ldap/servers/plugins/replication/repl_globals.c
index 9445394..383d562 100644
--- a/ldap/servers/plugins/replication/repl_globals.c
+++ b/ldap/servers/plugins/replication/repl_globals.c
@@ -110,6 +110,8 @@ const char *type_replicaChangeCount = "nsds5ReplicaChangeCount";
const char *type_replicaTombstonePurgeInterval = "nsds5ReplicaTombstonePurgeInterval";
const char *type_replicaLegacyConsumer = "nsds5ReplicaLegacyConsumer";
const char *type_ruvElementUpdatetime = "nsruvReplicaLastModified";
+const char *type_replicaCleanRUV = "nsds5ReplicaCleanRUV";
+const char *type_replicaAbortCleanRUV = "nsds5ReplicaAbortCleanRUV";
/* Attribute names for replication agreement attributes */
const char *type_nsds5ReplicaHost = "nsds5ReplicaHost";
@@ -128,6 +130,7 @@ const char *type_nsds5ReplicaBusyWaitTime = "nsds5ReplicaBusyWaitTime";
const char *type_nsds5ReplicaSessionPauseTime = "nsds5ReplicaSessionPauseTime";
const char *type_nsds5ReplicaEnabled = "nsds5ReplicaEnabled";
const char *type_nsds5ReplicaStripAttrs = "nsds5ReplicaStripAttrs";
+const char *type_nsds5ReplicaCleanRUVnotified = "nsds5ReplicaCleanRUVNotified";
/* windows sync specific attributes */
const char *type_nsds7WindowsReplicaArea = "nsds7WindowsReplicaSubtree";
@@ -139,7 +142,7 @@ const char *type_nsds7DirsyncCookie = "nsds7DirsyncCookie";
const char *type_winSyncInterval = "winSyncInterval";
const char *type_oneWaySync = "oneWaySync";
-/* To Allow Consumer Initialisation when adding an agreement - */
+/* To Allow Consumer Initialization when adding an agreement - */
const char *type_nsds5BeginReplicaRefresh = "nsds5BeginReplicaRefresh";
static int repl_active_threads;
diff --git a/ldap/servers/slapd/log.c b/ldap/servers/slapd/log.c
index 2ffd1f6..e622485 100644
--- a/ldap/servers/slapd/log.c
+++ b/ldap/servers/slapd/log.c
@@ -1969,6 +1969,33 @@ slapi_log_error( int severity, char *subsystem, char *fmt, ... )
}
int
+slapi_log_error_ext(int severity, char *subsystem, char *fmt, va_list varg1, va_list varg2)
+{
+ int rc = 0;
+
+ if ( severity < SLAPI_LOG_MIN || severity > SLAPI_LOG_MAX ) {
+ (void)slapd_log_error_proc( subsystem, "slapi_log_error: invalid severity %d (message %s)\n",
+ severity, fmt );
+ return( -1 );
+ }
+
+ if (
+ #ifdef _WIN32
+ *module_ldap_debug
+ #else
+ slapd_ldap_debug
+ #endif
+ & slapi_log_map[ severity ] )
+ {
+ rc = slapd_log_error_proc_internal( subsystem, fmt, varg1, varg2 );
+ } else {
+ rc = 0; /* nothing to be logged --> always return success */
+ }
+
+ return( rc );
+}
+
+int
slapi_is_loglevel_set ( const int loglevel )
{
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index dc3fd38..f238bef 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -5580,6 +5580,7 @@ int slapi_log_error( int severity, char *subsystem, char *fmt, ... )
#else
;
#endif
+int slapi_log_error_ext( int severity, char *subsystem, char *fmt, va_list varg1, va_list varg2);
/* allowed values for the "severity" parameter */
#define SLAPI_LOG_FATAL 0
@@ -6090,6 +6091,8 @@ void slapi_task_log_notice(Slapi_Task *task, char *format, ...)
#else
;
#endif
+void slapi_task_log_status_ext(Slapi_Task *task, char *format, va_list varg);
+void slapi_task_log_notice_ext(Slapi_Task *task, char *format, va_list varg);
/*
* slapi_new_task: create new task, fill in DN, and setup modify callback
diff --git a/ldap/servers/slapd/task.c b/ldap/servers/slapd/task.c
index 6d60775..5fc0b08 100644
--- a/ldap/servers/slapd/task.c
+++ b/ldap/servers/slapd/task.c
@@ -215,6 +215,17 @@ void slapi_task_log_status(Slapi_Task *task, char *format, ...)
slapi_task_status_changed(task);
}
+void slapi_task_log_status_ext(Slapi_Task *task, char *format, va_list ap)
+{
+ if (! task->task_status)
+ task->task_status = (char *)slapi_ch_malloc(10 * LOG_BUFFER);
+ if (! task->task_status)
+ return; /* out of memory? */
+
+ PR_vsnprintf(task->task_status, (10 * LOG_BUFFER), format, ap);
+ slapi_task_status_changed(task);
+}
+
/* this adds a line to the 'nsTaskLog' value, which is cumulative (anything
* logged here is added to the end)
*/
@@ -266,6 +277,51 @@ void slapi_task_log_notice(Slapi_Task *task, char *format, ...)
slapi_task_status_changed(task);
}
+void slapi_task_log_notice_ext(Slapi_Task *task, char *format, va_list ap)
+{
+ char buffer[LOG_BUFFER];
+ size_t len;
+
+ PR_vsnprintf(buffer, LOG_BUFFER, format, ap);
+
+ if (task->task_log_lock) {
+ PR_Lock(task->task_log_lock);
+ }
+ len = 2 + strlen(buffer) + (task->task_log ? strlen(task->task_log) : 0);
+ if ((len > MAX_SCROLLBACK_BUFFER) && task->task_log) {
+ size_t i;
+ char *newbuf;
+
+ /* start from middle of buffer, and find next linefeed */
+ i = strlen(task->task_log)/2;
+ while (task->task_log[i] && (task->task_log[i] != '\n'))
+ i++;
+ if (task->task_log[i])
+ i++;
+ len = strlen(task->task_log) - i + 2 + strlen(buffer);
+ newbuf = (char *)slapi_ch_malloc(len);
+ strcpy(newbuf, task->task_log + i);
+ slapi_ch_free((void **)&task->task_log);
+ task->task_log = newbuf;
+ } else {
+ if (! task->task_log) {
+ task->task_log = (char *)slapi_ch_malloc(len);
+ task->task_log[0] = 0;
+ } else {
+ task->task_log = (char *)slapi_ch_realloc(task->task_log, len);
+ }
+ }
+
+ if (task->task_log[0])
+ strcat(task->task_log, "\n");
+ strcat(task->task_log, buffer);
+ if (task->task_log_lock) {
+ PR_Unlock(task->task_log_lock);
+ }
+
+ slapi_task_status_changed(task);
+}
+
/* update attributes in the entry under "cn=tasks" to match the current
* status of the task. */
void slapi_task_status_changed(Slapi_Task *task)
commit 0d453f2e31cdfff0ad68b0393edcc87fd58acde6
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Aug 1 15:45:21 2012 -0400
Ticket 413 - "Server is unwilling to perform" when running ldapmodify on nsds5ReplicaStripAttrs
Bug Description: trying to set nsds5ReplicaStripAttrs yields an error 53
Fix Description: Needed to check for this new attribute when in the agmtlist modify
callback. When it doesn't recognize the attribute it returns error 53.
https://fedorahosted.org/389/ticket/413
Reviewed by: Richm(Thanks!)
(cherry picked from commit e86013506df7f3da280d67be2b3bd9ab24b241bf)
diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h
index b04d9c4..d7ba6a6 100644
--- a/ldap/servers/plugins/replication/repl5.h
+++ b/ldap/servers/plugins/replication/repl5.h
@@ -358,6 +358,7 @@ int agmt_has_protocol(Repl_Agmt *agmt);
PRBool agmt_is_enabled(Repl_Agmt *ra);
int agmt_set_enabled_from_entry(Repl_Agmt *ra, Slapi_Entry *e);
char **agmt_get_attrs_to_strip(Repl_Agmt *ra);
+int agmt_set_attrs_to_strip(Repl_Agmt *ra, Slapi_Entry *e);
typedef struct replica Replica;
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index 4beb13a..2978aba 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -2547,3 +2547,27 @@ agmt_get_attrs_to_strip(Repl_Agmt *ra)
return NULL;
}
}
+
+int
+agmt_set_attrs_to_strip(Repl_Agmt *ra, Slapi_Entry *e)
+{
+ char *tmpstr = NULL;
+
+ PR_Lock(ra->lock);
+
+ tmpstr = slapi_entry_attr_get_charptr(e, type_nsds5ReplicaStripAttrs);
+ if (NULL != tmpstr){
+ if(ra->attrs_to_strip){
+ slapi_ch_array_free(&ra->attrs_to_strip);
+ }
+ ra->attrs_to_strip = slapi_str2charray_ext(tmpstr, " ", 0);
+ PR_Unlock(ra->lock);
+ prot_notify_agmt_changed(ra->protocol, ra->long_name);
+ slapi_ch_free_string(&tmpstr);
+ return 0;
+ }
+
+ PR_Unlock(ra->lock);
+
+ return -1;
+}
diff --git a/ldap/servers/plugins/replication/repl5_agmtlist.c b/ldap/servers/plugins/replication/repl5_agmtlist.c
index 1c18a85..86f06bf 100644
--- a/ldap/servers/plugins/replication/repl5_agmtlist.c
+++ b/ldap/servers/plugins/replication/repl5_agmtlist.c
@@ -499,6 +499,15 @@ agmtlist_modify_callback(Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry
rc = SLAPI_DSE_CALLBACK_ERROR;
}
}
+ else if (slapi_attr_types_equivalent(mods[i]->mod_type, type_nsds5ReplicaStripAttrs))
+ {
+ if(agmt_set_attrs_to_strip(agmt, e) != 0){
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: "
+ "failed to set replica agmt attributes to strip for %s\n",agmt_get_long_name(agmt));
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ }
+ }
else if (0 == windows_handle_modify_agreement(agmt, mods[i]->mod_type, e))
{
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: "
commit 3168f04d96f962b0c506d0ee676acc9056566514
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Tue Jul 17 16:58:47 2012 -0700
Coverity defects
12811: Unused pointer value
preop_modrdn (plugins/uiduniq/uid.c)
Removed unused variable "dn".
12812: Unused pointer value
ldbm_back_next_search_entry_ext (slapd/back-ldbm/ldbm_search.c)
Removed unused variable "base".
12813: Uninitialized pointer read
string_values2keys (plugins/syntaxes/string.c)
Commit f6b74ad18a52720c4558d4a46cbb2eeb21109033 missed to set
an value bvp for the newly added case ((syntax & SYNTAX_DN) &&
(value_flags & SLAPI_ATTR_FLAG_NORMALIZED_CES)), which caused
the uninitialized pointer read. This patch sets bvp for all
3 cases.
(cherry picked from commit c952e16707a6a0ad98c6985484b58d0844fb8aa0)
diff --git a/ldap/servers/plugins/uiduniq/uid.c b/ldap/servers/plugins/uiduniq/uid.c
index ebe6b63..d9e6ba4 100644
--- a/ldap/servers/plugins/uiduniq/uid.c
+++ b/ldap/servers/plugins/uiduniq/uid.c
@@ -862,7 +862,6 @@ preop_modrdn(Slapi_PBlock *pb)
int err;
char *markerObjectClass=NULL;
char *requiredObjectClass=NULL;
- const char *dn = NULL;
Slapi_DN *sdn = NULL;
Slapi_DN *superior;
char *rdn;
@@ -913,8 +912,6 @@ preop_modrdn(Slapi_PBlock *pb)
err = slapi_pblock_get(pb, SLAPI_MODRDN_TARGET_SDN, &sdn);
if (err) { result = uid_op_error(31); break; }
- dn = slapi_sdn_get_dn(sdn);
-
/* Get superior value - unimplemented in 3.0/4.0/5.0 DS */
err = slapi_pblock_get(pb, SLAPI_MODRDN_NEWSUPERIOR_SDN, &superior);
if (err) { result = uid_op_error(32); break; }
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c
index 97eac2b..5fbea24 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_search.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c
@@ -1327,7 +1327,6 @@ ldbm_back_next_search_entry_ext( Slapi_PBlock *pb, int use_extension )
int managedsait;
Slapi_Attr *attr;
Slapi_Filter *filter;
- const char *base;
back_search_result_set *sr;
ID id;
struct backentry *e;
@@ -1380,7 +1379,6 @@ ldbm_back_next_search_entry_ext( Slapi_PBlock *pb, int use_extension )
"Null target DN", 0, NULL );
return( -1 );
}
- base = slapi_sdn_get_dn(basesdn);
if (sr->sr_current_sizelimit >= 0) {
/*
commit 5ff0a02468c530403b55a4a1d3555cf20a8db904
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Jun 13 18:41:47 2012 -0400
COVERITY FIXES
12762
12763
12764
12765
12766
12767
12768
12769
12771
Reviewed by: Noriko & Richm (Thanks!)
diff --git a/ldap/servers/plugins/replication/cl5_clcache.c b/ldap/servers/plugins/replication/cl5_clcache.c
index 5816837..202cb64 100644
--- a/ldap/servers/plugins/replication/cl5_clcache.c
+++ b/ldap/servers/plugins/replication/cl5_clcache.c
@@ -680,6 +680,7 @@ clcache_skip_change ( CLC_Buffer *buf )
*/
skip = 0;
}
+ csn_free(&cons_maxcsn);
break;
}
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index a5d608a..771af61 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -1176,7 +1176,7 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, char *returntext)
{
PRThread *thread = NULL;
Repl_Connection *conn;
- Replica *replica = (Replica*)object_get_data (r);
+ Replica *replica;
Object *agmt_obj;
Repl_Agmt *agmt;
ConnResult crc;
@@ -1189,7 +1189,16 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, char *returntext)
int rc = 0;
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: cleaning rid (%d)...\n",(int)rid);
- set_cleaned_rid(rid);
+
+ /*
+ * Grab the replica
+ */
+ if(r){
+ replica = (Replica*)object_get_data (r);
+ } else {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica is NULL, aborting task\n");
+ return -1;
+ }
/*
* Create payload
*/
@@ -1197,9 +1206,13 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, char *returntext)
payload = create_ruv_payload(ridstr);
if(payload == NULL){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to create ext op payload, aborting task\n");
- goto done;
+ slapi_ch_free_string(&ridstr);
+ return -1;
}
+
+ set_cleaned_rid(rid);
+
agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
while (agmt_obj)
{
@@ -1245,11 +1258,12 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, char *returntext)
agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
}
-done:
-
- if(payload)
+ /*
+ * We're done with the payload, free it.
+ */
+ if(payload){
ber_bvfree(payload);
-
+ }
slapi_ch_free_string(&ridstr);
/*
diff --git a/ldap/servers/plugins/rootdn_access/rootdn_access.c b/ldap/servers/plugins/rootdn_access/rootdn_access.c
index 7fb5615..19e578c 100644
--- a/ldap/servers/plugins/rootdn_access/rootdn_access.c
+++ b/ldap/servers/plugins/rootdn_access/rootdn_access.c
@@ -217,7 +217,8 @@ static int
rootdn_load_config(Slapi_PBlock *pb)
{
Slapi_Entry *e = NULL;
- char *openTime, *closeTime;
+ char *openTime = NULL;
+ char *closeTime = NULL;
char hour[3], min[3];
int result = 0;
int i;
@@ -243,7 +244,8 @@ rootdn_load_config(Slapi_PBlock *pb)
slapi_log_error(SLAPI_LOG_FATAL, ROOTDN_PLUGIN_SUBSYSTEM, "rootdn_load_config: "
"invalid rootdn-days-allowed value (%s), must be all letters, and comma separators\n",closeTime);
slapi_ch_free_string(&daysAllowed);
- return -1;
+ result = -1;
+ goto free_and_return;
}
daysAllowed = strToLower(daysAllowed);
}
@@ -251,14 +253,14 @@ rootdn_load_config(Slapi_PBlock *pb)
if (strcspn(openTime, "0123456789")){
slapi_log_error(SLAPI_LOG_FATAL, ROOTDN_PLUGIN_SUBSYSTEM, "rootdn_load_config: "
"invalid rootdn-open-time value (%s), must be all digits\n",openTime);
- slapi_ch_free_string(&openTime);
- return -1;
+ result = -1;
+ goto free_and_return;
}
if(strlen(openTime) != 4){
slapi_log_error(SLAPI_LOG_FATAL, ROOTDN_PLUGIN_SUBSYSTEM, "rootdn_load_config: "
"invalid format for rootdn-open-time value (%s). Should be HHMM\n", openTime);
- slapi_ch_free_string(&openTime);
- return -1;
+ result = -1;
+ goto free_and_return;
}
/*
* convert the time to all seconds
@@ -271,14 +273,14 @@ rootdn_load_config(Slapi_PBlock *pb)
if (strcspn(closeTime, "0123456789")){
slapi_log_error(SLAPI_LOG_FATAL, ROOTDN_PLUGIN_SUBSYSTEM, "rootdn_load_config: "
"invalid rootdn-open-time value (%s), must be all digits, and should be HHMM\n",closeTime);
- slapi_ch_free_string(&closeTime);
- return -1;
+ result = -1;
+ goto free_and_return;
}
if(strlen(closeTime) != 4){
slapi_log_error(SLAPI_LOG_FATAL, ROOTDN_PLUGIN_SUBSYSTEM, "rootdn_load_config: "
"invalid format for rootdn-open-time value (%s), should be HHMM\n", closeTime);
- slapi_ch_free_string(&closeTime);
- return -1;
+ result = -1;
+ goto free_and_return;
}
/*
* convert the time to all seconds
@@ -294,13 +296,15 @@ rootdn_load_config(Slapi_PBlock *pb)
"there must be a open and a close time\n");
slapi_ch_free_string(&closeTime);
slapi_ch_free_string(&openTime);
- return -1;
+ result = -1;
+ goto free_and_return;
}
if(close_time && open_time && close_time <= open_time){
/* Make sure the closing time is greater than the open time */
slapi_log_error(SLAPI_LOG_FATAL, ROOTDN_PLUGIN_SUBSYSTEM, "rootdn_load_config: "
"the close time must be greater than the open time\n");
result = -1;
+ goto free_and_return;
}
if(hosts){
for(i = 0; hosts[i] != NULL; i++){
@@ -370,13 +374,15 @@ rootdn_load_config(Slapi_PBlock *pb)
}
}
}
- slapi_ch_free_string(&openTime);
- slapi_ch_free_string(&closeTime);
} else {
/* failed to get the plugin entry */
result = -1;
}
+free_and_return:
+ slapi_ch_free_string(&openTime);
+ slapi_ch_free_string(&closeTime);
+
slapi_log_error(SLAPI_LOG_PLUGIN, ROOTDN_PLUGIN_SUBSYSTEM, "<-- rootdn_load_config (%d)\n", result);
return result;
diff --git a/ldap/servers/slapd/back-ldbm/cache.c b/ldap/servers/slapd/back-ldbm/cache.c
index de84700..1c81a1b 100644
--- a/ldap/servers/slapd/back-ldbm/cache.c
+++ b/ldap/servers/slapd/back-ldbm/cache.c
@@ -1058,8 +1058,8 @@ static int entrycache_replace(struct cache *cache, struct backentry *olde,
}
if (!add_hash(cache->c_idtable, &(newe->ep_id), sizeof(ID), newe, NULL)) {
LOG("entry cache replace: can't add id\n", 0, 0, 0);
- if (remove_hash(cache->c_dntable, (void *)newndn, strlen(newndn))) {
- LOG("entry cache replace: can't remove dn after add id failed\n", 0, 0, 0);
+ if(remove_hash(cache->c_dntable, (void *)newndn, strlen(newndn)) == 0){
+ LOG("entry cache replace: failed to remove dn table\n", 0, 0, 0);
}
PR_Unlock(cache->c_mutex);
return 1;
@@ -1068,8 +1068,12 @@ static int entrycache_replace(struct cache *cache, struct backentry *olde,
if (newuuid && !add_hash(cache->c_uuidtable, (void *)newuuid, strlen(newuuid),
newe, NULL)) {
LOG("entry cache replace: can't add uuid\n", 0, 0, 0);
- remove_hash(cache->c_dntable, (void *)newndn, strlen(newndn));
- remove_hash(cache->c_idtable, &(newe->ep_id), sizeof(ID));
+ if(remove_hash(cache->c_dntable, (void *)newndn, strlen(newndn)) == 0){
+ LOG("entry cache replace: failed to remove dn table(uuid cache)\n", 0, 0, 0);
+ }
+ if(remove_hash(cache->c_idtable, &(newe->ep_id), sizeof(ID)) == 0){
+ LOG("entry cache replace: failed to remove id table(uuid cache)\n", 0, 0, 0);
+ }
PR_Unlock(cache->c_mutex);
return 1;
}
@@ -1359,8 +1363,8 @@ entrycache_add_int(struct cache *cache, struct backentry *e, int state,
PR_Unlock(cache->c_mutex);
return 0;
}
- if (remove_hash(cache->c_dntable, (void *)ndn, strlen(ndn))) {
- LOG("=>= entrycache_add_int could not remove existing id from dn cache\n", 0, 0, 0);
+ if(remove_hash(cache->c_dntable, (void *)ndn, strlen(ndn)) == 0){
+ LOG("entrycache_add_int: failed to remove dn table\n", 0, 0, 0);
}
e->ep_state |= ENTRY_STATE_NOTINCACHE;
PR_Unlock(cache->c_mutex);
@@ -1373,8 +1377,12 @@ entrycache_add_int(struct cache *cache, struct backentry *e, int state,
NULL)) {
LOG("entry %s already in uuid cache!\n", backentry_get_ndn(e),
0, 0);
- remove_hash(cache->c_dntable, (void *)ndn, strlen(ndn));
- remove_hash(cache->c_idtable, &(e->ep_id), sizeof(ID));
+ if(remove_hash(cache->c_dntable, (void *)ndn, strlen(ndn)) == 0){
+ LOG("entrycache_add_int: failed to remove dn table(uuid cache)\n", 0, 0, 0);
+ }
+ if(remove_hash(cache->c_idtable, &(e->ep_id), sizeof(ID)) == 0){
+ LOG("entrycache_add_int: failed to remove id table(uuid cache)\n", 0, 0, 0);
+ }
e->ep_state |= ENTRY_STATE_NOTINCACHE;
PR_Unlock(cache->c_mutex);
return -1;
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
index e6141d2..5452d6b 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -3909,7 +3909,7 @@ static int txn_test_threadmain(void *param)
txn_test_iter **ttilist = NULL;
size_t tticnt = 0;
DB_TXN *txn = NULL;
- txn_test_cfg cfg;
+ txn_test_cfg cfg = {0};
size_t counter = 0;
char keybuf[8192];
char databuf[8192];
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c
index 0541543..e50b930 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c
@@ -2170,8 +2170,8 @@ _entryrdn_replace_suffix_id(DBC *cursor, DBT *key, DBT *adddata,
char *realkeybuf = NULL;
DBT realkey;
char buffer[RDN_BULK_FETCH_BUFFER_SIZE];
- DBT data;
- DBT moddata;
+ DBT data = {0};
+ DBT moddata = {0};
rdn_elem **childelems = NULL;
rdn_elem **cep = NULL;
rdn_elem *childelem = NULL;
@@ -2217,7 +2217,6 @@ _entryrdn_replace_suffix_id(DBC *cursor, DBT *key, DBT *adddata,
key->flags = DB_DBT_USERMEM;
/* Setting the bulk fetch buffer */
- memset(&data, 0, sizeof(data));
data.ulen = sizeof(buffer);
data.size = sizeof(buffer);
data.data = buffer;
@@ -2228,7 +2227,6 @@ _entryrdn_replace_suffix_id(DBC *cursor, DBT *key, DBT *adddata,
realkey.size = realkey.ulen = strlen(realkeybuf) + 1;
realkey.flags = DB_DBT_USERMEM;
- memset(&moddata, 0, sizeof(moddata));
moddata.flags = DB_DBT_USERMEM;
for (db_retry = 0; db_retry < RETRY_TIMES; db_retry++) {
commit 9c0605a84ef6c1e8e3120bd0a934b1be485f95b9
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Jun 12 16:32:32 2012 -0400
Ticket #388 - Improve replication agreement status messages
Bug Description: Result codes that were negative values triggered a generic error
message (System Error). This is because of mozLDAP's ldap_err2string()
which can only handle positive values, but openldap's ldap_err2string
can handle both positive and negative numbers.
Fix Description: Created a wrapper function (slapi_err2string), that can handle both
positive and negative error codes, regardless which ldap library is
being used.
Reviewed by:
https://fedorahosted.org/389/ticket/388
(cherry picked from commit 8f21ac81cfe8bf70b555ae011c9e7ff953deeb8e)
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index 4db7e13..4beb13a 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -2098,6 +2098,7 @@ agmt_set_last_update_status (Repl_Agmt *ra, int ldaprc, int replrc, const char *
else if (ldaprc != LDAP_SUCCESS)
{
char *replmsg = NULL;
+
if ( replrc ) {
replmsg = protocol_response2string(replrc);
/* Do not mix the unknown replication error with the known ldap one */
@@ -2105,19 +2106,9 @@ agmt_set_last_update_status (Repl_Agmt *ra, int ldaprc, int replrc, const char *
replmsg = NULL;
}
}
- if (ldaprc > 0) {
- PR_snprintf(ra->last_update_status, STATUS_LEN,
- "%d %s%sLDAP error: %s%s%s",
- ldaprc,
- message?message:"",message?"":" - ",
- ldap_err2string(ldaprc),
- replmsg ? " - " : "", replmsg ? replmsg : "");
- } else { /* ldaprc is < 0 */
- PR_snprintf(ra->last_update_status, STATUS_LEN,
- "%d %s%sSystem error%s%s",
- ldaprc,message?message:"",message?"":" - ",
- replmsg ? " - " : "", replmsg ? replmsg : "");
- }
+ PR_snprintf(ra->last_update_status, STATUS_LEN, "%d %s%sLDAP error: %s%s%s",
+ ldaprc, message?message:"",message?"":" - ",
+ slapi_err2string(ldaprc), replmsg ? " - " : "", replmsg ? replmsg : "");
}
/* ldaprc == LDAP_SUCCESS */
else if (replrc != 0)
@@ -2175,6 +2166,7 @@ agmt_set_last_init_status (Repl_Agmt *ra, int ldaprc, int replrc, const char *me
if (ldaprc != LDAP_SUCCESS)
{
char *replmsg = NULL;
+
if ( replrc ) {
replmsg = protocol_response2string(replrc);
/* Do not mix the unknown replication error with the known ldap one */
@@ -2182,19 +2174,9 @@ agmt_set_last_init_status (Repl_Agmt *ra, int ldaprc, int replrc, const char *me
replmsg = NULL;
}
}
- if (ldaprc > 0) {
- PR_snprintf(ra->last_init_status, STATUS_LEN,
- "%d %s%sLDAP error: %s%s%s",
- ldaprc,
- message?message:"",message?"":" - ",
- ldap_err2string(ldaprc),
- replmsg ? " - " : "", replmsg ? replmsg : "");
- } else { /* ldaprc is < 0 */
- PR_snprintf(ra->last_init_status, STATUS_LEN,
- "%d %s%sSystem error%s%s",
- ldaprc,message?message:"",message?"":" - ",
- replmsg ? " - " : "", replmsg ? replmsg : "");
- }
+ PR_snprintf(ra->last_init_status, STATUS_LEN, "%d %s%sLDAP error: %s%s%s",
+ ldaprc, message?message:"",message?"":" - ",
+ slapi_err2string(ldaprc), replmsg ? " - " : "", replmsg ? replmsg : "");
}
/* ldaprc == LDAP_SUCCESS */
else if (replrc != 0)
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index 3589f08..3226ede 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -6546,3 +6546,61 @@ config_set_auditlog_enabled(int value){
}
CFG_UNLOCK_WRITE(slapdFrontendConfig);
}
+
+char *
+slapi_err2string(int result)
+{
+ /*
+ * If we are using openldap, then we can safely use ldap_err2string with
+ * positive and negative result codes. MozLDAP's ldap_err2string can
+ * only handle positive result codes.
+ */
+#if defined (USE_OPENLDAP)
+ return ldap_err2string(result);
+#else
+ if(result >= 0){
+ return ldap_err2string(result);
+ }
+ switch (result)
+ {
+ case -1:
+ return ("Can't contact LDAP server");
+ case -2:
+ return ("Local error");
+ case -3:
+ return ("Encoding error");
+ case -4:
+ return ("Decoding error");
+ case -5:
+ return ("Timed out");
+ case -6:
+ return ("Unknown authentication method");
+ case -7:
+ return ("Bad search filter");
+ case -8:
+ return ("User canceled operation");
+ case -9:
+ return ("Bad parameter to an ldap routine");
+ case -10:
+ return ("Out of memory");
+ case -11:
+ return ("Connect error");
+ case -12:
+ return ("Not Supported");
+ case -13:
+ return ("Control not found");
+ case -14:
+ return ("No results returned");
+ case -15:
+ return ("More results to return");
+ case -16:
+ return ("Client Loop");
+ case -17:
+ return ("Referral Limit Exceeded");
+
+ default:
+ return ("Unknown system error");
+ }
+#endif
+}
+
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index 4a3a38a..dc3fd38 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -5322,6 +5322,15 @@ void slapi_ch_array_add( char ***array, char *string );
int slapi_ch_array_utf8_inlist(char **array, char *string);
/**
+ * Returns the error string of an ldap result code, but it can also handle
+ * library errors(negative result codes)
+ *
+ * \param result The result code
+ * \return The error text string of the result code
+ */
+char *slapi_err2string(int result);
+
+/**
* Check if the server has started shutting down
*
* \return 1 if the server is shutting down
commit 07601165b5c062b385df00d1275c1cccca5593e9
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed May 30 13:30:44 2012 -0400
Update the slapi-plugin documentation on new slapi functions, and added a slapi function for checking on shutdowns
Fix Description: removed the g_get_shutdown() functions from the plugins, and replaced them with the slapi version
Reviewed by: Richm (Thanks!)
(cherry picked from commit 4d564ef42db022a5102c9b6ae1bdd41a18c1dd7f)
diff --git a/ldap/servers/plugins/linkedattrs/fixup_task.c b/ldap/servers/plugins/linkedattrs/fixup_task.c
index b19d3ab..9fa7f6f 100644
--- a/ldap/servers/plugins/linkedattrs/fixup_task.c
+++ b/ldap/servers/plugins/linkedattrs/fixup_task.c
@@ -355,7 +355,7 @@ linked_attrs_add_backlinks_callback(Slapi_Entry *e, void *callback_data)
int perform_update = 0;
Slapi_DN *targetsdn = NULL;
- if (g_get_shutdown()) {
+ if (slapi_is_shutting_down()) {
rc = -1;
goto done;
}
diff --git a/ldap/servers/plugins/linkedattrs/linked_attrs.h b/ldap/servers/plugins/linkedattrs/linked_attrs.h
index 2eba62f..d0909ca 100644
--- a/ldap/servers/plugins/linkedattrs/linked_attrs.h
+++ b/ldap/servers/plugins/linkedattrs/linked_attrs.h
@@ -138,8 +138,6 @@ int linked_attrs_fixup_task_add(Slapi_PBlock *pb, Slapi_Entry *e,
Slapi_Entry *eAfter, int *returncode,
char *returntext, void *arg);
-int g_get_shutdown(); /* declared in proto-slap.h */
-
/*
* misc
*/
diff --git a/ldap/servers/plugins/memberof/memberof.c b/ldap/servers/plugins/memberof/memberof.c
index 8deed0f..a2fdbd9 100644
--- a/ldap/servers/plugins/memberof/memberof.c
+++ b/ldap/servers/plugins/memberof/memberof.c
@@ -1700,7 +1700,7 @@ int memberof_get_groups_callback(Slapi_Entry *e, void *callback_data)
Slapi_ValueSet *groupvals = *((memberof_get_groups_data*)callback_data)->groupvals;
int rc = 0;
- if(g_get_shutdown()){
+ if(slapi_is_shutting_down()){
rc = -1;
goto bail;
}
diff --git a/ldap/servers/plugins/memberof/memberof.h b/ldap/servers/plugins/memberof/memberof.h
index 36901e3..65398aa 100644
--- a/ldap/servers/plugins/memberof/memberof.h
+++ b/ldap/servers/plugins/memberof/memberof.h
@@ -96,6 +96,4 @@ void memberof_wlock_config();
void memberof_unlock_config();
int memberof_config_get_all_backends();
-int g_get_shutdown(); /* declared in proto-slap.h */
-
#endif /* _MEMBEROF_H_ */
diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
index eac76a8..08bf771 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.c
@@ -265,8 +265,6 @@ typedef struct cl5desc
typedef void (*VFP)(void *);
-int g_get_shutdown(); /* declared in proto-slap.h */
-
/***** Global Variables *****/
static CL5Desc s_cl5Desc;
@@ -3472,7 +3470,7 @@ static void _cl5TrimFile (Object *obj, long *numToTrim)
entry.op = &op;
- while ( !finished && !g_get_shutdown() )
+ while ( !finished && !slapi_is_shutting_down() )
{
it = NULL;
count = 0;
diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
index 6434dbd..ccaa29d 100644
--- a/ldap/servers/plugins/replication/repl5_replica.c
+++ b/ldap/servers/plugins/replication/repl5_replica.c
@@ -50,9 +50,6 @@
#include "csnpl.h"
#include "cl5_api.h"
-/* from proto-slap.h */
-int g_get_shutdown();
-
#define RUV_SAVE_INTERVAL (30 * 1000) /* 30 seconds */
#define START_UPDATE_DELAY 2 /* 2 second */
@@ -2506,7 +2503,7 @@ process_reap_entry (Slapi_Entry *entry, void *cb_data)
int rc = -1;
/* abort reaping if we've been told to stop or we're shutting down */
- if (*tombstone_reap_stop || g_get_shutdown()) {
+ if (*tombstone_reap_stop || slapi_is_shutting_down()) {
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
"process_reap_entry: the tombstone reap process "
" has been stopped\n");
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index 7d252ed..a5d608a 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -86,7 +86,6 @@ static struct berval *create_ruv_payload(char *value);
static int replica_cleanup_task (Object *r, const char *task_name, char *returntext, int apply_mods);
static int replica_task_done(Replica *replica);
static multimaster_mtnode_extension * _replica_config_get_mtnode_ext (const Slapi_Entry *e);
-int g_get_shutdown();
/*
* Note: internal add/modify/delete operations should not be run while
@@ -1325,7 +1324,7 @@ replica_cleanallruv_monitor_thread(void *arg)
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Waiting for all the replicas to get cleaned...\n");
- while(!g_get_shutdown())
+ while(!slapi_is_shutting_down())
{
DS_Sleep(PR_SecondsToInterval(10));
found = 0;
diff --git a/ldap/servers/plugins/usn/usn_cleanup.c b/ldap/servers/plugins/usn/usn_cleanup.c
index 6f9410e..ab6362f 100644
--- a/ldap/servers/plugins/usn/usn_cleanup.c
+++ b/ldap/servers/plugins/usn/usn_cleanup.c
@@ -148,7 +148,7 @@ usn_cleanup_thread(void *arg)
int opflags = OP_FLAG_TOMBSTONE_ENTRY;
/* check for shutdown */
- if(g_get_shutdown()){
+ if(slapi_is_shutting_down()){
slapi_task_log_notice(task, "USN tombstone cleanup task aborted due to shutdown.");
slapi_task_log_status(task, "USN tombstone cleanup task aborted due to shutdown.");
slapi_log_error(SLAPI_LOG_FATAL, USN_PLUGIN_SUBSYSTEM,
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index 59561c7..3589f08 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -890,6 +890,11 @@ int g_get_shutdown()
return slapd_shutdown;
}
+int slapi_is_shutting_down()
+{
+ return slapd_shutdown;
+}
+
static int cmd_shutdown;
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index fc0281f..4a3a38a 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -5321,6 +5321,13 @@ void slapi_ch_array_add( char ***array, char *string );
*/
int slapi_ch_array_utf8_inlist(char **array, char *string);
+/**
+ * Check if the server has started shutting down
+ *
+ * \return 1 if the server is shutting down
+ */
+int slapi_is_shutting_down();
+
/*
* checking routines for allocating and freeing memory
*/
@@ -6762,7 +6769,20 @@ int slapi_re_exec( Slapi_Regex *re_handle, const char *subject, time_t time_up )
* \warning The regex handler should be released by slapi_re_free().
*/
int slapi_re_subs( Slapi_Regex *re_handle, const char *subject, const char *src, char **dst, unsigned long dstlen );
-/* extension to handle search filters properly */
+/**
+ * Substitutes '&' or '\#' in the param src with the matched string. If the 'src' is a search filter
+ * do not remove & if it is part of a compound filter.
+ *
+ * \param re_handle The regex handler returned from slapi_re_comp.
+ * \param subject A string checked against the compiled pattern.
+ * \param src A given string which could contain the substitution symbols.
+ * \param dst A pointer pointing to the memory which stores the output string.
+ * \param dstlen Size of the memory dst.
+ * \param filter Set to 1 if the src is a ldap search filter
+ * \return This function returns 1 if the substitution was successful.
+ * \return This function returns 0 if the substitution failed.
+ * \warning The regex handler should be released by slapi_re_free().
+ */
int slapi_re_subs_ext( Slapi_Regex *re_handle, const char *subject, const char *src, char **dst, unsigned long dstlen, int filter );
/**
* Releases the regex handler which was returned from slapi_re_comp.
commit e11b3a5cc61786a5dc8aeb4cc20caa60ed7d9173
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed May 30 11:06:55 2012 -0400
Ticket #369 - restore of replica ldif file on second master after deleting two records shows only 1 deletion
Bug Description: If you take a "db2ldif -r" on a consumer and later restore it "ldif2db"
any changes made on that consumer after the backup(db2ldif), will not be
replayed back to the consumer after it has been restored(ldif2db).
Fix Description: When we check if we can skip updates from the change log, check if the
consumer csn is "newer" than its current max csn. If it is, then it
needs to be replayed back to itself.
https://fedorahosted.org/389/ticket/369
Reviewed by: Nathan & Rich (Thanks!)
(cherry picked from commit a640ac21971fef404c690594c83a7f54c334fe90)
diff --git a/ldap/servers/plugins/replication/cl5_clcache.c b/ldap/servers/plugins/replication/cl5_clcache.c
index 327cb6f..5816837 100644
--- a/ldap/servers/plugins/replication/cl5_clcache.c
+++ b/ldap/servers/plugins/replication/cl5_clcache.c
@@ -664,13 +664,24 @@ clcache_skip_change ( CLC_Buffer *buf )
rid = csn_get_replicaid ( buf->buf_current_csn );
/*
- * Skip CSN that is originated from the consumer.
+ * Skip CSN that is originated from the consumer,
+ * unless the CSN is newer than the maxcsn.
* If RID==65535, the CSN is originated from a
* legacy consumer. In this case the supplier
* and the consumer may have the same RID.
*/
- if (rid == buf->buf_consumer_rid && rid != MAX_REPLICA_ID)
+ if (rid == buf->buf_consumer_rid && rid != MAX_REPLICA_ID){
+ CSN *cons_maxcsn = NULL;
+
+ ruv_get_max_csn(buf->buf_consumer_ruv, &cons_maxcsn);
+ if ( csn_compare ( buf->buf_current_csn, cons_maxcsn) > 0 ) {
+ /*
+ * The consumer must have been "restored" and needs this newer update.
+ */
+ skip = 0;
+ }
break;
+ }
/* Skip helper entry (ENTRY_COUNT, PURGE_RUV and so on) */
if ( cl5HelperEntry ( NULL, buf->buf_current_csn ) == PR_TRUE ) {
1
0
ldap/servers/plugins/replication/repl5_agmt.c | 9 +-
ldap/servers/plugins/replication/repl5_replica.c | 33 +++++++--
ldap/servers/plugins/replication/repl5_replica_config.c | 53 +++++++---------
ldap/servers/plugins/replication/repl_extop.c | 4 -
4 files changed, 58 insertions(+), 41 deletions(-)
New commits:
commit 75e5d3d1dba984f0219512d908d1a624096c7acc
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Fri Aug 3 11:28:43 2012 -0400
Ticket 403 - cleanallruv coverity fixes
Fixed coverity issues
Reviewed by: richm(Thanks Rich!)
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index 5a16083..5817f99 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -434,7 +434,8 @@ agmt_new_from_entry(Slapi_Entry *e)
for (i = 0; i < CLEANRIDSIZ && clean_vals[i]; i++){
ra->cleanruv_notified[i] = atoi(clean_vals[i]);
}
- ra->cleanruv_notified[i + 1] = 0;
+ if(i <= CLEANRIDSIZ)
+ ra->cleanruv_notified[i + 1] = 0;
slapi_ch_array_free(clean_vals);
} else {
ra->cleanruv_notified[0] = 0;
@@ -2587,7 +2588,7 @@ agmt_set_attrs_to_strip(Repl_Agmt *ra, Slapi_Entry *e)
tmpstr = slapi_entry_attr_get_charptr(e, type_nsds5ReplicaStripAttrs);
if (NULL != tmpstr){
if(ra->attrs_to_strip){
- slapi_ch_array_free(&ra->attrs_to_strip);
+ slapi_ch_array_free(ra->attrs_to_strip);
}
ra->attrs_to_strip = slapi_str2charray_ext(tmpstr, " ", 0);
PR_Unlock(ra->lock);
@@ -2675,7 +2676,9 @@ agmt_set_cleanruv_notified_from_entry(Repl_Agmt *ra, Slapi_Entry *e){
for (i = 0; i < CLEANRIDSIZ && attr_vals[i]; i++){
ra->cleanruv_notified[i] = atoi(attr_vals[i]);
}
- ra->cleanruv_notified[i + 1] = 0;
+ if( i <= CLEANRIDSIZ )
+ ra->cleanruv_notified[i + 1] = 0;
+ slapi_ch_array_free(attr_vals);
} else {
ra->cleanruv_notified[0] = 0;
}
diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
index 27cdacd..75f82ab 100644
--- a/ldap/servers/plugins/replication/repl5_replica.c
+++ b/ldap/servers/plugins/replication/repl5_replica.c
@@ -1825,7 +1825,7 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
ReplicaId rid;
int i;
- for(i = 0; clean_vals[i]; i++){
+ for(i = 0; i < CLEANRIDSIZ && clean_vals[i]; i++){
cleanruv_data *data = NULL;
/*
@@ -1863,7 +1863,8 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
if(payload == NULL){
slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: Startup: Failed to "
"create extended op payload, aborting task");
- return;
+ csn_free(&maxcsn);
+ goto done;
}
/*
* Setup the data struct, and fire off the thread.
@@ -1886,12 +1887,20 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
(void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
if (thread == NULL) {
+ /* log an error and free everything */
slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV: unable to create cleanAllRUV "
"thread for rid(%d)\n", (int)data->rid);
+ csn_free(&maxcsn);
+ slapi_sdn_free(&data->sdn);
+ ber_bvfree(data->payload);
+ slapi_ch_free((void **)&data);
}
}
}
r->repl_cleanruv_data[i] = NULL;
+
+done:
+ slapi_ch_array_free(clean_vals);
}
if ((clean_vals = slapi_entry_attr_get_charray(e, type_replicaAbortCleanRUV)) != NULL)
@@ -1915,12 +1924,12 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
if(rid <= 0 || rid >= READ_ONLY_REPLICA_ID){
slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: invalid replica id(%d) "
"aborting task.\n", rid);
- goto done;
+ goto done2;
}
} else {
slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: unable to parse cleanallruv "
"data (%s), aborting task.\n",clean_vals[i]);
- goto done;
+ goto done2;
}
repl_root = ldap_utf8strtok_r(iter, ":", &iter);
@@ -1961,14 +1970,18 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
if (thread == NULL) {
slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: unable to create abort cleanAllRUV "
"thread for rid(%d)\n", (int)data->rid);
+ slapi_sdn_free(&data->sdn);
+ ber_bvfree(data->payload);
+ slapi_ch_free_string(&data->repl_root);
+ slapi_ch_free((void **)&data);
}
}
}
}
- }
-done:
- slapi_ch_array_free(clean_vals);
+done2:
+ slapi_ch_array_free(clean_vals);
+ }
}
/* This function updates the entry to contain information generated
@@ -3783,8 +3796,10 @@ replica_add_cleanruv_data(Replica *r, char *val)
PR_Lock(r->repl_lock);
for (i = 0; i < CLEANRIDSIZ && r->repl_cleanruv_data[i] != NULL; i++); /* goto the end of the list */
- r->repl_cleanruv_data[i] = slapi_ch_strdup(val); /* append to list */
- r->repl_cleanruv_data[i + 1] = NULL;
+ if( i < CLEANRIDSIZ)
+ r->repl_cleanruv_data[i] = slapi_ch_strdup(val); /* append to list */
+ if(i <= CLEANRIDSIZ)
+ r->repl_cleanruv_data[i + 1] = NULL;
PR_Unlock(r->repl_lock);
}
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index 89651cf..a03740b 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -1319,21 +1319,13 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, c
/* we are already running the maximum number of tasks */
cleanruv_log(pre_task, CLEANALLRUV_ID,
"Exceeded maximum number of active CLEANALLRUV tasks(%d)",CLEANRIDSIZ);
- returntext = PR_smprintf("Exceeded maximum number of active CLEANALLRUV tasks(%d), "
- "you must wait for one to finish.", CLEANRIDSIZ);
return LDAP_UNWILLING_TO_PERFORM;
}
/*
* Grab the replica
*/
- if(r){
- replica = (Replica*)object_get_data (r);
- } else {
- cleanruv_log(pre_task, CLEANALLRUV_ID, "Replica is NULL, aborting task");
- rc = -1;
- goto fail;
- }
+ replica = (Replica*)object_get_data (r);
/*
* Check if this is a consumer
*/
@@ -1419,7 +1411,8 @@ fail:
ber_bvfree(payload);
}
csn_free(&maxcsn);
- object_release (r);
+ if(task) /* only the task acquires the r obj */
+ object_release (r);
done:
@@ -1476,7 +1469,7 @@ replica_cleanallruv_thread(void *arg)
if(data->replica == NULL && data->repl_obj){
data->replica = (Replica*)object_get_data(data->repl_obj);
}
- if( data->replica && data->repl_obj == NULL){
+ if( data->repl_obj == NULL){
data->repl_obj = object_new(data->replica, NULL);
free_obj = 1;
}
@@ -1819,7 +1812,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
Repl_Connection *conn;
ConnResult crc = 0;
LDAP *ld;
- Slapi_DN *dn;
+ Slapi_DN *sdn;
struct berval *vals[2];
struct berval val;
LDAPMod *mods[2];
@@ -1842,7 +1835,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
return;
}
val.bv_len = PR_snprintf(data, sizeof(data), "CLEANRUV%d", rid);
- dn = agmt_get_replarea(agmt);
+ sdn = agmt_get_replarea(agmt);
mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
mod.mod_type = "nsds5task";
mod.mod_bvalues = vals;
@@ -1851,7 +1844,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
val.bv_val = data;
mods[0] = &mod;
mods[1] = NULL;
- repl_dn = PR_smprintf("cn=replica,cn=\"%s\",cn=mapping tree,cn=config", slapi_sdn_get_dn(dn));
+ repl_dn = slapi_create_dn_string("cn=replica,cn=%s,cn=mapping tree,cn=config", slapi_sdn_get_dn(sdn));
/*
* Add task to remote replica
*/
@@ -1863,6 +1856,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
agmt_get_long_name(agmt), agmt_get_hostname(agmt), rc);
}
slapi_ch_free_string(&repl_dn);
+ slapi_sdn_free(&sdn);
conn_delete_internal_ext(conn);
}
@@ -1940,6 +1934,9 @@ add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
char *dn;
int rc;
+ if(r == NULL || maxcsn == NULL){
+ return;
+ }
/*
* Write the rid & maxcsn to the config entry
*/
@@ -2068,13 +2065,12 @@ delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root){
slapi_modify_internal_set_pb(pb, dn, mods, NULL, NULL, repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
slapi_modify_internal_pb (pb);
- slapi_pblock_destroy (pb);
slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
if (rc != LDAP_SUCCESS){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to remove replica "
"config (%d), rid (%d)\n", rc, rid);
}
-
+ slapi_pblock_destroy (pb);
slapi_ch_free_string(&dn);
slapi_ch_free_string(&data);
}
@@ -2166,7 +2162,7 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
Replica *replica;
ReplicaId rid;
cleanruv_data *data = NULL;
- const Slapi_DN *dn;
+ Slapi_DN *sdn;
Object *r;
CSN *maxcsn;
const char *base_dn;
@@ -2178,8 +2174,6 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
/* we are already running the maximum number of tasks */
cleanruv_log(task, ABORT_CLEANALLRUV_ID,
"Exceeded maximum number of active ABORT CLEANALLRUV tasks(%d)",CLEANRIDSIZ);
- returntext = PR_smprintf("Exceeded maximum number of active ABORT CLEANALLRUV tasks(%d), "
- "you must wait for one to finish.", CLEANRIDSIZ);
*returncode = LDAP_OPERATIONS_ERROR;
return SLAPI_DSE_CALLBACK_ERROR;
}
@@ -2216,8 +2210,8 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
/*
* Get the replica object
*/
- dn = slapi_sdn_new_dn_byval(base_dn);
- if((r = replica_get_replica_from_dn(dn)) == NULL){
+ sdn = slapi_sdn_new_dn_byval(base_dn);
+ if((r = replica_get_replica_from_dn(sdn)) == NULL){
cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Failed to find replica from dn(%s)", base_dn);
*returncode = LDAP_OPERATIONS_ERROR;
rc = SLAPI_DSE_CALLBACK_ERROR;
@@ -2275,6 +2269,7 @@ out:
csn_free(&maxcsn);
slapi_ch_free_string(&ridstr);
+ slapi_sdn_free(&sdn);
if(rc != SLAPI_DSE_CALLBACK_OK){
cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Abort Task failed (%d)", rc);
@@ -2477,7 +2472,7 @@ replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn,
{
Repl_Connection *conn = NULL;
LDAP *ld;
- Slapi_DN *dn = agmt_get_replarea(agmt);
+ Slapi_DN *sdn;
struct berval **vals;
LDAPMessage *result = NULL, *entry = NULL;
BerElement *ber;
@@ -2501,10 +2496,11 @@ replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn,
conn_delete_internal_ext(conn);
return -1;
}
- rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(dn), LDAP_SCOPE_SUBTREE,
+ sdn = agmt_get_replarea(agmt);
+ rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(sdn), LDAP_SCOPE_SUBTREE,
"(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))",
attrs, 0, NULL, NULL, NULL, 0, &result);
- slapi_sdn_free(&dn);
+ slapi_sdn_free(&sdn);
if(rc != LDAP_SUCCESS){
cleanruv_log(task, CLEANALLRUV_ID,"Failed to contact "
"agmt (%s) error (%d), will retry later.", agmt_get_long_name(agmt), rc);
@@ -2530,7 +2526,7 @@ replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn,
for(part_count = 1; ruv_part && part_count < 5; part_count++){
ruv_part = ldap_utf8strtok_r(iter, " ", &iter);
}
- if(part_count == 5){
+ if(part_count == 5 && ruv_part){
/* we have the maxcsn */
if(strcmp(ruv_part, maxcsn)){
/* we are not caught up yet, free, and return */
@@ -2618,7 +2614,7 @@ replica_cleanallruv_check_ruv(Repl_Agmt *ra, char *rid_text, Slapi_Task *task)
struct berval **vals = NULL;
LDAPMessage *result = NULL, *entry = NULL;
LDAP *ld = NULL;
- Slapi_DN *dn = agmt_get_replarea(ra);
+ Slapi_DN *sdn;
char *attrs[2];
char *attr = NULL;
int rc = 0, i;
@@ -2637,10 +2633,11 @@ replica_cleanallruv_check_ruv(Repl_Agmt *ra, char *rid_text, Slapi_Task *task)
goto done;
}
- rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(dn), LDAP_SCOPE_SUBTREE,
+ sdn = agmt_get_replarea(ra);
+ rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(sdn), LDAP_SCOPE_SUBTREE,
"(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))",
attrs, 0, NULL, NULL, NULL, 0, &result);
- slapi_sdn_free(&dn);
+ slapi_sdn_free(&sdn);
if(rc != LDAP_SUCCESS){
cleanruv_log(task, CLEANALLRUV_ID,"Failed to contact "
"agmt (%s) error (%d), will retry later.", agmt_get_long_name(ra), rc);
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index 88bb9e3..db94ba7 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -1499,7 +1499,7 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
PRThread *thread = NULL;
Replica *r = NULL;
cleanruv_data *data = NULL;
- CSN *maxcsn;
+ CSN *maxcsn = NULL;
struct berval *extop_payload;
struct berval *resp_bval = NULL;
BerElement *resp_bere = NULL;
@@ -1656,6 +1656,8 @@ free_and_return:
if (mtnode_ext->replica)
object_release (mtnode_ext->replica);
}
+ if(rc)
+ csn_free(&maxcsn);
slapi_ch_free_string(&payload);
/*
1
0
ldap/servers/plugins/dna/dna.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 9229db23f5491bf8320967387e88903334dfed94
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Aug 1 18:08:29 2012 -0400
Ticket 407 - memory leak in dna plugin
Bug Description: Valgrind reported a memory leak in dna_pre_op()
Fix Description: Moved the slapi mod allocation, and freed the mods on error.
https://fedorahosted.org/389/ticket/407
Reviewed by: ?
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
index ce2486e..70d9c6b 100644
--- a/ldap/servers/plugins/dna/dna.c
+++ b/ldap/servers/plugins/dna/dna.c
@@ -3247,12 +3247,8 @@ dna_pre_op(Slapi_PBlock * pb, int modtype)
"dna_pre_op: no pre op entry set for modify\n");
goto bail;
}
- /* grab the mods - we'll put them back later with
- * our modifications appended
- */
+ /* grab the mods - we'll put them back later with our modifications appended */
slapi_pblock_get(pb, SLAPI_MODIFY_MODS, &mods);
- smods = slapi_mods_new();
- slapi_mods_init_passin(smods, mods);
/* We need the resulting entry after the mods are applied to
* see if the entry is within the scope. */
@@ -3263,6 +3259,8 @@ dna_pre_op(Slapi_PBlock * pb, int modtype)
* to let the main server handle it. */
goto bail;
}
+ smods = slapi_mods_new();
+ slapi_mods_init_passin(&smods, mods);
}
/* For a MOD, we need to check the resulting entry */
@@ -3292,7 +3290,9 @@ dna_pre_op(Slapi_PBlock * pb, int modtype)
if (LDAP_CHANGETYPE_ADD == modtype) {
ret = _dna_pre_op_add(pb, test_e);
} else {
- ret = _dna_pre_op_modify(pb, test_e, smods);
+ if((ret = _dna_pre_op_modify(pb, test_e, smods))){
+ slapi_mods_free(&smods);
+ }
}
if (ret) {
goto bail;
1
0
Makefile.am | 1
Makefile.in | 1
ldap/admin/src/scripts/template-cleanallruv.pl.in | 186 +
ldap/schema/01core389.ldif | 17
ldap/servers/plugins/replication/cl5_api.c | 71
ldap/servers/plugins/replication/cl5_api.h | 9
ldap/servers/plugins/replication/repl5.h | 57
ldap/servers/plugins/replication/repl5_agmt.c | 110
ldap/servers/plugins/replication/repl5_agmtlist.c | 4
ldap/servers/plugins/replication/repl5_connection.c | 13
ldap/servers/plugins/replication/repl5_inc_protocol.c | 21
ldap/servers/plugins/replication/repl5_init.c | 46
ldap/servers/plugins/replication/repl5_plugins.c | 18
ldap/servers/plugins/replication/repl5_replica.c | 477 ++-
ldap/servers/plugins/replication/repl5_replica_config.c | 2252 +++++++++++-----
ldap/servers/plugins/replication/repl5_ruv.c | 58
ldap/servers/plugins/replication/repl5_ruv.h | 1
ldap/servers/plugins/replication/repl_extop.c | 446 +--
ldap/servers/plugins/replication/repl_globals.c | 5
ldap/servers/slapd/log.c | 27
ldap/servers/slapd/slapi-plugin.h | 3
ldap/servers/slapd/task.c | 56
22 files changed, 2839 insertions(+), 1040 deletions(-)
New commits:
commit 657efc69487cc1b04d82642dddd47f93b7a37cf1
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Aug 1 16:12:01 2012 -0400
Ticket 403 - CLEANALLRUV feature
This is a rewrite of the first version of CLEANALLRUV. The task is now an official slapi task, but the
older/original method still works as well. You can run multiple tasks(4) at the same time. The task can handle
situations where a replica is down, or "older"replicas are in the topology. I've also added an "abort"
task to cancel a particular cleanallruv task, as the task can potentially run for a long time while
waiting for a server to come online or be cleaned.
https://fedorahosted.org/389/ticket/403
Reviewed by: richm & noriko (Thanks!)
diff --git a/Makefile.am b/Makefile.am
index d90cd4b..000fef0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -374,6 +374,7 @@ task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \
ldap/admin/src/scripts/template-db2ldif.pl \
ldap/admin/src/scripts/template-fixup-linkedattrs.pl \
ldap/admin/src/scripts/template-fixup-memberof.pl \
+ ldap/admin/src/scripts/template-cleanallruv.pl \
ldap/admin/src/scripts/template-ldif2db.pl \
ldap/admin/src/scripts/template-ns-accountstatus.pl \
ldap/admin/src/scripts/template-ns-activate.pl \
diff --git a/Makefile.in b/Makefile.in
index 0de0465..3bd6ec6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1595,6 +1595,7 @@ task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \
ldap/admin/src/scripts/template-db2ldif.pl \
ldap/admin/src/scripts/template-fixup-linkedattrs.pl \
ldap/admin/src/scripts/template-fixup-memberof.pl \
+ ldap/admin/src/scripts/template-cleanallruv.pl \
ldap/admin/src/scripts/template-ldif2db.pl \
ldap/admin/src/scripts/template-ns-accountstatus.pl \
ldap/admin/src/scripts/template-ns-activate.pl \
diff --git a/ldap/admin/src/scripts/template-cleanallruv.pl.in b/ldap/admin/src/scripts/template-cleanallruv.pl.in
new file mode 100644
index 0000000..be95a6d
--- /dev/null
+++ b/ldap/admin/src/scripts/template-cleanallruv.pl.in
@@ -0,0 +1,186 @@
+#{{PERL-EXEC}}
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2012 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+
+sub usage {
+ print(STDERR "Usage: $0 [-v] -D rootdn { -w password | -w - | -j filename } \n");
+ print(STDERR " [-b basedn | -r rid | -A]\n");
+ print(STDERR " Opts: -D rootdn - Directory Manager\n");
+ print(STDERR " : -w password - Directory Manager's password\n");
+ print(STDERR " : -w - - Prompt for Directory Manager's password\n");
+ print(STDERR " : -j filename - Read Directory Manager's password from file\n");
+ print(STDERR " : -b basedn - DN of the replica root you want to clean\n");
+ print(STDERR " : -r rid - The replica id that you want to clean\n");
+ print(STDERR " : -A - Abort an existing cleanallruv task(must use with -b and -r args\n");
+ print(STDERR " : -v - verbose\n");
+}
+
+$rootdn = "";
+$passwd = "";
+$passwdfile = "";
+$basedn = "";
+$rid = "";
+$abort = "";
+$verbose = 0;
+
+$prefix = "{{DS-ROOT}}";
+
+$ENV{'PATH'} = "$prefix@ldaptool_bindir@:$prefix/usr/bin:@ldaptool_bindir@:/usr/bin";
+
+libpath_add("$prefix@nss_libdir@");
+libpath_add("$prefix/usr/lib");
+libpath_add("@nss_libdir@");
+libpath_add("/usr/lib");
+
+$ENV{'SHLIB_PATH'} = "$ENV{'LD_LIBRARY_PATH'}";
+
+$i = 0;
+while ($i <= $#ARGV)
+{
+ if ("$ARGV[$i]" eq "-b")
+ {
+ # Base DN
+ $i++; $basedn = $ARGV[$i];
+ }
+ elsif ("$ARGV[$i]" eq "-r")
+ {
+ # rid
+ $i++; $rid = $ARGV[$i];
+ }
+ elsif ("$ARGV[$i]" eq "-A")
+ {
+ # abort
+ $abort = "yes";
+ }
+ elsif ("$ARGV[$i]" eq "-D")
+ {
+ # Directory Manager
+ $i++; $rootdn = $ARGV[$i];
+ }
+ elsif ("$ARGV[$i]" eq "-w")
+ {
+ # Directory Manager's password
+ $i++; $passwd = $ARGV[$i];
+ }
+ elsif ("$ARGV[$i]" eq "-j")
+ {
+ # Read Directory Manager's password from a file
+ $i++; $passwdfile = $ARGV[$i];
+ }
+ elsif ("$ARGV[$i]" eq "-v")
+ {
+ # verbose
+ $verbose = 1;
+ }
+ else
+ {
+ &usage; exit(1);
+ }
+ $i++;
+}
+
+if ($passwdfile ne ""){
+# Open file and get the password
+ unless (open (RPASS, $passwdfile)) {
+ die "Error, cannot open password file $passwdfile\n";
+ }
+ $passwd = <RPASS>;
+ chomp($passwd);
+ close(RPASS);
+} elsif ($passwd eq "-"){
+# Read the password from terminal
+ print "Bind Password: ";
+ # Disable console echo
+ system("@sttyexec@ -echo") if -t STDIN;
+ # read the answer
+ $passwd = <STDIN>;
+ # Enable console echo
+ system("@sttyexec@ echo") if -t STDIN;
+ print "\n";
+ chop($passwd); # trim trailing newline
+}
+
+if ( $rootdn eq "" || $passwd eq "" || $basedn eq "" || $rid eq "")
+{
+ &usage;
+ exit(1);
+}
+
+$vstr = "";
+if ($verbose != 0)
+{
+ $vstr = "-v";
+}
+
+# Use a timestamp as part of the task entry name
+($s, $m, $h, $dy, $mn, $yr, $wdy, $ydy, $r) = localtime(time);
+$mn++; $yr += 1900;
+
+if($abort eq ""){
+ # Build the task entry to add
+ $taskname = "cleanallruv_${yr}_${mn}_${dy}_${h}_${m}_${s}";
+ $dn = "dn: cn=$taskname, cn=cleanallruv, cn=tasks, cn=config\n";
+} else {
+ $taskname = "abort_cleanallruv_${yr}_${mn}_${dy}_${h}_${m}_${s}";
+ $dn = "dn: cn=$taskname, cn=abort cleanallruv, cn=tasks, cn=config\n";
+}
+$misc = "changetype: add\nobjectclass: top\nobjectclass: extensibleObject\n";
+$cn = "cn: $taskname\n";
+$basedn = "replica-base-dn: $basedn\n";
+$rid = "replica-id: $rid\n";
+
+
+$entry = "${dn}${misc}${cn}${basedn}${rid}";
+open(FOO, "| ldapmodify @ldaptool_opts@ $vstr -h {{SERVER-NAME}} -p {{SERVER-PORT}} -D \"$rootdn\" -w \"$passwd\" -a" );
+print(FOO "$entry");
+close(FOO);
+
+sub libpath_add {
+ my $libpath = shift;
+
+ if ($libpath) {
+ if ($ENV{'LD_LIBRARY_PATH'}) {
+ $ENV{'LD_LIBRARY_PATH'} = "$ENV{'LD_LIBRARY_PATH'}:$libpath";
+ } else {
+ $ENV{'LD_LIBRARY_PATH'} = "$libpath";
+ }
+ }
+}
+
diff --git a/ldap/schema/01core389.ldif b/ldap/schema/01core389.ldif
index def693d..58b4b76 100644
--- a/ldap/schema/01core389.ldif
+++ b/ldap/schema/01core389.ldif
@@ -134,15 +134,10 @@ attributeTypes: ( 2.16.840.1.113730.3.1.2096 NAME 'entryusn' DESC 'Netscape defi
attributeTypes: ( 2.16.840.1.113730.3.1.2113 NAME 'internalModifiersName' DESC 'plugin dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation X-ORIGIN '389 Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.2114 NAME 'internalCreatorsName' DESC 'plugin dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation X-ORIGIN '389 Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.2133 NAME 'pwdUpdateTime' DESC 'Last password update time' SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE USAGE directoryOperation X-ORIGIN '389 Directory Server' )
-attributeTypes: ( 2.16.840.1.113730.3.1.2111 NAME 'tombstoneNumSubordinates'
- DESC 'count of immediate subordinates for tombstone entries'
- EQUALITY integerMatch
- ORDERING integerOrderingMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
- SINGLE-VALUE
- NO-USER-MODIFICATION
- USAGE directoryOperation
- X-ORIGIN '389 directory server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2135 NAME 'nsds5ReplicaCleanRUV' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2136 NAME 'nsds5ReplicaCleanRUVNotified' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2137 NAME 'nsds5ReplicaAbortCleanRUV' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2111 NAME 'tombstoneNumSubordinates' DESC 'count of immediate subordinates for tombstone entries' EQUALITY integerMatch ORDERING integerOrderingMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation X-ORIGIN '389 directory server' )
#
# objectclasses
#
@@ -152,9 +147,9 @@ objectClasses: ( 2.16.840.1.113730.3.2.44 NAME 'nsIndex' DESC 'Netscape defined
objectClasses: ( 2.16.840.1.113730.3.2.109 NAME 'nsBackendInstance' DESC 'Netscape defined objectclass' SUP top MUST ( CN ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.110 NAME 'nsMappingTree' DESC 'Netscape defined objectclass' SUP top MUST ( CN ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.104 NAME 'nsContainer' DESC 'Netscape defined objectclass' SUP top MUST ( CN ) X-ORIGIN 'Netscape Directory Server' )
-objectClasses: ( 2.16.840.1.113730.3.2.108 NAME 'nsDS5Replica' DESC 'Netscape defined objectclass' SUP top MUST ( nsDS5ReplicaRoot $ nsDS5ReplicaId ) MAY (cn $ nsDS5ReplicaType $ nsDS5ReplicaBindDN $ nsState $ nsDS5ReplicaName $ nsDS5Flags $ nsDS5Task $ nsDS5ReplicaReferral $ nsDS5ReplicaAutoReferral $ nsds5ReplicaPurgeDelay $ nsds5ReplicaTombstonePurgeInterval $ nsds5ReplicaChangeCount $ nsds5ReplicaLegacyConsumer) X-ORIGIN 'Netscape Directory Server' )
+objectClasses: ( 2.16.840.1.113730.3.2.108 NAME 'nsDS5Replica' DESC 'Netscape defined objectclass' SUP top MUST ( nsDS5ReplicaRoot $ nsDS5ReplicaId ) MAY (cn $ nsds5ReplicaCleanRUV $ nsds5ReplicaAbortCleanRUV $ nsDS5ReplicaType $ nsDS5ReplicaBindDN $ nsState $ nsDS5ReplicaName $ nsDS5Flags $ nsDS5Task $ nsDS5ReplicaReferral $ nsDS5ReplicaAutoReferral $ nsds5ReplicaPurgeDelay $ nsds5ReplicaTombstonePurgeInterval $ nsds5ReplicaChangeCount $ nsds5ReplicaLegacyConsumer) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.113 NAME 'nsTombstone' DESC 'Netscape defined objectclass' SUP top MAY ( nsParentUniqueId $ nscpEntryDN ) X-ORIGIN 'Netscape Directory Server' )
-objectClasses: ( 2.16.840.1.113730.3.2.103 NAME 'nsDS5ReplicationAgreement' DESC 'Netscape defined objectclass' SUP top MUST ( cn ) MAY ( nsDS5ReplicaHost $ nsDS5ReplicaPort $ nsDS5ReplicaTransportInfo $ nsDS5ReplicaBindDN $ nsDS5ReplicaCredentials $ nsDS5ReplicaBindMethod $ nsDS5ReplicaRoot $ nsDS5ReplicatedAttributeList $ nsDS5ReplicatedAttributeListTotal $ nsDS5ReplicaUpdateSchedule $ nsds5BeginReplicaRefresh $ description $ nsds50ruv $ nsruvReplicaLastModified $ nsds5ReplicaTimeout $ nsds5replicaChangesSentSinceStartup $ nsds5replicaLastUpdateEnd $ nsds5replicaLastUpdateStart $ nsds5replicaLastUpdateStatus $ nsds5replicaUpdateInProgress $ nsds5replicaLastInitEnd $ nsds5ReplicaEnabled $ nsds5replicaLastInitStart $ nsds5replicaLastInitStatus $ nsds5debugreplicatimeout $ nsds5replicaBusyWaitTime $ nsds5ReplicaStripAttrs $ nsds5replicaSessionPauseTime ) X-ORIGIN 'Netscape Directory Server' )
+objectClasses: ( 2.16.840.1.113730.3.2.103 NAME 'nsDS5ReplicationAgreement' DESC 'Netscape defined objectclass' SUP top MUST ( cn ) MAY ( nsds5ReplicaCleanRUVNotified $ nsDS5ReplicaHost $ nsDS5ReplicaPort $ nsDS5ReplicaTransportInfo $ nsDS5ReplicaBindDN $ nsDS5ReplicaCredentials $ nsDS5ReplicaBindMethod $ nsDS5ReplicaRoot $ nsDS5ReplicatedAttributeList $ nsDS5ReplicatedAttributeListTotal $ nsDS5ReplicaUpdateSchedule $ nsds5BeginReplicaRefresh $ description $ nsds50ruv $ nsruvReplicaLastModified $ nsds5ReplicaTimeout $ nsds5replicaChangesSentSinceStartup $ nsds5replicaLastUpdateEnd $ nsds5replicaLastUpdateStart $ nsds5replicaLastUpdateStatus $ nsds5replicaUpdateInProgress $ nsds5replicaLastInitEnd $ nsds5ReplicaEnabled $ nsds5replicaLastInitStart $ nsds5replicaLastInitStatus $ nsds5debugreplicatimeout $ nsds5replicaBusyWaitTime $ nsds5ReplicaStripAttrs $ nsds5replicaSessionPauseTime ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.39 NAME 'nsslapdConfig' DESC 'Netscape defined objectclass' SUP top MAY ( cn ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.317 NAME 'nsSaslMapping' DESC 'Netscape defined objectclass' SUP top MUST ( cn $ nsSaslMapRegexString $ nsSaslMapBaseDNTemplate $ nsSaslMapFilterTemplate ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.43 NAME 'nsSNMP' DESC 'Netscape defined objectclass' SUP top MUST ( cn $ nsSNMPEnabled ) MAY ( nsSNMPOrganization $ nsSNMPLocation $ nsSNMPContact $ nsSNMPDescription $ nsSNMPName $ nsSNMPMasterHost $ nsSNMPMasterPort ) X-ORIGIN 'Netscape Directory Server' )
diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
index 08bf771..a347c57 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.c
@@ -345,15 +345,15 @@ static int _cl5CheckMissingCSN (const CSN *minCsn, const RUV *supplierRUV, CL5DB
static int _cl5TrimInit ();
static void _cl5TrimCleanup ();
static int _cl5TrimMain (void *param);
-static void _cl5DoTrimming ();
-static void _cl5TrimFile (Object *obj, long *numToTrim);
+static void _cl5DoTrimming (ReplicaId rid);
+static void _cl5TrimFile (Object *obj, long *numToTrim, ReplicaId cleaned_rid);
static PRBool _cl5CanTrim (time_t time, long *numToTrim);
static int _cl5ReadRUV (const char *replGen, Object *obj, PRBool purge);
static int _cl5WriteRUV (CL5DBFile *file, PRBool purge);
static int _cl5ConstructRUV (const char *replGen, Object *obj, PRBool purge);
static int _cl5UpdateRUV (Object *obj, CSN *csn, PRBool newReplica, PRBool purge);
static int _cl5GetRUV2Purge2 (Object *fileObj, RUV **ruv);
-void trigger_cl_trimming_thread();
+void trigger_cl_trimming_thread(void *rid);
/* bakup/recovery, import/export */
static int _cl5LDIF2Operation (char *ldifEntry, slapi_operation_parameters *op,
@@ -699,12 +699,12 @@ int cl5DeleteDBSync (Object *replica)
}
/* Name: cl5GetUpperBoundRUV
- Description: retrieves vector for that represnts the upper bound of the changes for a replica.
+ Description: retrieves vector for that represents the upper bound of the changes for a replica.
Parameters: r - replica for which the purge vector is requested
ruv - contains a copy of the purge ruv if function is successful;
- unchanged otherwise. It is responsobility pf the caller to free
+ unchanged otherwise. It is responsibility of the caller to free
the ruv when it is no longer is in use
- Return: CL5_SUCCESS if function is successfull
+ Return: CL5_SUCCESS if function is successful
CL5_BAD_STATE if the changelog is not initialized;
CL5_BAD_DATA - if NULL id is supplied
CL5_NOTFOUND, if changelog file for replica is not found
@@ -1682,6 +1682,16 @@ cl5GetNextOperationToReplay (CL5ReplayIterator *iterator, CL5Entry *entry)
return CL5_DB_ERROR;
}
+ if(is_cleaned_rid(csn_get_replicaid(csn))){
+ /*
+ * This operation is from a deleted replica. During the cleanallruv task the
+ * replicas are cleaned first before this instance is. This can cause the
+ * server to basically do a full update over and over. So we have to watch for
+ * this, and not send these operations out.
+ */
+ return CL5_IGNORE_OP;
+ }
+
/* there is an entry we should return */
/* Callers of this function should cl5_operation_parameters_done(op) */
if ( 0 != cl5DBData2Entry ( data, datalen, entry ) )
@@ -3383,7 +3393,7 @@ static int _cl5TrimMain (void *param)
{
/* time to trim */
timePrev = timeNow;
- _cl5DoTrimming ();
+ _cl5DoTrimming (0 /* there's no cleaned rid */);
}
if (NULL == s_cl5Desc.clLock)
{
@@ -3417,7 +3427,7 @@ static int _cl5TrimMain (void *param)
*/
-static void _cl5DoTrimming ()
+static void _cl5DoTrimming (ReplicaId rid)
{
Object *obj;
long numToTrim;
@@ -3430,7 +3440,7 @@ static void _cl5DoTrimming ()
obj = objset_first_obj (s_cl5Desc.dbFiles);
while (obj && _cl5CanTrim ((time_t)0, &numToTrim))
{
- _cl5TrimFile (obj, &numToTrim);
+ _cl5TrimFile (obj, &numToTrim, rid);
obj = objset_next_obj (s_cl5Desc.dbFiles, obj);
}
@@ -3447,12 +3457,13 @@ static void _cl5DoTrimming ()
*/
#define CL5_TRIM_MAX_PER_TRANSACTION 10
-static void _cl5TrimFile (Object *obj, long *numToTrim)
+static void _cl5TrimFile (Object *obj, long *numToTrim, ReplicaId cleaned_rid)
{
DB_TXN *txnid;
RUV *ruv = NULL;
CL5Entry entry;
slapi_operation_parameters op = {0};
+ ReplicaId csn_rid;
void *it;
int finished = 0, totalTrimmed = 0, count;
PRBool abort;
@@ -3476,7 +3487,6 @@ static void _cl5TrimFile (Object *obj, long *numToTrim)
count = 0;
txnid = NULL;
abort = PR_FALSE;
- ReplicaId rid;
/* DB txn lock accessed pages until the end of the transaction. */
@@ -3497,14 +3507,13 @@ static void _cl5TrimFile (Object *obj, long *numToTrim)
* This change can be trimmed if it exceeds purge
* parameters and has been seen by all consumers.
*/
- rid = csn_get_replicaid (op.csn);
+ csn_rid = csn_get_replicaid (op.csn);
if ( (*numToTrim > 0 || _cl5CanTrim (entry.time, numToTrim)) &&
ruv_covers_csn_strict (ruv, op.csn) )
{
rc = _cl5CurrentDeleteEntry (it);
- if ( rc == CL5_SUCCESS && !is_released_rid(rid))
+ if ( rc == CL5_SUCCESS && cleaned_rid != csn_rid)
{
- /* update purge vector, unless this is a released rid */
rc = _cl5UpdateRUV (obj, op.csn, PR_FALSE, PR_TRUE);
}
if ( rc == CL5_SUCCESS)
@@ -3530,8 +3539,7 @@ static void _cl5TrimFile (Object *obj, long *numToTrim)
* the trim forever.
*/
CSN *maxcsn = NULL;
- rid = csn_get_replicaid (op.csn);
- ruv_get_largest_csn_for_replica (ruv, rid, &maxcsn);
+ ruv_get_largest_csn_for_replica (ruv, csn_rid, &maxcsn);
if ( csn_compare (op.csn, maxcsn) != 0 )
{
/* op.csn is not anchor CSN */
@@ -3895,20 +3903,18 @@ static int _cl5UpdateRUV (Object *obj, CSN *csn, PRBool newReplica, PRBool purge
/* update vector only if this replica is not yet part of RUV */
if (purge && newReplica)
{
- if (ruv_contains_replica (file->purgeRUV, rid))
+ if (ruv_contains_replica (file->purgeRUV, rid)){
return CL5_SUCCESS;
- else if(!is_cleaned_rid(rid))
- {
+ } else {
/* if the replica is not part of the purgeRUV yet, add it unless it's from a cleaned rid */
ruv_add_replica (file->purgeRUV, rid, multimaster_get_local_purl());
}
}
else
{
- if (purge)
+ if (purge){
rc = ruv_set_csns(file->purgeRUV, csn, NULL);
- else if(!is_cleaned_rid(rid)){
- /* don't update maxRuv if rid is cleaned */
+ } else {
rc = ruv_set_csns(file->maxRUV, csn, NULL);
}
}
@@ -4520,17 +4526,9 @@ static int _cl5WriteOperationTxn(const char *replName, const char *replGen,
CL5Entry entry;
CL5DBFile *file = NULL;
Object *file_obj = NULL;
- ReplicaId rid = csn_get_replicaid (op->csn);
DB_TXN *txnid = NULL;
DB_TXN *parent_txnid = (DB_TXN *)txn;
- /*
- * If the op csn contains the cleaned rid, don't write it
- */
- if(is_cleaned_rid(rid)){
- return CL5_SUCCESS;
- }
-
rc = _cl5GetDBFileByReplicaName (replName, replGen, &file_obj);
if (rc == CL5_NOTFOUND)
{
@@ -5089,7 +5087,7 @@ static int _cl5PositionCursorForReplay (ReplicaId consumerRID, const RUV *consum
* legacy consumer. In this case the supplier
* and the consumer may have the same RID.
*/
- if (rid == consumerRID && rid != MAX_REPLICA_ID)
+ if ((rid == consumerRID && rid != MAX_REPLICA_ID) || (is_cleaned_rid(rid)) )
continue;
startCSN = csns[i];
@@ -6556,13 +6554,12 @@ cl5CleanRUV(ReplicaId rid){
}
}
-void trigger_cl_trimming(){
+void trigger_cl_trimming(ReplicaId rid){
PRThread *trim_tid = NULL;
- ReplicaId rid = get_released_rid();
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "trigger_cl_trimming: rid (%d)\n",(int)rid);
trim_tid = PR_CreateThread(PR_USER_THREAD, (VFP)(void*)trigger_cl_trimming_thread,
- NULL, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ (void *)&rid, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
PR_UNJOINABLE_THREAD, DEFAULT_THREAD_STACKSIZE);
if (NULL == trim_tid){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl,
@@ -6575,7 +6572,9 @@ void trigger_cl_trimming(){
}
void
-trigger_cl_trimming_thread(){
+trigger_cl_trimming_thread(void *arg){
+ ReplicaId rid = *(ReplicaId *)arg;
+
/* make sure we have a change log, and we aren't closing it */
if(s_cl5Desc.dbState == CL5_STATE_CLOSED || s_cl5Desc.dbState == CL5_STATE_CLOSING){
return;
@@ -6585,6 +6584,6 @@ trigger_cl_trimming_thread(){
"trigger_cl_trimming: failed to increment thread count "
"NSPR error - %d\n", PR_GetError ());
}
- _cl5DoTrimming();
+ _cl5DoTrimming(rid);
_cl5RemoveThread();
}
diff --git a/ldap/servers/plugins/replication/cl5_api.h b/ldap/servers/plugins/replication/cl5_api.h
index b9c3dd8..9b285ca 100644
--- a/ldap/servers/plugins/replication/cl5_api.h
+++ b/ldap/servers/plugins/replication/cl5_api.h
@@ -145,9 +145,10 @@ enum
CL5_CSN_ERROR, /* CSN API failed */
CL5_RUV_ERROR, /* RUV API failed */
CL5_OBJSET_ERROR, /* namedobjset api failed */
- CL5_PURGED_DATA, /* requested data has been purged */
- CL5_MISSING_DATA, /* data should be in the changelog, but is missing */
- CL5_UNKNOWN_ERROR /* unclassified error */
+ CL5_PURGED_DATA, /* requested data has been purged */
+ CL5_MISSING_DATA, /* data should be in the changelog, but is missing */
+ CL5_UNKNOWN_ERROR, /* unclassified error */
+ CL5_IGNORE_OP /* ignore this updated - used by CLEANALLRUV task */
};
/***** Module APIs *****/
@@ -489,6 +490,6 @@ int cl5WriteRUV();
int cl5DeleteRUV();
void cl5CleanRUV(ReplicaId rid);
void cl5NotifyCleanup(int rid);
-void trigger_cl_trimming();
+void trigger_cl_trimming(ReplicaId rid);
#endif
diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h
index d7ba6a6..fc756b1 100644
--- a/ldap/servers/plugins/replication/repl5.h
+++ b/ldap/servers/plugins/replication/repl5.h
@@ -94,10 +94,11 @@
* new set of start and response extops. */
#define REPL_START_NSDS90_REPLICATION_REQUEST_OID "2.16.840.1.113730.3.5.12"
#define REPL_NSDS90_REPLICATION_RESPONSE_OID "2.16.840.1.113730.3.5.13"
-/* cleanruv/releaseruv extended ops */
+/* cleanallruv extended ops */
#define REPL_CLEANRUV_OID "2.16.840.1.113730.3.6.5"
-#define REPL_RELEASERUV_OID "2.16.840.1.113730.3.6.6"
-
+#define REPL_ABORT_CLEANRUV_OID "2.16.840.1.113730.3.6.6"
+#define CLEANRUV_NOTIFIED 0
+#define CLEANRUV_RELEASED 1
/* DS 5.0 replication protocol error codes */
#define NSDS50_REPL_REPLICA_READY 0x00 /* Replica ready, go ahead */
@@ -157,6 +158,7 @@ extern const char *type_nsds5ReplicaBusyWaitTime;
extern const char *type_nsds5ReplicaSessionPauseTime;
extern const char *type_nsds5ReplicaEnabled;
extern const char *type_nsds5ReplicaStripAttrs;
+extern const char *type_nsds5ReplicaCleanRUVnotified;
/* Attribute names for windows replication agreements */
extern const char *type_nsds7WindowsReplicaArea;
@@ -185,6 +187,8 @@ extern const char *type_replicaPurgeDelay;
extern const char *type_replicaChangeCount;
extern const char *type_replicaTombstonePurgeInterval;
extern const char *type_replicaLegacyConsumer;
+extern const char *type_replicaCleanRUV;
+extern const char *type_replicaAbortCleanRUV;
extern const char *type_ruvElementUpdatetime;
/* multimaster plugin points */
@@ -224,7 +228,7 @@ char* get_repl_session_id (Slapi_PBlock *pb, char *id, CSN **opcsn);
int multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb);
int multimaster_extop_EndNSDS50ReplicationRequest(Slapi_PBlock *pb);
int multimaster_extop_cleanruv(Slapi_PBlock *pb);
-int multimaster_extop_releaseruv(Slapi_PBlock *pb);
+int multimaster_extop_abort_cleanruv(Slapi_PBlock *pb);
int extop_noop(Slapi_PBlock *pb);
struct berval *NSDS50StartReplicationRequest_new(const char *protocol_oid,
const char *repl_root, char **extra_referrals, CSN *csn);
@@ -359,6 +363,10 @@ PRBool agmt_is_enabled(Repl_Agmt *ra);
int agmt_set_enabled_from_entry(Repl_Agmt *ra, Slapi_Entry *e);
char **agmt_get_attrs_to_strip(Repl_Agmt *ra);
int agmt_set_attrs_to_strip(Repl_Agmt *ra, Slapi_Entry *e);
+void agmt_set_cleanruv_notified_from_entry(Repl_Agmt *ra, Slapi_Entry *e);
+int agmt_set_cleanruv_data(Repl_Agmt *ra, ReplicaId rid, int op);
+int agmt_is_cleanruv_notified(Repl_Agmt *ra, ReplicaId rid);
+int agmt_set_timeout(Repl_Agmt *ra, long timeout);
typedef struct replica Replica;
@@ -369,7 +377,6 @@ void agmtlist_notify_all(Slapi_PBlock *pb);
Object* agmtlist_get_first_agreement_for_replica (Replica *r);
Object* agmtlist_get_next_agreement_for_replica (Replica *r, Object *prev);
-
/* In repl5_backoff.c */
typedef struct backoff_timer Backoff_Timer;
#define BACKOFF_FIXED 1
@@ -443,6 +450,7 @@ ConnResult conn_read_result_ex(Repl_Connection *conn, char **retoidp, struct ber
LDAP * conn_get_ldap(Repl_Connection *conn);
void conn_lock(Repl_Connection *conn);
void conn_unlock(Repl_Connection *conn);
+void conn_delete_internal_ext(Repl_Connection *conn);
/* In repl5_protocol.c */
typedef struct repl_protocol Repl_Protocol;
@@ -554,6 +562,9 @@ void replica_set_tombstone_reap_interval (Replica *r, long interval);
void replica_update_ruv_consumer (Replica *r, RUV *supplier_ruv);
void replica_set_ruv_dirty (Replica *r);
void replica_write_ruv (Replica *r);
+char *replica_get_dn(Replica *r);
+void replica_check_for_tasks(Replica*r, Slapi_Entry *e);
+
/* The functions below handles the state flag */
/* Current internal state flags */
/* The replica can be busy and not other flag,
@@ -594,22 +605,40 @@ int replica_config_init();
void replica_config_destroy ();
int get_replica_type(Replica *r);
int replica_execute_cleanruv_task_ext(Object *r, ReplicaId rid);
-void set_cleaned_rid(ReplicaId rid);
-void delete_cleaned_rid();
+void add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn);
int is_cleaned_rid(ReplicaId rid);
-int get_released_rid();
-void set_released_rid(int rid);
-int is_released_rid(int rid);
-int is_already_released_rid();
-void delete_released_rid();
-void replica_cleanallruv_monitor_thread(void *arg);
+int replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
+ int *returncode, char *returntext, void *arg);
+void replica_cleanallruv_thread_ext(void *arg);
+void stop_ruv_cleaning();
+int task_aborted();
+void replica_abort_task_thread(void *arg);
+void delete_cleaned_rid(Replica *r, ReplicaId rid, CSN *maxcsn);
+int process_repl_agmts(Replica *replica, int *agmt_info, char *oid, Slapi_Task *task, struct berval *payload, int op);
+int decode_cleanruv_payload(struct berval *extop_value, char **payload);
+struct berval *create_ruv_payload(char *value);
+void replica_add_cleanruv_data(Replica *r, char *val);
+void replica_remove_cleanruv_data(Replica *r, char *val);
+CSN *replica_get_cleanruv_maxcsn(Replica *r, ReplicaId rid);
+void ruv_get_cleaned_rids(RUV *ruv, ReplicaId *rids);
+void add_aborted_rid(ReplicaId rid, Replica *r, char *repl_root);
+int is_task_aborted(ReplicaId rid);
+void delete_aborted_rid(Replica *replica, ReplicaId rid, char *repl_root);
+void set_cleaned_rid(ReplicaId rid);
+void cleanruv_log(Slapi_Task *task, char *task_type, char *fmt, ...);
-#define ALREADY_RELEASED -1
+#define CLEANRIDSIZ 4 /* maximum number for concurrent CLEANALLRUV tasks */
typedef struct _cleanruv_data
{
Object *repl_obj;
+ Replica *replica;
ReplicaId rid;
+ Slapi_Task *task;
+ struct berval *payload;
+ CSN *maxcsn;
+ char *repl_root;
+ Slapi_DN *sdn;
} cleanruv_data;
/* replutil.c */
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index 2978aba..5a16083 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -141,6 +141,7 @@ typedef struct repl5agmt {
char **attrs_to_strip; /* for fractional replication, if a "mod" is empty, strip out these attributes:
* modifiersname, modifytimestamp, internalModifiersname, internalModifyTimestamp, etc */
int agreement_type;
+ int cleanruv_notified[CLEANRIDSIZ + 1]; /* specifies if the replica has been notified of a CLEANALLRUV task */
} repl5agmt;
/* Forward declarations */
@@ -251,6 +252,7 @@ agmt_new_from_entry(Slapi_Entry *e)
Repl_Agmt *ra;
Slapi_Attr *sattr;
char *tmpstr;
+ char **clean_vals = NULL;
char **denied_attrs = NULL;
char *auto_initialize = NULL;
char *val_nsds5BeginReplicaRefresh = "start";
@@ -425,6 +427,19 @@ agmt_new_from_entry(Slapi_Entry *e)
ra->last_init_start_time = 0UL;
ra->last_init_status[0] = '\0';
+ /* cleanruv notification */
+ clean_vals = slapi_entry_attr_get_charray(e, type_nsds5ReplicaCleanRUVnotified);
+ if(clean_vals){
+ int i;
+ for (i = 0; i < CLEANRIDSIZ && clean_vals[i]; i++){
+ ra->cleanruv_notified[i] = atoi(clean_vals[i]);
+ }
+ ra->cleanruv_notified[i + 1] = 0;
+ slapi_ch_array_free(clean_vals);
+ } else {
+ ra->cleanruv_notified[0] = 0;
+ }
+
/* Fractional attributes */
slapi_entry_attr_find(e, type_nsds5ReplicatedAttributeList, &sattr);
@@ -1685,6 +1700,20 @@ agmt_set_timeout_from_entry(Repl_Agmt *ra, const Slapi_Entry *e)
return return_value;
}
+int
+agmt_set_timeout(Repl_Agmt *ra, long timeout)
+{
+ PR_Lock(ra->lock);
+ if (ra->stop_in_progress){
+ PR_Unlock(ra->lock);
+ return -1;
+ }
+ ra->timeout = timeout;
+ PR_Unlock(ra->lock);
+
+ return 0;
+}
+
/*
* Set or reset the busywaittime
*
@@ -2571,3 +2600,84 @@ agmt_set_attrs_to_strip(Repl_Agmt *ra, Slapi_Entry *e)
return -1;
}
+
+int
+agmt_is_cleanruv_notified(Repl_Agmt *ra, ReplicaId rid){
+ int notified = 0;
+ int i;
+
+ PR_Lock(ra->lock);
+ for(i = 0; i < CLEANRIDSIZ && ra->cleanruv_notified[i]; i++){
+ if(ra->cleanruv_notified[i] == rid){
+ notified = 1;
+ break;
+ }
+ }
+ PR_Unlock(ra->lock);
+
+ return notified;
+}
+
+/*
+ * This will trigger agmt_set_cleanruv_notified_from_entry() to be called,
+ * which will update the in memory agmt.
+ *
+ * op can be: CLEANRUV_NOTIFIED or CLEANRUV_RELEASED
+ */
+int
+agmt_set_cleanruv_data(Repl_Agmt *ra, ReplicaId rid, int op){
+ Slapi_PBlock *pb;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ struct berval *vals[2];
+ struct berval val;
+ char data[6];
+ int rc = 0;
+
+ if(ra == NULL){
+ return -1;
+ }
+
+ if(op == CLEANRUV_NOTIFIED){
+ /* add the cleanruv data */
+ mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
+ } else {
+ /* remove the cleanruv data */
+ mod.mod_op = LDAP_MOD_DELETE|LDAP_MOD_BVALUES;
+ }
+
+ pb = slapi_pblock_new();
+ val.bv_len = PR_snprintf(data, sizeof(data), "%d", (int)rid);
+ mod.mod_type = (char *)type_nsds5ReplicaCleanRUVnotified;
+ mod.mod_bvalues = vals;
+ vals [0] = &val;
+ vals [1] = NULL;
+ val.bv_val = data;
+ mods[0] = &mod;
+ mods[1] = NULL;
+
+ slapi_modify_internal_set_pb_ext (pb, ra->dn, mods, NULL, NULL,
+ repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_modify_internal_pb (pb);
+ slapi_pblock_destroy(pb);
+
+ return rc;
+}
+
+void
+agmt_set_cleanruv_notified_from_entry(Repl_Agmt *ra, Slapi_Entry *e){
+ char **attr_vals = NULL;
+ int i;
+
+ PR_Lock(ra->lock);
+ attr_vals = slapi_entry_attr_get_charray(e, type_nsds5ReplicaCleanRUVnotified);
+ if(attr_vals){
+ for (i = 0; i < CLEANRIDSIZ && attr_vals[i]; i++){
+ ra->cleanruv_notified[i] = atoi(attr_vals[i]);
+ }
+ ra->cleanruv_notified[i + 1] = 0;
+ } else {
+ ra->cleanruv_notified[0] = 0;
+ }
+ PR_Unlock(ra->lock);
+}
diff --git a/ldap/servers/plugins/replication/repl5_agmtlist.c b/ldap/servers/plugins/replication/repl5_agmtlist.c
index 86f06bf..c0b9664 100644
--- a/ldap/servers/plugins/replication/repl5_agmtlist.c
+++ b/ldap/servers/plugins/replication/repl5_agmtlist.c
@@ -508,6 +508,10 @@ agmtlist_modify_callback(Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry
rc = SLAPI_DSE_CALLBACK_ERROR;
}
}
+ else if (slapi_attr_types_equivalent(mods[i]->mod_type, type_nsds5ReplicaCleanRUVnotified))
+ {
+ agmt_set_cleanruv_notified_from_entry(agmt, e);
+ }
else if (0 == windows_handle_modify_agreement(agmt, mods[i]->mod_type, e))
{
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: "
diff --git a/ldap/servers/plugins/replication/repl5_connection.c b/ldap/servers/plugins/replication/repl5_connection.c
index 5fdc601..51a2bc5 100644
--- a/ldap/servers/plugins/replication/repl5_connection.c
+++ b/ldap/servers/plugins/replication/repl5_connection.c
@@ -140,7 +140,7 @@ static void repl5_debug_timeout_callback(time_t when, void *arg);
static void close_connection_internal(Repl_Connection *conn);
/*
- * Create a new conenction object. Returns a pointer to the object, or
+ * Create a new connection object. Returns a pointer to the object, or
* NULL if an error occurs.
*/
Repl_Connection *
@@ -217,6 +217,17 @@ conn_delete_internal(Repl_Connection *conn)
}
/*
+ * Used by CLEANALLRUV - free it all!
+ */
+void
+conn_delete_internal_ext(Repl_Connection *conn)
+{
+ conn_delete_internal(conn);
+ PR_DestroyLock(conn->lock);
+ slapi_ch_free((void **)&conn);
+}
+
+/*
* Destroy a connection. It is an error to use the connection object
* after conn_delete() has been called.
*/
diff --git a/ldap/servers/plugins/replication/repl5_inc_protocol.c b/ldap/servers/plugins/replication/repl5_inc_protocol.c
index 7388d62..025c23f 100644
--- a/ldap/servers/plugins/replication/repl5_inc_protocol.c
+++ b/ldap/servers/plugins/replication/repl5_inc_protocol.c
@@ -466,7 +466,7 @@ repl5_inc_waitfor_async_results(result_data *rd)
int done = 0;
int loops = 0;
/* Keep pulling results off the LDAP connection until we catch up to the last message id stored in the rd */
- while (!done)
+ while (!done && !slapi_is_shutting_down())
{
/* Lock the structure to force memory barrier */
PR_Lock(rd->lock);
@@ -1473,10 +1473,10 @@ repl5_inc_update_from_op_result(Private_Repl_Protocol *prp, ConnResult replay_cr
agmt_inc_last_update_changecount (prp->agmt, replica_id, 1 /*skipped*/);
}
slapi_log_error(*finished ? SLAPI_LOG_FATAL : slapi_log_urp, repl_plugin_name,
- "%s: Consumer failed to replay change (uniqueid %s, CSN %s): %s. %s.\n",
+ "%s: Consumer failed to replay change (uniqueid %s, CSN %s): %s (%d). %s.\n",
agmt_get_long_name(prp->agmt),
uniqueid, csn_str,
- ldap_err2string(connection_error),
+ ldap_err2string(connection_error), connection_error,
*finished ? "Will retry later" : "Skipping");
}
else if (CONN_NOT_CONNECTED == replay_crc)
@@ -1487,10 +1487,11 @@ repl5_inc_update_from_op_result(Private_Repl_Protocol *prp, ConnResult replay_cr
*finished = 1;
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"%s: Consumer failed to replay change (uniqueid %s, CSN %s): "
- "%s. Will retry later.\n",
+ "%s(%d). Will retry later.\n",
agmt_get_long_name(prp->agmt),
uniqueid, csn_str,
- connection_error ? ldap_err2string(connection_error) : "Connection lost");
+ connection_error ? ldap_err2string(connection_error) : "Connection lost",
+ connection_error);
}
else if (CONN_TIMEOUT == replay_crc)
{
@@ -1533,7 +1534,7 @@ repl5_inc_update_from_op_result(Private_Repl_Protocol *prp, ConnResult replay_cr
* has already been acquired, (2) that the consumer's update vector has
* been checked and (3) that it's ok to send incremental updates.
* Returns:
- * UPDATE_NO_MORE_UPDATES - all updates were sent succussfully
+ * UPDATE_NO_MORE_UPDATES - all updates were sent successfully
* UPDATE_TRANSIENT_ERROR - some non-permanent error occurred. Try again later.
* UPDATE_FATAL_ERROR - some bad, permanent error occurred.
* UPDATE_SCHEDULE_WINDOW_CLOSED - the schedule window closed on us.
@@ -1603,7 +1604,7 @@ send_updates(Private_Repl_Protocol *prp, RUV *remote_update_vector, PRUint32 *nu
agmt_get_long_name(prp->agmt));
return_value = UPDATE_FATAL_ERROR;
break;
- case CL5_SYSTEM_ERROR: /* NSPR error occurred: use PR_GetError for furhter info */
+ case CL5_SYSTEM_ERROR: /* NSPR error occurred: use PR_GetError for further info */
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"%s: An NSPR error (%d) occurred\n",
agmt_get_long_name(prp->agmt), PR_GetError());
@@ -1642,7 +1643,7 @@ send_updates(Private_Repl_Protocol *prp, RUV *remote_update_vector, PRUint32 *nu
break;
case CL5_UNKNOWN_ERROR: /* unclassified error */
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "%s: An unknown error was ecountered\n",
+ "%s: An unknown error was encountered\n",
agmt_get_long_name(prp->agmt));
return_value = UPDATE_TRANSIENT_ERROR;
break;
@@ -1834,6 +1835,8 @@ send_updates(Private_Repl_Protocol *prp, RUV *remote_update_vector, PRUint32 *nu
agmt_get_long_name(prp->agmt));
return_value = UPDATE_FATAL_ERROR;
break;
+ case CL5_IGNORE_OP:
+ break;
default:
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"%s: Unknown error code (%d) returned from cl5GetNextOperationToReplay\n",
@@ -1865,7 +1868,7 @@ send_updates(Private_Repl_Protocol *prp, RUV *remote_update_vector, PRUint32 *nu
/* Terminate the results reading thread */
if (!prp->repl50consumer)
{
- /* We need to ensure that we wait until all the responses have been recived from our operations */
+ /* We need to ensure that we wait until all the responses have been received from our operations */
if (return_value != UPDATE_CONNECTION_LOST) {
/* if connection was lost/closed, there will be nothing to read */
repl5_inc_waitfor_async_results(rd);
diff --git a/ldap/servers/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c
index a878b19..7a80c6f 100644
--- a/ldap/servers/plugins/replication/repl5_init.c
+++ b/ldap/servers/plugins/replication/repl5_init.c
@@ -126,12 +126,12 @@ static char *cleanruv_name_list[] = {
NSDS_REPL_NAME_PREFIX " Cleanruv",
NULL
};
-static char *releaseruv_oid_list[] = {
- REPL_RELEASERUV_OID,
+static char *cleanruv_abort_oid_list[] = {
+ REPL_ABORT_CLEANRUV_OID,
NULL
};
-static char *releaseruv_name_list[] = {
- NSDS_REPL_NAME_PREFIX " Releaseruv",
+static char *cleanruv_abort_name_list[] = {
+ NSDS_REPL_NAME_PREFIX " Cleanruv Abort",
NULL
};
@@ -474,7 +474,7 @@ multimaster_cleanruv_extop_init( Slapi_PBlock *pb )
}
int
-multimaster_releaseruv_extop_init( Slapi_PBlock *pb )
+multimaster_cleanruv_abort_extop_init( Slapi_PBlock *pb )
{
int rc= 0; /* OK */
void *identity = NULL;
@@ -485,11 +485,11 @@ multimaster_releaseruv_extop_init( Slapi_PBlock *pb )
if (slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, SLAPI_PLUGIN_VERSION_01 ) != 0 ||
slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, (void *)&multimasterextopdesc ) != 0 ||
- slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_OIDLIST, (void *)releaseruv_oid_list ) != 0 ||
- slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, (void *)releaseruv_name_list ) != 0 ||
- slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_FN, (void *)multimaster_extop_releaseruv ))
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_OIDLIST, (void *)cleanruv_abort_oid_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, (void *)cleanruv_abort_name_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_FN, (void *)multimaster_extop_abort_cleanruv ))
{
- slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, "multimaster_releaseruv_extop_init failed\n" );
+ slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, "multimaster_cleanruv_abort_extop_init failed\n" );
rc= -1;
}
@@ -605,24 +605,22 @@ multimaster_stop( Slapi_PBlock *pb )
int rc= 0; /* OK */
if (!multimaster_stopped_flag)
- {
- if (!is_ldif_dump)
- {
- agmtlist_shutdown(); /* Shut down replication agreements */
- }
-
+ {
+ if (!is_ldif_dump)
+ {
+ /* Shut down replication agreements */
+ agmtlist_shutdown();
+ }
+ /* if we are cleaning a ruv, stop */
+ stop_ruv_cleaning();
/* unregister backend state change notification */
slapi_unregister_backend_state_change((void *)multimaster_be_state_change);
-
- changelog5_cleanup(); /* Shut down the changelog */
- multimaster_mtnode_extension_destroy(); /* Destroy mapping tree node exts */
+ changelog5_cleanup(); /* Shut down the changelog */
+ multimaster_mtnode_extension_destroy(); /* Destroy mapping tree node exts */
replica_destroy_name_hash(); /* destroy the hash and its remaining content */
replica_config_destroy (); /* Destroy replica config info */
- multimaster_stopped_flag = 1;
- /* JCMREPL - Wait for all our threads to stop */
- /* JCMREPL - Shut down the replication plugin */
- /* JCMREPL - Mark all the replication plugin interfaces at not enabled. */
- }
+ multimaster_stopped_flag = 1;
+ }
return rc;
}
@@ -680,7 +678,7 @@ int replication_multimaster_plugin_init(Slapi_PBlock *pb)
rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_total_extop_init", multimaster_total_extop_init, "Multimaster replication total update extended operation plugin", NULL, identity);
rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_response_extop_init", multimaster_response_extop_init, "Multimaster replication extended response plugin", NULL, identity);
rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_extop_init", multimaster_cleanruv_extop_init, "Multimaster replication cleanruv extended operation plugin", NULL, identity);
- rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_releaseruv_extop_init", multimaster_releaseruv_extop_init, "Multimaster replication releaserid extended response plugin", NULL, identity);
+ rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_abort_extop_init", multimaster_cleanruv_abort_extop_init, "Multimaster replication cleanruv abort extended operation plugin", NULL, identity);
if (0 == rc)
{
multimaster_initialised = 1;
diff --git a/ldap/servers/plugins/replication/repl5_plugins.c b/ldap/servers/plugins/replication/repl5_plugins.c
index 2b4d0c9..33b197d 100644
--- a/ldap/servers/plugins/replication/repl5_plugins.c
+++ b/ldap/servers/plugins/replication/repl5_plugins.c
@@ -1020,15 +1020,6 @@ write_changelog_and_ruv (Slapi_PBlock *pb)
r = (Replica*)object_get_data (repl_obj);
PR_ASSERT (r);
- /*
- * In case we had to run cleanruv, we don't want to continue to write
- * updates to the changelog/database ruv from that replica(rid).
- */
- if( is_cleaned_rid(replica_get_rid(r))){
- /* this RID has been cleaned, just goto done */
- goto done;
- }
-
if (replica_is_flag_set (r, REPLICA_LOG_CHANGES) &&
(cl5GetState () == CL5_STATE_OPEN))
{
@@ -1083,6 +1074,12 @@ write_changelog_and_ruv (Slapi_PBlock *pb)
op_params->target_address.uniqueid = slapi_ch_strdup (uniqueid);
}
+ if( is_cleaned_rid(csn_get_replicaid(op_params->csn))){
+ /* this RID has been cleaned */
+ object_release (repl_obj);
+ return 0;
+ }
+
/* we might have stripped all the mods - in that case we do not
log the operation */
if (op_params->operation_type != SLAPI_OPERATION_MODIFY ||
@@ -1135,7 +1132,6 @@ write_changelog_and_ruv (Slapi_PBlock *pb)
update_ruv_component(r, opcsn, pb);
}
-done:
object_release (repl_obj);
return return_value;
}
@@ -1338,7 +1334,7 @@ process_operation (Slapi_PBlock *pb, const CSN *csn)
ruv = (RUV*)object_get_data (ruv_obj);
PR_ASSERT (ruv);
- rc = ruv_add_csn_inprogress (ruv, csn);
+ rc = ruv_add_csn_inprogress (ruv, csn);
object_release (ruv_obj);
object_release (r_obj);
diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
index ccaa29d..27cdacd 100644
--- a/ldap/servers/plugins/replication/repl5_replica.c
+++ b/ldap/servers/plugins/replication/repl5_replica.c
@@ -61,20 +61,20 @@
*/
struct replica {
Slapi_DN *repl_root; /* top of the replicated area */
- char *repl_name; /* unique replica name */
- PRBool new_name; /* new name was generated - need to be saved */
+ char *repl_name; /* unique replica name */
+ PRBool new_name; /* new name was generated - need to be saved */
ReplicaUpdateDNList updatedn_list; /* list of dns with which a supplier should bind
to update this replica */
ReplicaType repl_type; /* is this replica read-only ? */
- PRBool legacy_consumer; /* if true, this replica is supplied by 4.0 consumer */
- char* legacy_purl; /* partial url of the legacy supplier */
+ PRBool legacy_consumer; /* if true, this replica is supplied by 4.0 consumer */
+ char* legacy_purl; /* partial url of the legacy supplier */
ReplicaId repl_rid; /* replicaID */
Object *repl_ruv; /* replica update vector */
PRBool repl_ruv_dirty; /* Dirty flag for ruv */
CSNPL *min_csn_pl; /* Pending list for minimal CSN */
void *csn_pl_reg_id; /* registration assignment for csn callbacks */
unsigned long repl_state_flags; /* state flags */
- PRUint32 repl_flags; /* persistent, externally visible flags */
+ PRUint32 repl_flags; /* persistent, externally visible flags */
PRLock *repl_lock; /* protects entire structure */
Slapi_Eq_Context repl_eqcxt_rs; /* context to cancel event that saves ruv */
Slapi_Eq_Context repl_eqcxt_tr; /* context to cancel event that reaps tombstones */
@@ -85,9 +85,10 @@ struct replica {
PRBool tombstone_reap_active; /* TRUE when the tombstone reaper is running */
long tombstone_reap_interval; /* Time in seconds between tombstone reaping */
Slapi_ValueSet *repl_referral; /* A list of administrator provided referral URLs */
- PRBool state_update_inprogress; /* replica state is being updated */
- PRLock *agmt_lock; /* protects agreement creation, start and stop */
+ PRBool state_update_inprogress; /* replica state is being updated */
+ PRLock *agmt_lock; /* protects agreement creation, start and stop */
char *locking_purl; /* supplier who has exclusive access */
+ char *repl_cleanruv_data[CLEANRIDSIZ + 1];
};
@@ -123,6 +124,7 @@ static int replica_log_ruv_elements_nolock (const Replica *r);
static void replica_replace_ruv_tombstone(Replica *r);
static void start_agreements_for_replica (Replica *r, PRBool start);
static void _delete_tombstone(const char *tombstone_dn, const char *uniqueid, int ext_op_flags);
+static void replica_strip_cleaned_rids(Replica *r);
/* Allocates new replica and reads its state and state of its component from
* various parts of the DIT.
@@ -270,6 +272,8 @@ replica_new_from_entry (Slapi_Entry *e, char *errortext, PRBool is_add_operation
slapi_sdn_get_dn(r->repl_root));
}
+ replica_check_for_tasks(r, e);
+
done:
if (rc != 0 && r)
{
@@ -306,6 +310,7 @@ replica_destroy(void **arg)
{
Replica *r;
void *repl_name;
+ int i;
if (arg == NULL)
return;
@@ -392,6 +397,10 @@ replica_destroy(void **arg)
csnplFree(&r->min_csn_pl);;
}
+ for(i = 0;r->repl_cleanruv_data[i] != NULL; i++){
+ slapi_ch_free_string(&r->repl_cleanruv_data[i]);
+ }
+
slapi_ch_free((void **)arg);
}
@@ -1302,7 +1311,7 @@ replica_reload_ruv (Replica *r)
}
/* check if there is a changelog and whether this replica logs changes */
- if (cl5GetState () == CL5_STATE_OPEN && r->repl_flags & REPLICA_LOG_CHANGES)
+ if (cl5GetState () == CL5_STATE_OPEN && (r->repl_flags & REPLICA_LOG_CHANGES))
{
/* Compare new ruv to the changelog's upper bound ruv. We could only keep
@@ -1424,7 +1433,7 @@ int replica_check_for_data_reload (Replica *r, void *arg)
PR_ASSERT (r);
/* check that we have a changelog and if this replica logs changes */
- if (cl5GetState () == CL5_STATE_OPEN && r->repl_flags & REPLICA_LOG_CHANGES)
+ if (cl5GetState () == CL5_STATE_OPEN && (r->repl_flags & REPLICA_LOG_CHANGES))
{
/* Compare new ruv to the purge ruv. If the new contains csns which
are smaller than those in purge ruv, we need to remove old and
@@ -1558,6 +1567,12 @@ _replica_get_config_entry (const Slapi_DN *root)
return e;
}
+char *
+replica_get_dn(Replica *r)
+{
+ return _replica_get_config_dn (r->repl_root);
+}
+
static int
_replica_check_validity (const Replica *r)
{
@@ -1785,6 +1800,177 @@ _replica_init_from_config (Replica *r, Slapi_Entry *e, char *errortext)
return (_replica_check_validity (r));
}
+void
+replica_check_for_tasks(Replica *r, Slapi_Entry *e)
+{
+ char **clean_vals;
+
+ if(e == NULL){
+ return;
+ }
+ /*
+ * check if we are in the middle of a CLEANALLRUV task,
+ * if so set the cleaned rid, and fire off the thread
+ */
+ if ((clean_vals = slapi_entry_attr_get_charray(e, type_replicaCleanRUV)) != NULL)
+ {
+ PRThread *thread = NULL;
+ struct berval *payload = NULL;
+ CSN *maxcsn = NULL;
+ char *csnpart;
+ char *iter;
+ char csnstr[CSN_STRSIZE];
+ char *ridstr;
+ char *token = NULL;
+ ReplicaId rid;
+ int i;
+
+ for(i = 0; clean_vals[i]; i++){
+ cleanruv_data *data = NULL;
+
+ /*
+ * Set the cleanruv data, and add the cleaned rid
+ */
+ r->repl_cleanruv_data[i] = slapi_ch_strdup(clean_vals[i]);
+ token = ldap_utf8strtok_r(clean_vals[i], ":", &iter);
+ if(token){
+ rid = atoi(token);
+ if(rid <= 0 || rid >= READ_ONLY_REPLICA_ID){
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: invalid replica id(%d) "
+ "aborting task.\n", rid);
+ goto done;
+ }
+ } else {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: unable to parse cleanallruv "
+ "data (%s), aborting task.\n",clean_vals[i]);
+ goto done;
+ }
+ csnpart = ldap_utf8strtok_r(iter, ":", &iter);
+ maxcsn = csn_new();
+ csn_init_by_string(maxcsn, csnpart);
+ csn_as_string(maxcsn, PR_FALSE, csnstr);
+ add_cleaned_rid(rid, r, csnstr);
+
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: cleanAllRUV task found, "
+ "resuming the cleaning of rid(%d)...\n", rid);
+ /*
+ * Create payload
+ */
+ ridstr = slapi_ch_smprintf("%d:%s:%s", rid, slapi_sdn_get_dn(replica_get_root(r)), csnstr);
+ payload = create_ruv_payload(ridstr);
+ slapi_ch_free_string(&ridstr);
+
+ if(payload == NULL){
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: Startup: Failed to "
+ "create extended op payload, aborting task");
+ return;
+ }
+ /*
+ * Setup the data struct, and fire off the thread.
+ */
+ data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
+ if (data == NULL) {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV: failed to allocate cleanruv_data.\n");
+ csn_free(&maxcsn);
+ } else {
+ /* setup our data */
+ data->repl_obj = NULL;
+ data->replica = NULL;
+ data->rid = rid;
+ data->task = NULL;
+ data->maxcsn = maxcsn;
+ data->sdn = slapi_sdn_dup(r->repl_root);
+ data->payload = payload;
+
+ thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_thread_ext,
+ (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
+ if (thread == NULL) {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV: unable to create cleanAllRUV "
+ "thread for rid(%d)\n", (int)data->rid);
+ }
+ }
+ }
+ r->repl_cleanruv_data[i] = NULL;
+ }
+
+ if ((clean_vals = slapi_entry_attr_get_charray(e, type_replicaAbortCleanRUV)) != NULL)
+ {
+ PRThread *thread = NULL;
+ struct berval *payload;
+ CSN *maxcsn = NULL;
+ char *iter;
+ char *ridstr = NULL;
+ char *repl_root;
+ char *token = NULL;
+ ReplicaId rid;
+ int i;
+
+ for(i = 0; clean_vals[i]; i++){
+ cleanruv_data *data = NULL;
+
+ token = ldap_utf8strtok_r(clean_vals[i], ":", &iter);
+ if(token){
+ rid = atoi(token);
+ if(rid <= 0 || rid >= READ_ONLY_REPLICA_ID){
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: invalid replica id(%d) "
+ "aborting task.\n", rid);
+ goto done;
+ }
+ } else {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: unable to parse cleanallruv "
+ "data (%s), aborting task.\n",clean_vals[i]);
+ goto done;
+ }
+
+ repl_root = ldap_utf8strtok_r(iter, ":", &iter);
+ stop_ruv_cleaning();
+ maxcsn = replica_get_cleanruv_maxcsn(r, rid);
+ delete_cleaned_rid(r, rid, maxcsn);
+ csn_free(&maxcsn);
+
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: abort task found, "
+ "resuming abort of rid(%d).\n", rid);
+ /*
+ * Setup the data struct, and fire off the abort thread.
+ */
+ data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
+ if (data == NULL) {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to allocate cleanruv_data.\n");
+ } else {
+ ridstr = slapi_ch_smprintf("%d:%s", rid, repl_root);
+ payload = create_ruv_payload(ridstr);
+ slapi_ch_free_string(&ridstr);
+
+ if(payload == NULL){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to create extended "
+ "op payload\n");
+ } else {
+ /* setup the data */
+ data->repl_obj = NULL;
+ data->replica = NULL;
+ data->rid = rid;
+ data->task = NULL;
+ data->payload = payload;
+ data->repl_root = slapi_ch_strdup(repl_root);
+ data->sdn = slapi_sdn_dup(r->repl_root);
+
+ thread = PR_CreateThread(PR_USER_THREAD, replica_abort_task_thread,
+ (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
+ if (thread == NULL) {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: unable to create abort cleanAllRUV "
+ "thread for rid(%d)\n", (int)data->rid);
+ }
+ }
+ }
+ }
+ }
+
+done:
+ slapi_ch_array_free(clean_vals);
+}
+
/* This function updates the entry to contain information generated
during replica initialization.
Returns 0 if successful and -1 otherwise */
@@ -2782,26 +2968,25 @@ static const char *root_glue =
static int
replica_create_ruv_tombstone(Replica *r)
{
- int return_value = LDAP_LOCAL_ERROR;
- char *root_entry_str;
- Slapi_Entry *e = NULL;
+ int return_value = LDAP_LOCAL_ERROR;
+ char *root_entry_str;
+ Slapi_Entry *e = NULL;
const char *purl = NULL;
RUV *ruv;
struct berval **bvals = NULL;
Slapi_PBlock *pb = NULL;
int rc;
- PR_ASSERT(NULL != r && NULL != r->repl_root);
- root_entry_str = slapi_ch_smprintf(root_glue, slapi_sdn_get_ndn(r->repl_root),
- RUV_STORAGE_ENTRY_UNIQUEID);
+ PR_ASSERT(NULL != r && NULL != r->repl_root);
- e = slapi_str2entry(root_entry_str, SLAPI_STR2ENTRY_TOMBSTONE_CHECK);
+ root_entry_str = slapi_ch_smprintf(root_glue, slapi_sdn_get_ndn(r->repl_root), RUV_STORAGE_ENTRY_UNIQUEID);
+
+ e = slapi_str2entry(root_entry_str, SLAPI_STR2ENTRY_TOMBSTONE_CHECK);
if (e == NULL)
goto done;
/* Add ruv */
- if (r->repl_ruv == NULL)
- {
+ if (r->repl_ruv == NULL){
CSNGen *gen;
CSN *csn;
char csnstr [CSN_STRSIZE];
@@ -2810,42 +2995,34 @@ replica_create_ruv_tombstone(Replica *r)
gen = (CSNGen *)object_get_data(r->repl_csngen);
PR_ASSERT (gen);
- if (csngen_new_csn(gen, &csn, PR_FALSE /* notify */) == CSN_SUCCESS)
- {
- (void)csn_as_string(csn, PR_FALSE, csnstr);
- csn_free(&csn);
+ if (csngen_new_csn(gen, &csn, PR_FALSE /* notify */) == CSN_SUCCESS){
+ (void)csn_as_string(csn, PR_FALSE, csnstr);
+ csn_free(&csn);
- /* if this is an updateable replica - add its own
- element to the RUV so that referrals work correctly */
- if (r->repl_type == REPLICA_TYPE_UPDATABLE)
- purl = multimaster_get_local_purl();
+ /*
+ * if this is an updateable replica - add its own
+ * element to the RUV so that referrals work correctly
+ */
+ if (r->repl_type == REPLICA_TYPE_UPDATABLE)
+ purl = multimaster_get_local_purl();
- if (ruv_init_new(csnstr, r->repl_rid, purl, &ruv) == RUV_SUCCESS)
- {
- r->repl_ruv = object_new((void*)ruv, (FNFree)ruv_destroy);
- r->repl_ruv_dirty = PR_TRUE;
- return_value = LDAP_SUCCESS;
- }
- else
- {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "Cannot create new replica update vector for %s\n",
- slapi_sdn_get_dn(r->repl_root));
- ruv_destroy(&ruv);
+ if (ruv_init_new(csnstr, r->repl_rid, purl, &ruv) == RUV_SUCCESS){
+ r->repl_ruv = object_new((void*)ruv, (FNFree)ruv_destroy);
+ r->repl_ruv_dirty = PR_TRUE;
+ return_value = LDAP_SUCCESS;
+ } else {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Cannot create new replica update vector for %s\n",
+ slapi_sdn_get_dn(r->repl_root));
+ ruv_destroy(&ruv);
goto done;
- }
- }
- else
- {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "Cannot obtain CSN for new replica update vector for %s\n",
- slapi_sdn_get_dn(r->repl_root));
- csn_free(&csn);
+ }
+ } else {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Cannot obtain CSN for new replica update vector for %s\n",
+ slapi_sdn_get_dn(r->repl_root));
+ csn_free(&csn);
goto done;
- }
- }
- else /* failed to write the entry because DB was not initialized - retry */
- {
+ }
+ } else { /* failed to write the entry because DB was not initialized - retry */
ruv = (RUV*) object_get_data (r->repl_ruv);
PR_ASSERT (ruv);
}
@@ -2853,30 +3030,22 @@ replica_create_ruv_tombstone(Replica *r)
PR_ASSERT (r->repl_ruv);
rc = ruv_to_bervals(ruv, &bvals);
- if (rc != RUV_SUCCESS)
- {
+ if (rc != RUV_SUCCESS){
goto done;
}
/* ONREPL this is depricated function but there is currently no better API to use */
rc = slapi_entry_add_values(e, type_ruvElement, bvals);
- if (rc != 0)
- {
+ if (rc != 0){
goto done;
}
-
- pb = slapi_pblock_new();
- slapi_add_entry_internal_set_pb(
- pb,
- e,
- NULL /* controls */,
- repl_get_plugin_identity(PLUGIN_MULTIMASTER_REPLICATION),
- OP_FLAG_TOMBSTONE_ENTRY | OP_FLAG_REPLICATED | OP_FLAG_REPL_FIXUP |
- OP_FLAG_REPL_RUV);
- slapi_add_internal_pb(pb);
- e = NULL; /* add consumes e, upon success or failure */
- slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &return_value);
+ pb = slapi_pblock_new();
+ slapi_add_entry_internal_set_pb(pb, e, NULL /* controls */, repl_get_plugin_identity(PLUGIN_MULTIMASTER_REPLICATION),
+ OP_FLAG_TOMBSTONE_ENTRY | OP_FLAG_REPLICATED | OP_FLAG_REPL_FIXUP | OP_FLAG_REPL_RUV);
+ slapi_add_internal_pb(pb);
+ e = NULL; /* add consumes e, upon success or failure */
+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &return_value);
if (return_value == LDAP_SUCCESS)
r->repl_ruv_dirty = PR_FALSE;
@@ -2889,50 +3058,50 @@ done:
if (pb)
slapi_pblock_destroy(pb);
- slapi_ch_free((void **) &root_entry_str);
+ slapi_ch_free_string(&root_entry_str);
- return return_value;
+ return return_value;
}
static void
assign_csn_callback(const CSN *csn, void *data)
{
- Replica *r = (Replica *)data;
+ Replica *r = (Replica *)data;
Object *ruv_obj;
RUV *ruv;
- PR_ASSERT(NULL != csn);
- PR_ASSERT(NULL != r);
+ PR_ASSERT(NULL != csn);
+ PR_ASSERT(NULL != r);
ruv_obj = replica_get_ruv (r);
PR_ASSERT (ruv_obj);
ruv = (RUV*)object_get_data (ruv_obj);
PR_ASSERT (ruv);
- PR_Lock(r->repl_lock);
+ PR_Lock(r->repl_lock);
- r->repl_csn_assigned = PR_TRUE;
+ r->repl_csn_assigned = PR_TRUE;
- if (NULL != r->min_csn_pl)
- {
- if (csnplInsert(r->min_csn_pl, csn) != 0)
- {
- char csn_str[CSN_STRSIZE]; /* For logging only */
- /* Ack, we can't keep track of min csn. Punt. */
- if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) {
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "assign_csn_callback: "
- "failed to insert csn %s for replica %s\n",
- csn_as_string(csn, PR_FALSE, csn_str),
- slapi_sdn_get_dn(r->repl_root));
- }
- csnplFree(&r->min_csn_pl);
- }
- }
+ if (NULL != r->min_csn_pl)
+ {
+ if (csnplInsert(r->min_csn_pl, csn) != 0)
+ {
+ char csn_str[CSN_STRSIZE]; /* For logging only */
+ /* Ack, we can't keep track of min csn. Punt. */
+ if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "assign_csn_callback: "
+ "failed to insert csn %s for replica %s\n",
+ csn_as_string(csn, PR_FALSE, csn_str),
+ slapi_sdn_get_dn(r->repl_root));
+ }
+ csnplFree(&r->min_csn_pl);
+ }
+ }
ruv_add_csn_inprogress (ruv, csn);
- PR_Unlock(r->repl_lock);
+ PR_Unlock(r->repl_lock);
object_release (ruv_obj);
}
@@ -3167,19 +3336,41 @@ replica_set_tombstone_reap_interval (Replica *r, long interval)
PR_Unlock(r->repl_lock);
}
+static void
+replica_strip_cleaned_rids(Replica *r)
+{
+ Object *RUVObj;
+ RUV *ruv = NULL;
+ ReplicaId rid[32] = {0};
+ int i = 0;
+
+ RUVObj = replica_get_ruv(r);
+ ruv = (RUV*)object_get_data (RUVObj);
+
+ ruv_get_cleaned_rids(ruv, rid);
+ while(rid[i] != 0){
+ ruv_delete_replica(ruv, rid[i]);
+ replica_set_ruv_dirty(r);
+ replica_write_ruv(r);
+ i++;
+ }
+ object_release(RUVObj);
+}
+
/* Update the tombstone entry to reflect the content of the ruv */
static void
replica_replace_ruv_tombstone(Replica *r)
{
Slapi_PBlock *pb = NULL;
- char *dn;
- int rc;
-
Slapi_Mod smod;
Slapi_Mod smod_last_modified;
LDAPMod *mods [3];
+ char *dn;
+ int rc;
+
+ PR_ASSERT(NULL != r && NULL != r->repl_root);
- PR_ASSERT(NULL != r && NULL != r->repl_root);
+ replica_strip_cleaned_rids(r);
PR_Lock(r->repl_lock);
@@ -3188,14 +3379,14 @@ replica_replace_ruv_tombstone(Replica *r)
ruv_last_modified_to_smod ((RUV*)object_get_data(r->repl_ruv), &smod_last_modified);
dn = _replica_get_config_dn (r->repl_root);
- if (NULL == dn) {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "replica_replace_ruv_tombstone: "
- "failed to get the config dn for %s\n",
- slapi_sdn_get_dn (r->repl_root));
- PR_Unlock(r->repl_lock);
- goto bail;
- }
+ if (NULL == dn) {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ "replica_replace_ruv_tombstone: "
+ "failed to get the config dn for %s\n",
+ slapi_sdn_get_dn (r->repl_root));
+ PR_Unlock(r->repl_lock);
+ goto bail;
+ }
mods[0] = (LDAPMod*)slapi_mod_get_ldapmod_byref(&smod);
mods[1] = (LDAPMod*)slapi_mod_get_ldapmod_byref(&smod_last_modified);
@@ -3219,12 +3410,12 @@ replica_replace_ruv_tombstone(Replica *r)
if (rc != LDAP_SUCCESS)
{
- if ((rc != LDAP_NO_SUCH_OBJECT) || !replica_is_state_flag_set(r, REPLICA_IN_USE))
- {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_replace_ruv_tombstone: "
- "failed to update replication update vector for replica %s: LDAP "
- "error - %d\n", (char*)slapi_sdn_get_dn (r->repl_root), rc);
- }
+ if ((rc != LDAP_NO_SUCH_OBJECT) || !replica_is_state_flag_set(r, REPLICA_IN_USE))
+ {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_replace_ruv_tombstone: "
+ "failed to update replication update vector for replica %s: LDAP "
+ "error - %d\n", (char*)slapi_sdn_get_dn (r->repl_root), rc);
+ }
}
slapi_ch_free ((void**)&dn);
@@ -3240,14 +3431,18 @@ replica_update_ruv_consumer(Replica *r, RUV *supplier_ruv)
ReplicaId supplier_id = 0;
char *supplier_purl = NULL;
- if ( ruv_get_first_id_and_purl(supplier_ruv, &supplier_id, &supplier_purl) == RUV_SUCCESS )
+ if ( ruv_get_first_id_and_purl(supplier_ruv, &supplier_id, &supplier_purl) == RUV_SUCCESS)
{
RUV *local_ruv = NULL;
PR_Lock(r->repl_lock);
local_ruv = (RUV*)object_get_data (r->repl_ruv);
- PR_ASSERT (local_ruv);
+
+ if(is_cleaned_rid(supplier_id) || local_ruv == NULL){
+ PR_Unlock(r->repl_lock);
+ return;
+ }
if ( ruv_local_contains_supplier(local_ruv, supplier_id) == 0 )
{
@@ -3579,3 +3774,67 @@ replica_get_attr ( Slapi_PBlock *pb, const char* type, void *value )
return rc;
}
+
+void
+replica_add_cleanruv_data(Replica *r, char *val)
+{
+ int i;
+
+ PR_Lock(r->repl_lock);
+
+ for (i = 0; i < CLEANRIDSIZ && r->repl_cleanruv_data[i] != NULL; i++); /* goto the end of the list */
+ r->repl_cleanruv_data[i] = slapi_ch_strdup(val); /* append to list */
+ r->repl_cleanruv_data[i + 1] = NULL;
+
+ PR_Unlock(r->repl_lock);
+}
+
+void
+replica_remove_cleanruv_data(Replica *r, char *val)
+{
+ int i;
+
+ PR_Lock(r->repl_lock);
+
+ for(i = 0; i < CLEANRIDSIZ && r->repl_cleanruv_data[i] && strcmp(r->repl_cleanruv_data[i], val) != 0; i++);
+ if( i < CLEANRIDSIZ ){
+ slapi_ch_free_string(&r->repl_cleanruv_data[i]);
+ for(; i < CLEANRIDSIZ; i++){
+ /* rewrite entire array */
+ r->repl_cleanruv_data[i] = r->repl_cleanruv_data[i + 1];
+ }
+ }
+
+ PR_Unlock(r->repl_lock);
+}
+
+CSN *
+replica_get_cleanruv_maxcsn(Replica *r, ReplicaId rid)
+{
+ CSN *newcsn;
+ char *csnstr;
+ char *token;
+ char *iter;
+ int repl_rid = 0;
+ int i;
+
+ PR_Lock(r->repl_lock);
+
+ for(i = 0; i < CLEANRIDSIZ && r->repl_cleanruv_data[i]; i++){
+ token = ldap_utf8strtok_r(r->repl_cleanruv_data[i], ":", &iter);
+ if(token){
+ repl_rid = atoi(token);
+ }
+ csnstr = ldap_utf8strtok_r(iter, ":", &iter);
+ if(repl_rid == rid){
+ newcsn = csn_new();
+ csn_init_by_string(newcsn, csnstr);
+ PR_Unlock(r->repl_lock);
+ return newcsn;
+ }
+ }
+
+ PR_Unlock(r->repl_lock);
+
+ return NULL;
+}
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index 771af61..89651cf 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -2,15 +2,15 @@
* This Program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; version 2 of the License.
- *
+ *
* This Program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License along with
* this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA.
- *
+ *
* In addition, as a special exception, Red Hat, Inc. gives You the additional
* right to link the code of this Program with code not covered under the GNU
* General Public License ("Non-GPL Code") and to distribute linked combinations
@@ -28,9 +28,9 @@
* version of the file, but you are not obligated to do so. If you do not wish to
* provide this exception without modification, you must delete this exception
* statement from your version and license this file solely under the GPL without
- * exception.
- *
- *
+ * exception.
+ *
+ *
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
@@ -58,13 +58,17 @@
#define CLEANRUVLEN 8
#define CLEANALLRUV "CLEANALLRUV"
#define CLEANALLRUVLEN 11
-#define RELEASERUV "RELEASERUV"
-#define RELEASERUVLEN 10
#define REPLICA_RDN "cn=replica"
+#define CLEANALLRUV_ID "CleanAllRUV Task"
+#define ABORT_CLEANALLRUV_ID "Abort CleanAllRUV Task"
int slapi_log_urp = SLAPI_LOG_REPL;
-static ReplicaId cleaned_rid = 0;
-static int released_rid = 0;
+static ReplicaId cleaned_rids[CLEANRIDSIZ + 1] = {0};
+static ReplicaId aborted_rids[CLEANRIDSIZ + 1] = {0};
+static Slapi_RWLock *rid_lock = NULL;
+static Slapi_RWLock *abort_rid_lock = NULL;
+static PRLock *notify_lock = NULL;
+static PRCondVar *notify_cvar = NULL;
/* Forward Declartions */
static int replica_config_add (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg);
@@ -72,7 +76,7 @@ static int replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry*
static int replica_config_post_modify (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg);
static int replica_config_delete (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg);
static int replica_config_search (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg);
-
+static int replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, char *returntext, void *arg);
static int replica_config_change_type_and_id (Replica *r, const char *new_type, const char *new_id, char *returntext, int apply_mods);
static int replica_config_change_updatedn (Replica *r, const LDAPMod *mod, char *returntext, int apply_mods);
static int replica_config_change_flags (Replica *r, const char *new_flags, char *returntext, int apply_mods);
@@ -80,9 +84,18 @@ static int replica_execute_task (Object *r, const char *task_name, char *returnt
static int replica_execute_cl2ldif_task (Object *r, char *returntext);
static int replica_execute_ldif2cl_task (Object *r, char *returntext);
static int replica_execute_cleanruv_task (Object *r, ReplicaId rid, char *returntext);
-static int replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, char *returntext);
-static int replica_execute_release_ruv_task(Object *r, ReplicaId rid);
-static struct berval *create_ruv_payload(char *value);
+static int replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, char *returntext);
+static void replica_cleanallruv_thread(void *arg);
+static void replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task);
+static int check_agmts_are_alive(Replica *replica, ReplicaId rid, Slapi_Task *task);
+static int check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_Task *task);
+static int replica_cleanallruv_send_extop(Repl_Agmt *ra, ReplicaId rid, Slapi_Task *task, struct berval *payload, int check_result);
+static int replica_cleanallruv_send_abort_extop(Repl_Agmt *ra, Slapi_Task *task, struct berval *payload);
+static int replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn, Slapi_Task *task);
+static int replica_cleanallruv_replica_alive(Repl_Agmt *agmt);
+static int replica_cleanallruv_check_ruv(Repl_Agmt *ra, char *rid_text, Slapi_Task *task);
+static int get_cleanruv_task_count();
+static int get_abort_cleanruv_task_count();
static int replica_cleanup_task (Object *r, const char *task_name, char *returntext, int apply_mods);
static int replica_task_done(Replica *replica);
static multimaster_mtnode_extension * _replica_config_get_mtnode_ext (const Slapi_Entry *e);
@@ -105,29 +118,59 @@ int
replica_config_init()
{
s_configLock = PR_NewLock ();
+
if (s_configLock == NULL)
{
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_init: "
- "failed to cretate configuration lock; NSPR error - %d\n",
+ "failed to create configuration lock; NSPR error - %d\n",
PR_GetError ());
return -1;
}
+ rid_lock = slapi_new_rwlock();
+ if(rid_lock == NULL)
+ {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_init: "
+ "failed to create rid_lock; NSPR error - %d\n", PR_GetError ());
+ return -1;
+ }
+ abort_rid_lock = slapi_new_rwlock();
+ if(abort_rid_lock == NULL)
+ {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_init: "
+ "failed to create abort_rid_lock; NSPR error - %d\n", PR_GetError ());
+ return -1;
+ }
+ if ( ( notify_lock = PR_NewLock()) == NULL ) {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_init: "
+ "failed to create notify lock; NSPR error - %d\n", PR_GetError ());
+ return -1;
+ }
+ if ( ( notify_cvar = PR_NewCondVar( notify_lock )) == NULL ) {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_init: "
+ "failed to create notify cond var; NSPR error - %d\n", PR_GetError ());
+ return -1;
+ }
/* config DSE must be initialized before we get here */
slapi_config_register_callback(SLAPI_OPERATION_ADD, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
- CONFIG_FILTER, replica_config_add, NULL);
+ CONFIG_FILTER, replica_config_add, NULL);
slapi_config_register_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
CONFIG_FILTER, replica_config_modify,NULL);
slapi_config_register_callback(SLAPI_OPERATION_MODRDN, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
CONFIG_FILTER, dont_allow_that, NULL);
slapi_config_register_callback(SLAPI_OPERATION_DELETE, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
- CONFIG_FILTER, replica_config_delete,NULL);
+ CONFIG_FILTER, replica_config_delete,NULL);
slapi_config_register_callback(SLAPI_OPERATION_SEARCH, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
- CONFIG_FILTER, replica_config_search,NULL);
- slapi_config_register_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_POSTOP,
+ CONFIG_FILTER, replica_config_search,NULL);
+ slapi_config_register_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_POSTOP,
CONFIG_BASE, LDAP_SCOPE_SUBTREE,
CONFIG_FILTER, replica_config_post_modify,
NULL);
+
+ /* register the CLEANALLRUV & ABORT task */
+ slapi_task_register_handler("cleanallruv", replica_cleanall_ruv_task);
+ slapi_task_register_handler("abort cleanallruv", replica_cleanall_ruv_abort);
+
return 0;
}
@@ -142,7 +185,7 @@ replica_config_destroy ()
/* config DSE must be initialized before we get here */
slapi_config_remove_callback(SLAPI_OPERATION_ADD, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
- CONFIG_FILTER, replica_config_add);
+ CONFIG_FILTER, replica_config_add);
slapi_config_remove_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
CONFIG_FILTER, replica_config_modify);
slapi_config_remove_callback(SLAPI_OPERATION_MODRDN, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
@@ -151,26 +194,26 @@ replica_config_destroy ()
CONFIG_FILTER, replica_config_delete);
slapi_config_remove_callback(SLAPI_OPERATION_SEARCH, DSE_FLAG_PREOP, CONFIG_BASE, LDAP_SCOPE_SUBTREE,
CONFIG_FILTER, replica_config_search);
- slapi_config_remove_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_PREOP,
+ slapi_config_remove_callback(SLAPI_OPERATION_MODIFY, DSE_FLAG_PREOP,
CONFIG_BASE, LDAP_SCOPE_SUBTREE,
CONFIG_FILTER, replica_config_post_modify);
}
-static int
-replica_config_add (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter,
+static int
+replica_config_add (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter,
int *returncode, char *errorbuf, void *arg)
{
Replica *r = NULL;
- multimaster_mtnode_extension *mtnode_ext;
+ multimaster_mtnode_extension *mtnode_ext;
char *replica_root = (char*)slapi_entry_attr_get_charptr (e, attr_replicaRoot);
char buf [SLAPI_DSE_RETURNTEXT_SIZE];
char *errortext = errorbuf ? errorbuf : buf;
-
+
if (errorbuf)
{
errorbuf[0] = '\0';
- }
-
+ }
+
*returncode = LDAP_SUCCESS;
PR_Lock (s_configLock);
@@ -185,16 +228,16 @@ replica_config_add (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter,
{
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "replica already configured for %s", replica_root);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_add: %s\n", errortext);
- *returncode = LDAP_UNWILLING_TO_PERFORM;
- goto done;
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ goto done;
}
/* create replica object */
r = replica_new_from_entry (e, errortext, PR_TRUE /* is a newly added entry */);
if (r == NULL)
{
- *returncode = LDAP_OPERATIONS_ERROR;
- goto done;
+ *returncode = LDAP_OPERATIONS_ERROR;
+ goto done;
}
/* Set the mapping tree node state, and the referrals from the RUV */
@@ -220,24 +263,24 @@ done:
if (*returncode != LDAP_SUCCESS)
{
- if (mtnode_ext->replica)
+ if (mtnode_ext->replica)
object_release (mtnode_ext->replica);
return SLAPI_DSE_CALLBACK_ERROR;
}
- else
+ else
return SLAPI_DSE_CALLBACK_OK;
}
-static int
-replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry* e,
+static int
+replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry* e,
int *returncode, char *returntext, void *arg)
{
int rc= 0;
LDAPMod **mods;
int i, apply_mods;
- multimaster_mtnode_extension *mtnode_ext;
+ multimaster_mtnode_extension *mtnode_ext;
Replica *r = NULL;
- char *replica_root = NULL;
+ char *replica_root = NULL;
char buf [SLAPI_DSE_RETURNTEXT_SIZE];
char *errortext = returntext ? returntext : buf;
char *config_attr, *config_attr_value;
@@ -252,7 +295,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
/* just let internal operations originated from replication plugin to go through */
slapi_pblock_get (pb, SLAPI_OPERATION, &op);
- slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
+ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
if (operation_is_flag_set(op, OP_FLAG_INTERNAL) &&
(identity == repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION)))
@@ -264,7 +307,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
replica_root = (char*)slapi_entry_attr_get_charptr (e, attr_replicaRoot);
PR_Lock (s_configLock);
-
+
mtnode_ext = _replica_config_get_mtnode_ext (e);
PR_ASSERT (mtnode_ext);
@@ -276,7 +319,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "replica does not exist for %s", replica_root);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
errortext);
- *returncode = LDAP_OPERATIONS_ERROR;
+ *returncode = LDAP_OPERATIONS_ERROR;
goto done;
}
@@ -287,7 +330,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
for (apply_mods = 0; apply_mods <= 1; apply_mods++)
{
/* we only allow the replica ID and type to be modified together e.g.
- if converting a read only replica to a master or vice versa -
+ if converting a read only replica to a master or vice versa -
we will need to change both the replica ID and the type at the same
time - we must disallow changing the replica ID if the type is not
being changed and vice versa
@@ -304,7 +347,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
break;
config_attr = (char *) mods[i]->mod_type;
- PR_ASSERT (config_attr);
+ PR_ASSERT (config_attr);
/* disallow modifications or removal of replica root,
replica name and replica state attributes */
@@ -313,14 +356,14 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
strcasecmp (config_attr, attr_state) == 0)
{
*returncode = LDAP_UNWILLING_TO_PERFORM;
- PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "modification of %s attribute is not allowed",
- config_attr);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
+ PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "modification of %s attribute is not allowed",
+ config_attr);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
errortext);
}
/* this is a request to delete an attribute */
- else if (mods[i]->mod_op & LDAP_MOD_DELETE || mods[i]->mod_bvalues == NULL
- || mods[i]->mod_bvalues[0]->bv_val == NULL)
+ else if ((mods[i]->mod_op & LDAP_MOD_DELETE) || mods[i]->mod_bvalues == NULL
+ || mods[i]->mod_bvalues[0]->bv_val == NULL)
{
/* currently, you can only remove referral,
legacy consumer or bind dn attribute */
@@ -345,10 +388,9 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
else
{
*returncode = LDAP_UNWILLING_TO_PERFORM;
- PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "deletion of %s attribute is not allowed", config_attr);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
- errortext);
- }
+ PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "deletion of %s attribute is not allowed", config_attr);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
+ }
}
else /* modify an attribute */
{
@@ -356,8 +398,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
if (strcasecmp (config_attr, attr_replicaBindDn) == 0)
{
- *returncode = replica_config_change_updatedn (r, mods[i],
- errortext, apply_mods);
+ *returncode = replica_config_change_updatedn (r, mods[i], errortext, apply_mods);
}
else if (strcasecmp (config_attr, attr_replicaType) == 0)
{
@@ -367,16 +408,14 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
{
new_repl_id = slapi_ch_strdup(config_attr_value);
}
- else if (strcasecmp (config_attr, attr_flags) == 0)
+ else if (strcasecmp (config_attr, attr_flags) == 0)
{
- *returncode = replica_config_change_flags (r, config_attr_value,
- errortext, apply_mods);
+ *returncode = replica_config_change_flags (r, config_attr_value, errortext, apply_mods);
}
- else if (strcasecmp (config_attr, TASK_ATTR) == 0)
+ else if (strcasecmp (config_attr, TASK_ATTR) == 0)
{
- *returncode = replica_execute_task (mtnode_ext->replica, config_attr_value,
- errortext, apply_mods);
- }
+ *returncode = replica_execute_task (mtnode_ext->replica, config_attr_value, errortext, apply_mods);
+ }
else if (strcasecmp (config_attr, attr_replicaReferral) == 0)
{
if (apply_mods)
@@ -391,14 +430,14 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
if (!replica_is_legacy_consumer (r)) {
consumer5_set_mapping_tree_state_for_replica(r, NULL);
}
- }
+ }
}
else if (strcasecmp (config_attr, type_replicaPurgeDelay) == 0)
{
- if (apply_mods && config_attr_value && config_attr_value[0])
+ if (apply_mods && config_attr_value && config_attr_value[0])
{
PRUint32 delay;
- if (isdigit (config_attr_value[0]))
+ if (isdigit (config_attr_value[0]))
{
delay = (unsigned int)atoi(config_attr_value);
replica_set_purge_delay(r, delay);
@@ -409,7 +448,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
}
else if (strcasecmp (config_attr, type_replicaTombstonePurgeInterval) == 0)
{
- if (apply_mods && config_attr_value && config_attr_value[0])
+ if (apply_mods && config_attr_value && config_attr_value[0])
{
long interval;
interval = atol (config_attr_value);
@@ -439,17 +478,14 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
"modification of attribute %s is not allowed in replica entry", config_attr);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
- errortext);
- }
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
+ }
}
}
if (new_repl_id || new_repl_type)
{
- *returncode = replica_config_change_type_and_id(r, new_repl_type,
- new_repl_id, errortext,
- apply_mods);
+ *returncode = replica_config_change_type_and_id(r, new_repl_type, new_repl_id, errortext, apply_mods);
slapi_ch_free_string(&new_repl_id);
slapi_ch_free_string(&new_repl_type);
}
@@ -458,9 +494,9 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
done:
if (mtnode_ext->replica)
object_release (mtnode_ext->replica);
-
+
/* slapi_ch_free accepts NULL pointer */
- slapi_ch_free ((void**)&replica_root);
+ slapi_ch_free_string(&replica_root);
PR_Unlock (s_configLock);
@@ -474,9 +510,9 @@ done:
}
}
-static int
+static int
replica_config_post_modify(Slapi_PBlock *pb,
- Slapi_Entry* entryBefore,
+ Slapi_Entry* entryBefore,
Slapi_Entry* e,
int *returncode,
char *returntext,
@@ -485,9 +521,9 @@ replica_config_post_modify(Slapi_PBlock *pb,
int rc= 0;
LDAPMod **mods;
int i, apply_mods;
- multimaster_mtnode_extension *mtnode_ext;
+ multimaster_mtnode_extension *mtnode_ext;
Replica *r = NULL;
- char *replica_root = NULL;
+ char *replica_root = NULL;
char buf [SLAPI_DSE_RETURNTEXT_SIZE];
char *errortext = returntext ? returntext : buf;
char *config_attr, *config_attr_value;
@@ -503,7 +539,7 @@ replica_config_post_modify(Slapi_PBlock *pb,
/* just let internal operations originated from replication plugin to go through */
slapi_pblock_get (pb, SLAPI_OPERATION, &op);
- slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
+ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
if (operation_is_flag_set(op, OP_FLAG_INTERNAL) &&
(identity == repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION)))
@@ -515,7 +551,7 @@ replica_config_post_modify(Slapi_PBlock *pb,
replica_root = (char*)slapi_entry_attr_get_charptr (e, attr_replicaRoot);
PR_Lock (s_configLock);
-
+
mtnode_ext = _replica_config_get_mtnode_ext (e);
PR_ASSERT (mtnode_ext);
@@ -529,7 +565,7 @@ replica_config_post_modify(Slapi_PBlock *pb,
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_config_post_modify: %s\n",
errortext);
- *returncode = LDAP_OPERATIONS_ERROR;
+ *returncode = LDAP_OPERATIONS_ERROR;
goto done;
}
@@ -540,7 +576,7 @@ replica_config_post_modify(Slapi_PBlock *pb,
for (apply_mods = 0; apply_mods <= 1; apply_mods++)
{
/* we only allow the replica ID and type to be modified together e.g.
- if converting a read only replica to a master or vice versa -
+ if converting a read only replica to a master or vice versa -
we will need to change both the replica ID and the type at the same
time - we must disallow changing the replica ID if the type is not
being changed and vice versa
@@ -554,7 +590,7 @@ replica_config_post_modify(Slapi_PBlock *pb,
break;
config_attr = (char *) mods[i]->mod_type;
- PR_ASSERT (config_attr);
+ PR_ASSERT (config_attr);
/* disallow modifications or removal of replica root,
replica name and replica state attributes */
@@ -564,16 +600,16 @@ replica_config_post_modify(Slapi_PBlock *pb,
{
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
- "modification of %s attribute is not allowed",
- config_attr);
+ "modification of %s attribute is not allowed",
+ config_attr);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "replica_config_post_modify: %s\n",
+ "replica_config_post_modify: %s\n",
errortext);
}
/* this is a request to delete an attribute */
- else if (mods[i]->mod_op & LDAP_MOD_DELETE ||
+ else if ((mods[i]->mod_op & LDAP_MOD_DELETE) ||
mods[i]->mod_bvalues == NULL ||
- mods[i]->mod_bvalues[0]->bv_val == NULL)
+ mods[i]->mod_bvalues[0]->bv_val == NULL)
{
;
}
@@ -581,7 +617,7 @@ replica_config_post_modify(Slapi_PBlock *pb,
{
config_attr_value = (char *) mods[i]->mod_bvalues[0]->bv_val;
- if (strcasecmp (config_attr, TASK_ATTR) == 0)
+ if (strcasecmp (config_attr, TASK_ATTR) == 0)
{
flag_need_cleanup = 1;
}
@@ -605,7 +641,7 @@ done:
if (mtnode_ext->replica)
object_release (mtnode_ext->replica);
-
+
if (*returncode != LDAP_SUCCESS)
{
return SLAPI_DSE_CALLBACK_ERROR;
@@ -616,8 +652,8 @@ done:
}
}
-static int
-replica_config_delete (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter,
+static int
+replica_config_delete (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter,
int *returncode, char *returntext, void *arg)
{
multimaster_mtnode_extension *mtnode_ext;
@@ -650,26 +686,26 @@ replica_config_delete (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter
return SLAPI_DSE_CALLBACK_OK;
}
-static int
-replica_config_search (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter, int *returncode,
+static int
+replica_config_search (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter, int *returncode,
char *returntext, void *arg)
{
- multimaster_mtnode_extension *mtnode_ext;
+ multimaster_mtnode_extension *mtnode_ext;
int changeCount = 0;
PRBool reapActive = PR_FALSE;
char val [64];
/* add attribute that contains number of entries in the changelog for this replica */
-
+
PR_Lock (s_configLock);
-
+
mtnode_ext = _replica_config_get_mtnode_ext (e);
PR_ASSERT (mtnode_ext);
-
+
if (mtnode_ext->replica) {
Replica *replica;
object_acquire (mtnode_ext->replica);
- if (cl5GetState () == CL5_STATE_OPEN) {
+ if (cl5GetState () == CL5_STATE_OPEN) {
changeCount = cl5GetOperationCount (mtnode_ext->replica);
}
replica = (Replica*)object_get_data (mtnode_ext->replica);
@@ -688,9 +724,9 @@ replica_config_search (Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter
return SLAPI_DSE_CALLBACK_OK;
}
-static int
+static int
replica_config_change_type_and_id (Replica *r, const char *new_type,
- const char *new_id, char *returntext,
+ const char *new_id, char *returntext,
int apply_mods)
{
int type;
@@ -770,8 +806,8 @@ replica_config_change_type_and_id (Replica *r, const char *new_type,
return LDAP_SUCCESS;
}
-static int
-replica_config_change_updatedn (Replica *r, const LDAPMod *mod, char *returntext,
+static int
+replica_config_change_updatedn (Replica *r, const LDAPMod *mod, char *returntext,
int apply_mods)
{
PR_ASSERT (r);
@@ -790,7 +826,7 @@ replica_config_change_updatedn (Replica *r, const LDAPMod *mod, char *returntext
return LDAP_SUCCESS;
}
-static int replica_config_change_flags (Replica *r, const char *new_flags,
+static int replica_config_change_flags (Replica *r, const char *new_flags,
char *returntext, int apply_mods)
{
PR_ASSERT (r);
@@ -807,10 +843,10 @@ static int replica_config_change_flags (Replica *r, const char *new_flags,
return LDAP_SUCCESS;
}
-static int replica_execute_task (Object *r, const char *task_name, char *returntext,
+static int replica_execute_task (Object *r, const char *task_name, char *returntext,
int apply_mods)
{
-
+
if (strcasecmp (task_name, CL2LDIF_TASK) == 0)
{
if (apply_mods)
@@ -848,13 +884,14 @@ static int replica_execute_task (Object *r, const char *task_name, char *returnt
{
int temprid = atoi(&(task_name[CLEANALLRUVLEN]));
if (temprid <= 0 || temprid >= READ_ONLY_REPLICA_ID){
- PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Invalid replica id (%d) for task - (%s)", temprid, task_name);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_execute_task: %s\n", returntext);
- return LDAP_OPERATIONS_ERROR;
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Invalid replica id (%d) for task - (%s)", temprid, task_name);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_execute_task: %s\n", returntext);
+ return LDAP_OPERATIONS_ERROR;
}
if (apply_mods)
{
- return replica_execute_cleanall_ruv_task(r, (ReplicaId)temprid, returntext);
+ Slapi_Task *empty_task = NULL;
+ return replica_execute_cleanall_ruv_task(r, (ReplicaId)temprid, empty_task, returntext);
}
else
return LDAP_SUCCESS;
@@ -862,22 +899,22 @@ static int replica_execute_task (Object *r, const char *task_name, char *returnt
else
{
PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "unsupported replica task - %s", task_name);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "replica_execute_task: %s\n", returntext);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ "replica_execute_task: %s\n", returntext);
return LDAP_OPERATIONS_ERROR;
}
-
+
}
-static int
-replica_cleanup_task (Object *r, const char *task_name, char *returntext,
+static int
+replica_cleanup_task (Object *r, const char *task_name, char *returntext,
int apply_mods)
{
int rc = LDAP_SUCCESS;
if (apply_mods) {
Replica *replica = (Replica*)object_get_data (r);
if (NULL == replica) {
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
} else {
rc = replica_task_done(replica);
}
@@ -913,19 +950,19 @@ replica_task_done(Replica *replica)
mod.mod_type = (char *)TASK_ATTR;
mod.mod_bvalues = NULL;
- slapi_modify_internal_set_pb_ext(pb, replica_sdn, mods, NULL/* controls */,
- NULL/* uniqueid */,
+ slapi_modify_internal_set_pb_ext(pb, replica_sdn, mods, NULL/* controls */,
+ NULL/* uniqueid */,
repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION),
0/* flags */);
slapi_modify_internal_pb (pb);
slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
if ((rc != LDAP_SUCCESS) && (rc != LDAP_NO_SUCH_ATTRIBUTE)) {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_task_done: "
"failed to remove (%s) attribute from (%s) entry; "
"LDAP error - %d\n",
- TASK_ATTR, replica_dn, rc);
+ TASK_ATTR, replica_dn, rc);
}
slapi_pblock_destroy (pb);
@@ -945,9 +982,9 @@ static int replica_execute_cl2ldif_task (Object *r, char *returntext)
if (cl5GetState () != CL5_STATE_OPEN)
{
PR_snprintf (returntext, SLAPI_DSE_RETURNTEXT_SIZE, "changelog is not open");
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "replica_execute_cl2ldif_task: %s\n", returntext);
- rc = LDAP_OPERATIONS_ERROR;
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ "replica_execute_cl2ldif_task: %s\n", returntext);
+ rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
@@ -958,25 +995,25 @@ static int replica_execute_cl2ldif_task (Object *r, char *returntext)
<replica name>.ldif */
clDir = cl5GetDir ();
if (NULL == clDir) {
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
replica = (Replica*)object_get_data (r);
if (NULL == replica) {
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
PR_snprintf (fName, MAXPATHLEN, "%s/%s.ldif", clDir, replica_get_name (replica));
slapi_ch_free_string (&clDir);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"Beginning changelog export of replica \"%s\"\n",
replica_get_name(replica));
rc = cl5ExportLDIF (fName, rlist);
if (rc == CL5_SUCCESS) {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"Finished changelog export of replica \"%s\"\n",
replica_get_name(replica));
rc = LDAP_SUCCESS;
@@ -984,9 +1021,9 @@ static int replica_execute_cl2ldif_task (Object *r, char *returntext)
PR_snprintf (returntext, SLAPI_DSE_RETURNTEXT_SIZE,
"Failed changelog export replica %s; "
"changelog error - %d", replica_get_name(replica), rc);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_execute_cl2ldif_task: %s\n", returntext);
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
}
bail:
return rc;
@@ -1004,8 +1041,8 @@ static int replica_execute_ldif2cl_task (Object *r, char *returntext)
if (cl5GetState () != CL5_STATE_OPEN)
{
PR_snprintf (returntext, SLAPI_DSE_RETURNTEXT_SIZE, "changelog is not open");
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "replica_execute_ldif2cl_task: %s\n", returntext);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ "replica_execute_ldif2cl_task: %s\n", returntext);
rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
@@ -1017,13 +1054,13 @@ static int replica_execute_ldif2cl_task (Object *r, char *returntext)
<replica name>.ldif */
clDir = cl5GetDir ();
if (NULL == clDir) {
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
replica = (Replica*)object_get_data (r);
if (NULL == replica) {
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
@@ -1035,19 +1072,19 @@ static int replica_execute_ldif2cl_task (Object *r, char *returntext)
PR_snprintf (returntext, SLAPI_DSE_RETURNTEXT_SIZE,
"failed to close changelog to import changelog data; "
"changelog error - %d", rc);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_execute_ldif2cl_task: %s\n", returntext);
rc = LDAP_OPERATIONS_ERROR;
goto bail;
}
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"Beginning changelog import of replica \"%s\"\n",
replica_get_name(replica));
imprc = cl5ImportLDIF (clDir, fName, rlist);
slapi_ch_free_string (&clDir);
if (CL5_SUCCESS == imprc)
{
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"Finished changelog import of replica \"%s\"\n",
replica_get_name(replica));
}
@@ -1056,7 +1093,7 @@ static int replica_execute_ldif2cl_task (Object *r, char *returntext)
PR_snprintf (returntext, SLAPI_DSE_RETURNTEXT_SIZE,
"Failed changelog import replica %s; "
"changelog error - %d", replica_get_name(replica), rc);
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_execute_ldif2cl_task: %s\n", returntext);
imprc = LDAP_OPERATIONS_ERROR;
}
@@ -1069,10 +1106,10 @@ static int replica_execute_ldif2cl_task (Object *r, char *returntext)
}
else
{
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_execute_ldif2cl_task: failed to start changelog at %s\n",
config.dir?config.dir:"null config dir");
- rc = LDAP_OPERATIONS_ERROR;
+ rc = LDAP_OPERATIONS_ERROR;
}
bail:
changelog5_config_done(&config);
@@ -1080,7 +1117,7 @@ bail:
return imprc?imprc:rc;
}
-static multimaster_mtnode_extension *
+static multimaster_mtnode_extension *
_replica_config_get_mtnode_ext (const Slapi_Entry *e)
{
const char *replica_root;
@@ -1095,7 +1132,7 @@ _replica_config_get_mtnode_ext (const Slapi_Entry *e)
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_add: "
"configuration entry %s missing %s attribute\n",
slapi_entry_get_dn((Slapi_Entry *)e),
- attr_replicaRoot);
+ attr_replicaRoot);
return NULL;
}
@@ -1107,14 +1144,14 @@ _replica_config_get_mtnode_ext (const Slapi_Entry *e)
{
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_add: "
"failed to locate mapping tree node for dn %s\n",
- slapi_sdn_get_dn(sdn));
+ slapi_sdn_get_dn(sdn));
}
else
{
/* check if replica object already exists for the specified subtree */
- ext = (multimaster_mtnode_extension *)repl_con_get_ext (REPL_CON_EXT_MTNODE, mtnode);
+ ext = (multimaster_mtnode_extension *)repl_con_get_ext (REPL_CON_EXT_MTNODE, mtnode);
}
-
+
slapi_sdn_free (&sdn);
return ext;
@@ -1123,26 +1160,24 @@ _replica_config_get_mtnode_ext (const Slapi_Entry *e)
int
replica_execute_cleanruv_task_ext(Object *r, ReplicaId rid)
{
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "cleanruv_extop: calling clean_ruv_ext\n");
- return replica_execute_cleanruv_task(r, rid, NULL);
+ return replica_execute_cleanruv_task(r, rid, NULL);
}
static int
replica_execute_cleanruv_task (Object *r, ReplicaId rid, char *returntext /* not used */)
{
- int rc = 0;
Object *RUVObj;
RUV *local_ruv = NULL;
Replica *replica = (Replica*)object_get_data (r);
-
+ int rc = 0;
PR_ASSERT (replica);
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "cleanruv_task: cleaning rid (%d)...\n",(int)rid);
RUVObj = replica_get_ruv(replica);
PR_ASSERT(RUVObj);
local_ruv = (RUV*)object_get_data (RUVObj);
- /* Need to check that :
- * - rid is not the local one
+ /* Need to check that :
+ * - rid is not the local one
* - rid is not the last one
*/
if ((replica_get_rid(replica) == rid) ||
@@ -1156,12 +1191,11 @@ replica_execute_cleanruv_task (Object *r, ReplicaId rid, char *returntext /* not
/* Update Mapping Tree to reflect RUV changes */
consumer5_set_mapping_tree_state_for_replica(replica, NULL);
-
+
/*
- * Clean the changelog RUV's, and set the rids
+ * Clean the changelog RUV's
*/
cl5CleanRUV(rid);
- delete_released_rid();
if (rc != RUV_SUCCESS){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanruv_task: task failed(%d)\n",rc);
@@ -1171,506 +1205,1566 @@ replica_execute_cleanruv_task (Object *r, ReplicaId rid, char *returntext /* not
return LDAP_SUCCESS;
}
-static int
-replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, char *returntext)
+const char *
+fetch_attr(Slapi_Entry *e, const char *attrname, const char *default_val)
{
- PRThread *thread = NULL;
- Repl_Connection *conn;
- Replica *replica;
- Object *agmt_obj;
- Repl_Agmt *agmt;
- ConnResult crc;
- cleanruv_data *data = NULL;
- const Slapi_DN *dn = NULL;
- struct berval *payload = NULL;
- char *ridstr = NULL;
- int send_msgid = 0;
- int agmt_count = 0;
- int rc = 0;
+ Slapi_Attr *attr;
+ Slapi_Value *val = NULL;
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: cleaning rid (%d)...\n",(int)rid);
+ if (slapi_entry_attr_find(e, attrname, &attr) != 0)
+ return default_val;
- /*
- * Grab the replica
- */
- if(r){
- replica = (Replica*)object_get_data (r);
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica is NULL, aborting task\n");
- return -1;
- }
- /*
- * Create payload
- */
- ridstr = slapi_ch_smprintf("%d:%s", rid, slapi_sdn_get_dn(replica_get_root(replica)));
- payload = create_ruv_payload(ridstr);
- if(payload == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to create ext op payload, aborting task\n");
- slapi_ch_free_string(&ridstr);
- return -1;
- }
+ slapi_attr_first_value(attr, &val);
+ return slapi_value_get_string(val);
+}
+static int
+replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
+ int *returncode, char *returntext, void *arg)
+{
+ Slapi_Task *task = NULL;
+ const Slapi_DN *task_dn;
+ Slapi_DN *dn = NULL;
+ Object *r;
+ const char *base_dn;
+ const char *rid_str;
+ ReplicaId rid;
+ int rc = SLAPI_DSE_CALLBACK_OK;
+
+ /* allocate new task now */
+ task = slapi_new_task(slapi_entry_get_ndn(e));
+ if(task == NULL){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Failed to create new task\n");
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
- set_cleaned_rid(rid);
+ /*
+ * Get our task settings
+ */
+ if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
+ *returncode = LDAP_OBJECT_CLASS_VIOLATION;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ if ((rid_str = fetch_attr(e, "replica-id", 0)) == NULL){
+ *returncode = LDAP_OBJECT_CLASS_VIOLATION;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
- agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
- while (agmt_obj)
- {
- agmt = (Repl_Agmt*)object_get_data (agmt_obj);
- if(!agmt_is_enabled(agmt)){
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- continue;
- }
- dn = agmt_get_dn_byref(agmt);
- conn = (Repl_Connection *)agmt_get_connection(agmt);
- if(conn == NULL){
- /* no connection for this agreement, and move on */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: the replica (%s), is "
- "missing the connection. This replica will not be cleaned.\n", slapi_sdn_get_dn(dn));
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- continue;
- }
- crc = conn_connect(conn);
- if (CONN_OPERATION_FAILED == crc ){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to connect "
- "to repl agreement connection (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_TRANSIENT_ERROR);
- } else if (CONN_SSL_NOT_ENABLED == crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to acquire "
- "repl agmt connection (%s), errror %d\n",slapi_sdn_get_dn(dn), ACQUIRE_FATAL_ERROR);
- } else {
- conn_cancel_linger(conn);
- crc = conn_send_extended_operation(conn, REPL_CLEANRUV_OID, payload, NULL, &send_msgid);
- if (CONN_OPERATION_SUCCESS != crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to send "
- "cleanruv extended op to repl agmt (%s), error %d\n", slapi_sdn_get_dn(dn), crc);
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: successfully sent "
- "cleanruv extended op to (%s)\n",slapi_sdn_get_dn(dn));
- agmt_count++;
- }
- conn_start_linger(conn);
- }
- if(crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica (%s) has not "
- "been cleaned. You will need to rerun the CLEANALLRUV task on this replica.\n", slapi_sdn_get_dn(dn));
- rc = crc;
- }
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- }
+ task_dn = slapi_entry_get_sdn(e);
+ /*
+ * Check the rid
+ */
+ rid = atoi(rid_str);
+ if (rid <= 0 || rid >= READ_ONLY_REPLICA_ID){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Invalid replica id (%d) for task - (%s)",
+ rid, slapi_sdn_get_dn(task_dn));
+ cleanruv_log(task, CLEANALLRUV_ID, "%s", returntext);
+ rc = LDAP_OPERATIONS_ERROR;
+ goto out;
+ }
+ /*
+ * Get the replica object
+ */
+ dn = slapi_sdn_new_dn_byval(base_dn);
+ if((r = replica_get_replica_from_dn(dn)) == NULL){
+ *returncode = LDAP_OPERATIONS_ERROR ;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
- /*
- * We're done with the payload, free it.
- */
- if(payload){
- ber_bvfree(payload);
- }
- slapi_ch_free_string(&ridstr);
+ /* clean the RUV's */
+ rc = replica_execute_cleanall_ruv_task (r, rid, task, returntext);
- /*
- * Now run the cleanruv task
- */
- replica_execute_cleanruv_task (r, rid, returntext);
-
- if(rc == 0 && agmt_count > 0){ /* success, but we need to check our replicas */
- /*
- * Launch the cleanruv monitoring thread. Once all the replicas are cleaned it will release the rid
- */
- data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
- if (data == NULL) {
- slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to allocate "
- "cleanruv_data. Aborting task.\n");
- return -1;
- }
- data->repl_obj = r;
- data->rid = rid;
-
- thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_monitor_thread,
- (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
- PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
- if (thread == NULL) {
- slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: unable to create cleanAllRUV "
- "monitoring thread. Aborting task.\n");
- }
- } else if(rc == 0){ /* success */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Successfully Finished.\n");
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Task failed (%d)\n",rc);
- }
+out:
+ if(rc){
+ cleanruv_log(task, CLEANALLRUV_ID, "Task failed...(%d)", rc);
+ *returncode = rc;
+ slapi_task_finish(task, *returncode);
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ } else {
+ rc = SLAPI_DSE_CALLBACK_OK;
+ }
+ slapi_sdn_free(&dn);
- return rc;
+ return rc;
}
/*
- * After all the cleanAllRUV extended ops have been sent, we need to monitoring those replicas'
- * RUVs. Once the rid is cleaned, then we need to release it, and push this "release"
- * to the other replicas
+ * CLEANALLRUV task
+ *
+ * [1] Get the maxcsn from the RUV of the rid we want to clean
+ * [2] Create the payload for the "cleanallruv" extended ops
+ * [3] Create "monitor" thread to do the real work.
+ *
*/
-void
-replica_cleanallruv_monitor_thread(void *arg)
+static int
+replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, char *returntext)
{
- Object *agmt_obj;
- LDAP *ld;
- Repl_Connection *conn;
- Repl_Agmt *agmt;
- Replica *replica;;
- cleanruv_data *data = arg;
- LDAPMessage *result, *entry;
- BerElement *ber;
- time_t start_time;
- struct berval **vals;
- char *rid_text;
- char *attrs[2];
- char *attr;
- int replicas_cleaned = 0;
- int found = 0;
- int crc;
- int rc = 0;
- int i;
+ PRThread *thread = NULL;
+ Slapi_Task *pre_task = NULL; /* this is supposed to be null for logging */
+ Replica *replica;
+ Object *ruv_obj;
+ cleanruv_data *data = NULL;
+ CSN *maxcsn = NULL;
+ const RUV *ruv;
+ struct berval *payload = NULL;
+ char *ridstr = NULL;
+ char csnstr[CSN_STRSIZE];
+ int rc = 0;
+
+ if(get_cleanruv_task_count() >= CLEANRIDSIZ){
+ /* we are already running the maximum number of tasks */
+ cleanruv_log(pre_task, CLEANALLRUV_ID,
+ "Exceeded maximum number of active CLEANALLRUV tasks(%d)",CLEANRIDSIZ);
+ returntext = PR_smprintf("Exceeded maximum number of active CLEANALLRUV tasks(%d), "
+ "you must wait for one to finish.", CLEANRIDSIZ);
+ return LDAP_UNWILLING_TO_PERFORM;
+ }
- /*
- * Initialize our settings
- */
- attrs[0] = "nsds50ruv";
- attrs[1] = NULL;
- rid_text = slapi_ch_smprintf("{replica %d ldap", data->rid);
- replica = (Replica*)object_get_data (data->repl_obj);
- start_time = current_time();
+ /*
+ * Grab the replica
+ */
+ if(r){
+ replica = (Replica*)object_get_data (r);
+ } else {
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Replica is NULL, aborting task");
+ rc = -1;
+ goto fail;
+ }
+ /*
+ * Check if this is a consumer
+ */
+ if(replica_get_type(replica) == REPLICA_TYPE_READONLY){
+ /* this is a consumer, send error */
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Failed to clean rid (%d), task can not be run on a consumer",rid);
+ if(task){
+ rc = -1;
+ slapi_task_finish(task, rc);
+ }
+ return -1;
+ }
+ /*
+ * Grab the max csn of the deleted replica
+ */
+ ruv_obj = replica_get_ruv(replica);
+ ruv = object_get_data (ruv_obj);
+ if(ruv_get_rid_max_csn(ruv, &maxcsn, rid) == RUV_BAD_DATA){
+ /* no maxcsn, can not proceed */
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Could not find maxcsn for rid (%d)", rid);
+ rc = -1;
+ object_release(ruv_obj);
+ goto fail;
+ } else {
+ object_release(ruv_obj);
+ if(maxcsn == NULL || csn_get_replicaid(maxcsn) == 0){
+ /*
+ * This is for consistency with extop csn creation, where
+ * we want the csn string to be "0000000000000000000" not ""
+ */
+ csn_free(&maxcsn);
+ maxcsn = csn_new();
+ csn_init_by_string(maxcsn, "");
+ }
+ csn_as_string(maxcsn, PR_FALSE, csnstr);
+ }
+ /*
+ * Create payload
+ */
+ ridstr = slapi_ch_smprintf("%d:%s:%s", rid, slapi_sdn_get_dn(replica_get_root(replica)), csnstr);
+ payload = create_ruv_payload(ridstr);
+ slapi_ch_free_string(&ridstr);
+
+ if(payload == NULL){
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Failed to create extended op payload, aborting task");
+ rc = -1;
+ goto fail;
+ }
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Waiting for all the replicas to get cleaned...\n");
+ /*
+ * Launch the cleanallruv thread. Once all the replicas are cleaned it will release the rid
+ */
+ data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
+ if (data == NULL) {
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Failed to allocate cleanruv_data. Aborting task.");
+ rc = -1;
+ goto fail;
+ }
+ data->repl_obj = r;
+ data->replica = replica;
+ data->rid = rid;
+ data->task = task;
+ data->maxcsn = maxcsn;
+ data->payload = payload;
+ data->sdn = NULL;
+
+ thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_thread,
+ (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
+ if (thread == NULL) {
+ rc = -1;
+ goto fail;
+ } else {
+ goto done;
+ }
- while(!slapi_is_shutting_down())
- {
- DS_Sleep(PR_SecondsToInterval(10));
- found = 0;
- agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
- while (agmt_obj){
- agmt = (Repl_Agmt*)object_get_data (agmt_obj);
- if(!agmt_is_enabled(agmt)){
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- continue;
- }
- /*
- * Get the replication connection
- */
- conn = (Repl_Connection *)agmt_get_connection(agmt);
- crc = conn_connect(conn);
- if (CONN_OPERATION_FAILED == crc ){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: monitor thread failed to connect "
- "to repl agreement connection (%s), error %d\n","", ACQUIRE_TRANSIENT_ERROR);
- continue;
- } else if (CONN_SSL_NOT_ENABLED == crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: monitor thread failed to acquire "
- "repl agmt connection (%s), error %d\n","", ACQUIRE_FATAL_ERROR);
- continue;
- }
- /*
- * Get the LDAP connection handle from the conn
- */
- ld = conn_get_ldap(conn);
- if(ld == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: monitor thread failed to get LDAP "
- "handle from the replication agmt (%s). Moving on to the next agmt.\n",agmt_get_long_name(agmt));
- continue;
- }
- /*
- * Search this replica for its tombstone/ruv entry
- */
- conn_cancel_linger(conn);
- conn_lock(conn);
- rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(agmt_get_replarea(agmt)), LDAP_SCOPE_SUBTREE,
- "(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))",
- attrs, 0, NULL, NULL, NULL, 0, &result);
- if(rc != LDAP_SUCCESS){
- /*
- * Couldn't contact ldap server, what should we do?
- *
- * Skip it and move on! It's the admin's job to make sure all the replicas are up and running
- */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: monitor thread failed to contact "
- "agmt (%s), moving on to the next agmt.\n", agmt_get_long_name(agmt));
- conn_unlock(conn);
- conn_start_linger(conn);
- continue;
- }
- /*
- * There is only one entry. Check its "nsds50ruv" for our cleaned rid
- */
- entry = ldap_first_entry( ld, result );
- if ( entry != NULL ) {
- for ( attr = ldap_first_attribute( ld, entry, &ber ); attr != NULL; attr = ldap_next_attribute( ld, entry, ber ) ){
- /* make sure the attribute is nsds50ruv */
- if(strcasecmp(attr,"nsds50ruv") != 0){
- continue;
- }
- if ((vals = ldap_get_values_len( ld, entry, attr)) != NULL ) {
- for ( i = 0; vals[i] && vals[i]->bv_val; i++ ) {
- /* look for this replica */
- if(strstr(rid_text, vals[i]->bv_val)){
- /* rid has not been cleaned yet, start over */
- found = 1;
- break;
- }
- }
- ldap_value_free_len(vals);
- }
- ldap_memfree( attr );
- }
- if ( ber != NULL ) {
- ber_free( ber, 0 );
- }
- }
- ldap_msgfree( result );
- /*
- * Unlock the connection, and start the linger timer
- */
- conn_unlock(conn);
- conn_start_linger(conn);
-
- if(found){
- /*
- * If we've been trying to clean these replicas for over an hour, just quit
- */
- if( (current_time() - start_time) > 3600){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: timed out checking if replicas have "
- "been cleaned. The rid has not been released, you need to rerun the task.\n");
- goto done;
- }
- /*
- * a rid has not been cleaned yet, go back to sleep and check them again
- */
- break;
- }
+fail:
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Failed to clean rid (%d)",rid);
+ if(task){
+ slapi_task_finish(task, rc);
+ }
+ if(payload){
+ ber_bvfree(payload);
+ }
+ csn_free(&maxcsn);
+ object_release (r);
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- }
- if(!found){
- /*
- * The replicas have been cleaned! Next, release the rid
- */
- replicas_cleaned = 1;
- break;
- }
- } /* while */
+done:
- /*
- * If the replicas are cleaned, release the rid
- */
- if(replicas_cleaned){
- rc = replica_execute_release_ruv_task(data->repl_obj, data->rid);
- if(rc == 0){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Successfully Finished. All active "
- "replicas have been cleaned.\n");
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Failed: Replica ID was not released (%d) "
- "You will need to rerun the task.\n", rc);
- }
- } else {
- /*
- * Shutdown
- */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: slapd shutting down, you will need to rerun the task.\n");
- }
+ return rc;
+}
-done:
- slapi_ch_free((void **)&rid_text);
- slapi_ch_free((void **)&data);
+void
+replica_cleanallruv_thread_ext(void *arg)
+{
+ replica_cleanallruv_thread(arg);
}
/*
- * This function releases the cleaned rid so that it can be reused.
- * We send this operation to all the known active replicas.
+ * CLEANALLRUV Thread
+ *
+ * [1] Wait for the maxcsn to be covered
+ * [2] Make sure all the replicas are alive
+ * [3] Set the cleaned rid
+ * [4] Send the cleanAllRUV extop to all the replicas
+ * [5] Manually send the CLEANRUV task to replicas that do not support CLEANALLRUV
+ * [6] Wait for all the replicas to be cleaned.
+ * [7] Trigger cl trimming, release the rid, and remove all the "cleanallruv" attributes
+ * from the config.
*/
-static int
-replica_execute_release_ruv_task(Object *r, ReplicaId rid)
+static void
+replica_cleanallruv_thread(void *arg)
{
- Repl_Connection *conn;
- Replica *replica = (Replica*)object_get_data (r);
- Object *agmt_obj;
- Repl_Agmt *agmt;
- ConnResult crc;
- const Slapi_DN *dn = NULL;
- struct berval *payload = NULL;
- char *ridstr = NULL;
- int send_msgid = 0;
- int rc = 0;
+ Object *ruv_obj = NULL;
+ Object *agmt_obj = NULL;
+ Repl_Agmt *agmt = NULL;
+ RUV *ruv = NULL;
+ cleanruv_data *data = arg;
+ char csnstr[CSN_STRSIZE];
+ char *returntext = NULL;
+ char *rid_text = NULL;
+ int found_dirty_rid = 1;
+ int agmt_not_notified = 1;
+ int interval = 10;
+ int free_obj = 0;
+ int rc = 0;
+
+ /*
+ * Initialize our settings
+ */
+ if(data->replica == NULL && data->repl_obj == NULL){
+ /*
+ * This thread was initiated at startup because the process did not finish. Due
+ * to timing issues, we need to wait to grab the replica obj until we get here.
+ */
+ data->repl_obj = replica_get_replica_from_dn(data->sdn);
+ data->replica = (Replica*)object_get_data(data->repl_obj);
+ free_obj = 1;
+ }
+ if(data->replica == NULL && data->repl_obj){
+ data->replica = (Replica*)object_get_data(data->repl_obj);
+ }
+ if( data->replica && data->repl_obj == NULL){
+ data->repl_obj = object_new(data->replica, NULL);
+ free_obj = 1;
+ }
+ if(data->task){
+ slapi_task_begin(data->task, 1);
+ }
+ rid_text = slapi_ch_smprintf("{replica %d ldap", data->rid);
+ csn_as_string(data->maxcsn, PR_FALSE, csnstr);
+
+ /*
+ * Add the cleanallruv task to the repl config - so we can handle restarts
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Cleaning rid (%d)...", data->rid);
+ add_cleaned_rid(data->rid, data->replica, csnstr); /* marks config that we started cleaning a rid */
+ /*
+ * First, wait for the maxcsn to be covered
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Waiting to process all the updates from the deleted replica...");
+ ruv_obj = replica_get_ruv(data->replica);
+ ruv = object_get_data (ruv_obj);
+ while(data->maxcsn && !is_task_aborted(data->rid) && !is_cleaned_rid(data->rid) && !slapi_is_shutting_down()){
+ if(csn_get_replicaid(data->maxcsn) == 0 || ruv_covers_csn(ruv,data->maxcsn)){
+ /* We are caught up, now we can clean the ruv's */
+ break;
+ }
+ DS_Sleep(PR_SecondsToInterval(5));
+ }
+ object_release(ruv_obj);
+ /*
+ * Next, make sure all the replicas are up and running before sending off the clean ruv tasks
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Waiting for all the replicas to be online...");
+ if(check_agmts_are_alive(data->replica, data->rid, data->task)){
+ /* error, aborted or shutdown */
+ goto done;
+ }
+ /*
+ * Make sure all the replicas have seen the max csn
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Waiting for all the replicas to receive all the deleted replica updates...");
+ if(check_agmts_are_caught_up(data->replica, data->rid, csnstr, data->task)){
+ /* error, aborted or shutdown */
+ goto done;
+ }
+ /*
+ * Set the rid as notified - this blocks the changelog from sending out updates
+ * during this process, as well as prevents the db ruv from getting polluted.
+ */
+ set_cleaned_rid(data->rid);
+ /*
+ * Now send the cleanruv extended op to all the agreements
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Sending cleanAllRUV task to all the replicas...");
+ while(agmt_not_notified && !is_task_aborted(data->rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
+ if(agmt_obj == NULL){
+ /* no agmts, just clean this replica */
+ break;
+ }
+ while (agmt_obj){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt)){ /* skip disabled replicas */
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ continue;
+ }
+ if(replica_cleanallruv_send_extop(agmt, data->rid, data->task, data->payload, 1) == 0){
+ agmt_not_notified = 0;
+ } else {
+ agmt_not_notified = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ }
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: releasing rid (%d)...\n", rid);
+ if(is_task_aborted(data->rid)){
+ goto done;
+ }
+ if(agmt_not_notified == 0){
+ break;
+ }
+ /*
+ * need to sleep between passes
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Not all replicas have received the "
+ "cleanallruv extended op, retrying in %d seconds",interval);
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(interval) );
+ PR_Unlock( notify_lock );
+
+ if(interval < 14400){ /* 4 hour max */
+ interval = interval * 2;
+ } else {
+ interval = 14400;
+ }
+ }
+ /*
+ * Run the CLEANRUV task
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Cleaning local ruv's...");
+ replica_execute_cleanruv_task (data->repl_obj, data->rid, returntext);
+ /*
+ * Wait for all the replicas to be cleaned
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Waiting for all the replicas to be cleaned...");
+
+ interval = 10;
+ while(found_dirty_rid && !is_task_aborted(data->rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
+ if(agmt_obj == NULL){
+ break;
+ }
+ while (agmt_obj && !slapi_is_shutting_down()){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt)){ /* skip disabled replicas */
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ continue;
+ }
+ if(replica_cleanallruv_check_ruv(agmt, rid_text, data->task) == 0){
+ found_dirty_rid = 0;
+ } else {
+ found_dirty_rid = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ }
+ /* If the task is abort or everyone is cleaned, break out */
+ if(is_task_aborted(data->rid)){
+ goto done;
+ }
+ if(found_dirty_rid == 0){
+ break;
+ }
+ /*
+ * need to sleep between passes
+ */
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Replicas have not been cleaned yet, "
+ "retrying in %d seconds", interval);
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(interval) );
+ PR_Unlock( notify_lock );
+
+ if(interval < 14400){ /* 4 hour max */
+ interval = interval * 2;
+ } else {
+ interval = 14400;
+ }
+ } /* while */
- /*
- * Set the released rid, and trigger cl trimmming
- */
- set_released_rid((int)rid);
- trigger_cl_trimming();
- /*
- * Create payload
- */
- ridstr = slapi_ch_smprintf("%d:%s", rid, slapi_sdn_get_dn(replica_get_root(replica)));
- payload = create_ruv_payload(ridstr);
- if(payload == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_task: failed to create ext op payload, aborting op\n");
- rc = -1;
- goto done;
- }
+done:
+ /*
+ * If the replicas are cleaned, release the rid, and trim the changelog
+ */
+ if(!found_dirty_rid){
+ trigger_cl_trimming(data->rid);
+ delete_cleaned_rid(data->replica, data->rid, data->maxcsn);
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Successfully cleaned rid(%d).", data->rid);
+ slapi_task_finish(data->task, rc);
+ } else {
+ /*
+ * Shutdown or abort
+ */
+ if(!is_task_aborted(data->rid)){
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Server shutting down. Process will resume at server startup");
+ } else {
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Task aborted for rid(%d).",data->rid);
+ }
+ if(data->task){
+ slapi_task_finish(data->task, rc);
+ }
+ }
- agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
- while (agmt_obj)
- {
- agmt = (Repl_Agmt*)object_get_data (agmt_obj);
- if(!agmt_is_enabled(agmt)){
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- continue;
- }
- dn = agmt_get_dn_byref(agmt);
- conn = (Repl_Connection *)agmt_get_connection(agmt);
- if(conn == NULL){
- /* no connection for this agreement, log error, and move on */
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- continue;
- }
- crc = conn_connect(conn);
- if (CONN_OPERATION_FAILED == crc ){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_task: failed to connect "
- "to repl agmt (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_TRANSIENT_ERROR);
- rc = LDAP_OPERATIONS_ERROR;
- } else if (CONN_SSL_NOT_ENABLED == crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_task: failed to acquire "
- "repl agmt (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_FATAL_ERROR);
- rc = LDAP_OPERATIONS_ERROR;
- } else {
- conn_cancel_linger(conn);
- crc = conn_send_extended_operation(conn, REPL_RELEASERUV_OID, payload, NULL, &send_msgid);
- if (CONN_OPERATION_SUCCESS != crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to send "
- "releaseRUV extended op to repl agmt (%s), error %d\n", slapi_sdn_get_dn(dn), crc);
- rc = LDAP_OPERATIONS_ERROR;
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: successfully sent "
- "releaseRUV extended op to (%s)\n",slapi_sdn_get_dn(dn));
- }
- conn_start_linger(conn);
- }
- if(crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica (%s) has not "
- "been released. You will need to rerun the task\n",
- slapi_sdn_get_dn(dn));
- rc = crc;
- }
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- }
+ if(data->payload){
+ ber_bvfree(data->payload);
+ }
+ if(data->repl_obj && free_obj){
+ object_release(data->repl_obj);
+ }
+ slapi_sdn_free(&data->sdn);
+ slapi_ch_free_string(&rid_text);
+ csn_free(&data->maxcsn);
+ slapi_ch_free((void **)&data);
+}
-done:
- /*
- * reset the released/clean rid
- */
- if(rc == 0){
- set_released_rid(ALREADY_RELEASED);
- delete_cleaned_rid();
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Successfully released rid (%d)\n", rid);
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Failed to release rid (%d), error (%d)\n", rid, rc);
- }
+/*
+ * Waits for all the repl agmts to be have have the maxcsn. Returns error only on abort or shutdown
+ */
+static int
+check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_Task *task)
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ char *rid_text;
+ int not_all_caughtup = 1;
+ int interval = 10;
+
+ rid_text = slapi_ch_smprintf("{replica %d ldap", rid);
+
+ while(not_all_caughtup && !is_task_aborted(rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
+ if(agmt_obj == NULL){
+ not_all_caughtup = 0;
+ break;
+ }
+ while (agmt_obj){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt)){ /* skip disabled replicas */
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ continue;
+ }
+ if(replica_cleanallruv_check_maxcsn(agmt, rid_text, maxcsn, task) == 0){
+ not_all_caughtup = 0;
+ } else {
+ not_all_caughtup = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ } /* agmt while */
- if(payload)
- ber_bvfree(payload);
+ if(not_all_caughtup == 0 || is_task_aborted(rid) ){
+ break;
+ }
+ cleanruv_log(task, CLEANALLRUV_ID, "Not all replicas caught up, retrying in %d seconds",interval);
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(interval) );
+ PR_Unlock( notify_lock );
+
+ if(interval < 14400){ /* 4 hour max */
+ interval = interval * 2;
+ } else {
+ interval = 14400;
+ }
+ }
+ slapi_ch_free_string(&rid_text);
- slapi_ch_free_string(&ridstr);
+ if(is_task_aborted(rid)){
+ return -1;
+ }
- return rc;
+ return not_all_caughtup;
}
-static struct berval *
-create_ruv_payload(char *value){
- struct berval *req_data = NULL;
- BerElement *tmp_bere = NULL;
+/*
+ * Waits for all the repl agmts to be online. Returns error only on abort or shutdown
+ */
+static int
+check_agmts_are_alive(Replica *replica, ReplicaId rid, Slapi_Task *task)
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ int not_all_alive = 1;
+ int interval = 10;
+
+ while(not_all_alive && is_task_aborted(rid) == 0 && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
+ if(agmt_obj == NULL){
+ not_all_alive = 0;
+ break;
+ }
+ while (agmt_obj){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt)){ /* skip disabled replicas */
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ continue;
+ }
+ if(replica_cleanallruv_replica_alive(agmt) == 0){
+ not_all_alive = 0;
+ } else {
+ not_all_alive = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ }
- if ((tmp_bere = der_alloc()) == NULL){
- goto error;
- }
- if (ber_printf(tmp_bere, "{s", value) == -1){
- goto error;
- }
+ if(not_all_alive == 0 || is_task_aborted(rid)){
+ break;
+ }
+ cleanruv_log(task, CLEANALLRUV_ID, "Not all replicas online, retrying in %d seconds...",interval);
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(interval) );
+ PR_Unlock( notify_lock );
- if (ber_printf(tmp_bere, "}") == -1){
- goto error;
- }
+ if(interval < 14400){ /* 4 hour max */
+ interval = interval * 2;
+ } else {
+ interval = 14400;
+ }
+ }
+ if(is_task_aborted(rid)){
+ return -1;
+ }
- if (ber_flatten(tmp_bere, &req_data) == -1){
- goto error;
- }
+ return not_all_alive;
+}
- goto done;
+/*
+ * Create the CLEANALLRUV extended op payload
+ */
+struct berval *
+create_ruv_payload(char *value)
+{
+ struct berval *req_data = NULL;
+ BerElement *tmp_bere = NULL;
+
+ if ((tmp_bere = der_alloc()) == NULL){
+ goto error;
+ }
+ if (ber_printf(tmp_bere, "{s", value) == -1){
+ goto error;
+ }
+ if (ber_printf(tmp_bere, "}") == -1){
+ goto error;
+ }
+ if (ber_flatten(tmp_bere, &req_data) == -1){
+ goto error;
+ }
+ goto done;
error:
- if (NULL != req_data){
- ber_bvfree(req_data);
- req_data = NULL;
- }
+ if (NULL != req_data){
+ ber_bvfree(req_data);
+ req_data = NULL;
+ }
done:
- if (NULL != tmp_bere){
- ber_free(tmp_bere, 1);
- tmp_bere = NULL;
- }
+ if (NULL != tmp_bere){
+ ber_free(tmp_bere, 1);
+ tmp_bere = NULL;
+ }
+
+ return req_data;
+}
+
+/*
+ * Manually add the CLEANRUV task to replicas that do not support
+ * the CLEANALLRUV task.
+ */
+static void
+replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
+{
+ Repl_Connection *conn;
+ ConnResult crc = 0;
+ LDAP *ld;
+ Slapi_DN *dn;
+ struct berval *vals[2];
+ struct berval val;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ char *repl_dn = NULL;
+ char data[15];
+ int rc;
- return req_data;
+ if((conn = conn_new(agmt)) == NULL){
+ return;
+ }
+ crc = conn_connect(conn);
+ if (CONN_OPERATION_SUCCESS != crc){
+ conn_delete_internal_ext(conn);
+ return;
+ }
+ ld = conn_get_ldap(conn);
+ if(ld == NULL){
+ conn_delete_internal_ext(conn);
+ return;
+ }
+ val.bv_len = PR_snprintf(data, sizeof(data), "CLEANRUV%d", rid);
+ dn = agmt_get_replarea(agmt);
+ mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
+ mod.mod_type = "nsds5task";
+ mod.mod_bvalues = vals;
+ vals [0] = &val;
+ vals [1] = NULL;
+ val.bv_val = data;
+ mods[0] = &mod;
+ mods[1] = NULL;
+ repl_dn = PR_smprintf("cn=replica,cn=\"%s\",cn=mapping tree,cn=config", slapi_sdn_get_dn(dn));
+ /*
+ * Add task to remote replica
+ */
+ rc = ldap_modify_ext_s( ld, repl_dn, mods, NULL, NULL);
+
+ if(rc != LDAP_SUCCESS){
+ cleanruv_log(task, CLEANALLRUV_ID, "Failed to add CLEANRUV task replica "
+ "(%s). You will need to manually run the CLEANRUV task on this replica (%s) error (%d)",
+ agmt_get_long_name(agmt), agmt_get_hostname(agmt), rc);
+ }
+ slapi_ch_free_string(&repl_dn);
+ conn_delete_internal_ext(conn);
}
+/*
+ * Check if the rid is in our list of "cleaned" rids
+ */
int
is_cleaned_rid(ReplicaId rid)
{
- if(rid == cleaned_rid){
- return 1;
- } else {
- return 0;
- }
+ int i;
+
+ slapi_rwlock_rdlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ && cleaned_rids[i] != 0; i++){
+ if(rid == cleaned_rids[i]){
+ slapi_rwlock_unlock(rid_lock);
+ return 1;
+ }
+ }
+ slapi_rwlock_unlock(rid_lock);
+
+ return 0;
}
+int
+is_task_aborted(ReplicaId rid)
+{
+ int i;
+
+ if(rid == 0){
+ return 0;
+ }
+ slapi_rwlock_rdlock(abort_rid_lock);
+ for(i = 0; i < CLEANRIDSIZ && aborted_rids[i] != 0; i++){
+ if(rid == aborted_rids[i]){
+ slapi_rwlock_unlock(abort_rid_lock);
+ return 1;
+ }
+ }
+ slapi_rwlock_unlock(abort_rid_lock);
+ return 0;
+}
+
+/*
+ * Just add the rid to the in memory, as we don't want it to survive after a restart,
+ * This prevent the changelog from sending updates from this rid, and the local ruv
+ * will not be updated either.
+ */
void
-set_cleaned_rid( ReplicaId rid )
+set_cleaned_rid(ReplicaId rid)
{
- cleaned_rid = rid;
+ int i;
+
+ slapi_rwlock_wrlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ; i++){
+ if(cleaned_rids[i] == 0){
+ cleaned_rids[i] = rid;
+ cleaned_rids[i + 1] = 0;
+ }
+ }
+ slapi_rwlock_unlock(rid_lock);
}
+/*
+ * Add the rid and maxcsn to the repl config (so we can resume after a server restart)
+ */
void
-delete_cleaned_rid()
+add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
{
- cleaned_rid = 0;
+ Slapi_PBlock *pb;
+ struct berval *vals[2];
+ struct berval val;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ char data[CSN_STRSIZE + 10];
+ char *dn;
+ int rc;
+
+ /*
+ * Write the rid & maxcsn to the config entry
+ */
+ val.bv_len = PR_snprintf(data, sizeof(data),"%d:%s", rid, maxcsn);
+ dn = replica_get_dn(r);
+ pb = slapi_pblock_new();
+ mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
+ mod.mod_type = (char *)type_replicaCleanRUV;
+ mod.mod_bvalues = vals;
+ vals [0] = &val;
+ vals [1] = NULL;
+ val.bv_val = data;
+ mods[0] = &mod;
+ mods[1] = NULL;
+
+ replica_add_cleanruv_data(r, val.bv_val);
+
+ slapi_modify_internal_set_pb (pb, dn, mods, NULL, NULL,
+ repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_modify_internal_pb (pb);
+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
+ if (rc != LDAP_SUCCESS){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to update replica "
+ "config (%d), rid (%d)\n", rc, rid);
+ }
+ slapi_ch_free_string(&dn);
+ slapi_pblock_destroy(pb);
}
-int
-get_released_rid()
+/*
+ * Add aborted rid and repl root to config in case of a server restart
+ */
+void
+add_aborted_rid(ReplicaId rid, Replica *r, char *repl_root)
{
- return released_rid;
+ Slapi_PBlock *pb;
+ struct berval *vals[2];
+ struct berval val;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ char *data;
+ char *dn;
+ int rc;
+ int i;
+
+ slapi_rwlock_wrlock(abort_rid_lock);
+ for(i = 0; i < CLEANRIDSIZ; i++){
+ if(aborted_rids[i] == 0){
+ aborted_rids[i] = rid;
+ aborted_rids[i + 1] = 0;
+ break;
+ }
+ }
+ slapi_rwlock_unlock(abort_rid_lock);
+ /*
+ * Write the rid to the config entry
+ */
+ dn = replica_get_dn(r);
+ pb = slapi_pblock_new();
+ data = PR_smprintf("%d:%s", rid, repl_root);
+ mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
+ mod.mod_type = (char *)type_replicaAbortCleanRUV;
+ mod.mod_bvalues = vals;
+ vals [0] = &val;
+ vals [1] = NULL;
+ val.bv_val = data;
+ val.bv_len = strlen (data);
+ mods[0] = &mod;
+ mods[1] = NULL;
+
+ slapi_modify_internal_set_pb (pb, dn, mods, NULL, NULL,
+ repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_modify_internal_pb (pb);
+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
+ if (rc != LDAP_SUCCESS){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to update "
+ "replica config (%d), rid (%d)\n", rc, rid);
+ }
+
+ slapi_ch_free_string(&dn);
+ slapi_ch_free_string(&data);
+ slapi_pblock_destroy(pb);
}
-int
-is_released_rid(int rid)
+void
+delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root){
+ Slapi_PBlock *pb;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ struct berval *vals[2];
+ struct berval val;
+ char *data;
+ char *dn;
+ int rc;
+ int i;
+
+ if(r == NULL)
+ return;
+
+ /*
+ * Remove this rid, and optimize the array
+ */
+ slapi_rwlock_wrlock(abort_rid_lock);
+ for(i = 0; i < CLEANRIDSIZ && aborted_rids[i] != rid; i++); /* found rid, stop */
+ for(; i < CLEANRIDSIZ; i++){
+ /* rewrite entire array */
+ aborted_rids[i] = aborted_rids[i + 1];
+ }
+ slapi_rwlock_unlock(abort_rid_lock);
+ /*
+ * Prepare the mods for the config entry
+ */
+ dn = replica_get_dn(r);
+ pb = slapi_pblock_new();
+ data = PR_smprintf("%d:%s", (int)rid, repl_root);
+
+ mod.mod_op = LDAP_MOD_DELETE|LDAP_MOD_BVALUES;
+ mod.mod_type = (char *)type_replicaAbortCleanRUV;
+ mod.mod_bvalues = vals;
+ vals [0] = &val;
+ vals [1] = NULL;
+ val.bv_val = data;
+ val.bv_len = strlen (data);
+ mods[0] = &mod;
+ mods[1] = NULL;
+
+ slapi_modify_internal_set_pb(pb, dn, mods, NULL, NULL, repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_modify_internal_pb (pb);
+ slapi_pblock_destroy (pb);
+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
+ if (rc != LDAP_SUCCESS){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to remove replica "
+ "config (%d), rid (%d)\n", rc, rid);
+ }
+
+ slapi_ch_free_string(&dn);
+ slapi_ch_free_string(&data);
+}
+
+/*
+ * Remove the rid from our list, and the config
+ */
+void
+delete_cleaned_rid(Replica *r, ReplicaId rid, CSN *maxcsn)
{
- if(rid == released_rid){
- return 1;
- } else {
- return 0;
- }
+ Slapi_PBlock *pb;
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ struct berval *vals[2];
+ struct berval val;
+ char *dn;
+ char data[CSN_STRSIZE + 10];
+ char csnstr[CSN_STRSIZE];
+ int rc;
+ int i;
+
+ if(r == NULL || maxcsn == NULL)
+ return;
+
+ /*
+ * Remove this rid, and optimize the array
+ */
+ slapi_rwlock_wrlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ && cleaned_rids[i] != rid; i++); /* found rid, stop */
+ for(; i < CLEANRIDSIZ; i++){
+ /* rewrite entire array */
+ cleaned_rids[i] = cleaned_rids[i + 1];
+ }
+ slapi_rwlock_unlock(rid_lock);
+ /*
+ * Prepare the mods for the config entry
+ */
+ csn_as_string(maxcsn, PR_FALSE, csnstr);
+ val.bv_len = PR_snprintf(data, sizeof(data), "%d:%s", (int)rid, csnstr);
+ dn = replica_get_dn(r);
+ pb = slapi_pblock_new();
+ mod.mod_op = LDAP_MOD_DELETE|LDAP_MOD_BVALUES;
+ mod.mod_type = (char *)type_replicaCleanRUV;
+ mod.mod_bvalues = vals;
+ vals [0] = &val;
+ vals [1] = NULL;
+ val.bv_val = data;
+ mods[0] = &mod;
+ mods[1] = NULL;
+
+ replica_remove_cleanruv_data(r, data);
+
+ slapi_modify_internal_set_pb(pb, dn, mods, NULL, NULL, repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_modify_internal_pb (pb);
+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
+ if (rc != LDAP_SUCCESS){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to remove replica config "
+ "(%d), rid (%d)\n", rc, rid);
+ }
+ slapi_pblock_destroy (pb);
+ slapi_ch_free_string(&dn);
+ /*
+ * Now release the cleaned rid from the repl agmts
+ */
+ agmt_obj = agmtlist_get_first_agreement_for_replica (r);
+ while (agmt_obj){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt)){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
+ continue;
+ }
+ agmt_set_cleanruv_data(agmt, rid, CLEANRUV_RELEASED);
+ agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
+ }
}
+/*
+ * Abort the CLEANALLRUV task
+ */
int
-is_already_released_rid()
+replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
+ int *returncode, char *returntext, void *arg)
{
- if(released_rid == ALREADY_RELEASED){
- return 1;
- } else {
- return 0;
- }
+ PRThread *thread = NULL;
+ struct berval *payload = NULL;
+ Slapi_Task *task = NULL;
+ Replica *replica;
+ ReplicaId rid;
+ cleanruv_data *data = NULL;
+ const Slapi_DN *dn;
+ Object *r;
+ CSN *maxcsn;
+ const char *base_dn;
+ const char *rid_str;
+ char *ridstr;
+ int rc = SLAPI_DSE_CALLBACK_OK;
+
+ if(get_abort_cleanruv_task_count() >= CLEANRIDSIZ){
+ /* we are already running the maximum number of tasks */
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,
+ "Exceeded maximum number of active ABORT CLEANALLRUV tasks(%d)",CLEANRIDSIZ);
+ returntext = PR_smprintf("Exceeded maximum number of active ABORT CLEANALLRUV tasks(%d), "
+ "you must wait for one to finish.", CLEANRIDSIZ);
+ *returncode = LDAP_OPERATIONS_ERROR;
+ return SLAPI_DSE_CALLBACK_ERROR;
+ }
+
+ /* allocate new task now */
+ task = slapi_new_task(slapi_entry_get_ndn(e));
+ /*
+ * Get our task settings
+ */
+ if ((rid_str = fetch_attr(e, "replica-id", 0)) == NULL){
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Missing required attr \"replica-id\"");
+ *returncode = LDAP_OBJECT_CLASS_VIOLATION;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Missing required attr \"replica-base-dn\"");
+ *returncode = LDAP_OBJECT_CLASS_VIOLATION;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ /*
+ * Check the rid
+ */
+ rid = atoi(rid_str);
+ if (rid <= 0 || rid >= READ_ONLY_REPLICA_ID){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Invalid replica id (%d) for task - (%s)",
+ rid, slapi_sdn_get_dn(slapi_entry_get_sdn(e)));
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,"%s", returntext);
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ /*
+ * Get the replica object
+ */
+ dn = slapi_sdn_new_dn_byval(base_dn);
+ if((r = replica_get_replica_from_dn(dn)) == NULL){
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Failed to find replica from dn(%s)", base_dn);
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ /*
+ * Create payload
+ */
+ ridstr = slapi_ch_smprintf("%d:%s", rid, base_dn);
+ payload = create_ruv_payload(ridstr);
+
+ if(payload == NULL){
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Failed to create extended op payload, aborting task");
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ /*
+ * Stop the cleaning, and delete the rid
+ */
+ replica = (Replica*)object_get_data (r);
+ maxcsn = replica_get_cleanruv_maxcsn(replica, rid);
+ delete_cleaned_rid(replica, rid, maxcsn);
+ add_aborted_rid(rid, replica, (char *)base_dn);
+ stop_ruv_cleaning();
+ /*
+ * Prepare the abort struct and fire off the thread
+ */
+ data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
+ if (data == NULL) {
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Failed to allocate abort_cleanruv_data. Aborting task.");
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ data->repl_obj = r; /* released in replica_abort_task_thread() */
+ data->replica = replica;
+ data->task = task;
+ data->payload = payload;
+ data->rid = rid;
+ data->repl_root = slapi_ch_strdup(base_dn);
+ data->sdn = NULL;
+
+ thread = PR_CreateThread(PR_USER_THREAD, replica_abort_task_thread,
+ (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
+ if (thread == NULL) {
+ object_release(r);
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Unable to create abort thread. Aborting task.");
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ }
+
+out:
+
+ csn_free(&maxcsn);
+ slapi_ch_free_string(&ridstr);
+
+ if(rc != SLAPI_DSE_CALLBACK_OK){
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Abort Task failed (%d)", rc);
+ slapi_task_finish(task, rc);
+ }
+
+ return rc;
+}
+
+/*
+ * Abort CLEANALLRUV task thread
+ */
+void
+replica_abort_task_thread(void *arg)
+{
+ cleanruv_data *data = (cleanruv_data *)arg;
+ Repl_Agmt *agmt;
+ Object *agmt_obj;
+ int agmt_not_notified = 1;
+ int interval = 10;
+ int release_it = 0;
+
+ /*
+ * Need to build the replica from the dn
+ */
+ if(data->replica == NULL && data->repl_obj == NULL){
+ /*
+ * This thread was initiated at startup because the process did not finish. Due
+ * to timing issues, we need to wait to grab the replica obj until we get here.
+ */
+ if((data->repl_obj = replica_get_replica_from_dn(data->sdn)) == NULL){
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Failed to get replica from dn (%s).", slapi_sdn_get_dn(data->sdn));
+ goto done;
+ }
+ if(data->replica == NULL && data->repl_obj){
+ data->replica = (Replica*)object_get_data(data->repl_obj);
+ }
+ release_it = 1;
+ }
+
+ /*
+ * Now send the cleanruv extended op to all the agreements
+ */
+ while(agmt_not_notified && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
+ while (agmt_obj){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt)){ /* skip disabled replicas */
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ continue;
+ }
+ if(replica_cleanallruv_send_abort_extop(agmt, data->task, data->payload)){
+ agmt_not_notified = 1;
+ break;
+ } else {
+ /* success */
+ agmt_not_notified = 0;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ } /* while loop for agmts */
+
+ if(agmt_not_notified == 0){
+ /* everybody has been contacted */
+ break;
+ }
+ /*
+ * need to sleep between passes
+ */
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID,"Retrying in %d seconds",interval);
+ PR_Lock( notify_lock );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(interval) );
+ PR_Unlock( notify_lock );
+
+ if(interval < 14400){ /* 4 hour max */
+ interval = interval * 2;
+ } else {
+ interval = 14400;
+ }
+ } /* while */
+
+done:
+ if(agmt_not_notified){
+ /* failure */
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID,"Abort task failed, will resume the task at the next server startup.");
+ } else {
+ /*
+ * Clean up the config
+ */
+ delete_aborted_rid(data->replica, data->rid, data->repl_root);
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Successfully aborted cleanAllRUV task for rid(%d)", data->rid);
+ }
+ if(data->task){
+ slapi_task_finish(data->task, agmt_not_notified);
+ }
+ if(data->repl_obj && release_it)
+ object_release(data->repl_obj);
+ if(data->payload){
+ ber_bvfree(data->payload);
+ }
+ slapi_ch_free_string(&data->repl_root);
+ slapi_sdn_free(&data->sdn);
+ slapi_ch_free((void **)&data);
+}
+
+static int
+replica_cleanallruv_send_abort_extop(Repl_Agmt *ra, Slapi_Task *task, struct berval *payload)
+{
+ Repl_Connection *conn = NULL;
+ ConnResult crc = 0;
+ int msgid = 0;
+ int rc = 0;
+
+ if((conn = conn_new(ra)) == NULL){
+ return -1;
+ }
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ crc = conn_send_extended_operation(conn, REPL_ABORT_CLEANRUV_OID, payload, NULL, &msgid);
+ /*
+ * success or failure, just return the error code
+ */
+ rc = crc;
+ if(rc){
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Failed to send extop to replica(%s).", agmt_get_long_name(ra));
+ }
+ } else {
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Failed to connect to replica(%s).", agmt_get_long_name(ra));
+ rc = -1;
+ }
+ conn_delete_internal_ext(conn);
+
+ return rc;
+}
+
+
+static int
+replica_cleanallruv_send_extop(Repl_Agmt *ra, ReplicaId rid, Slapi_Task *task, struct berval *payload, int check_result)
+{
+ Repl_Connection *conn = NULL;
+ ConnResult crc = 0;
+ int msgid = 0;
+ int rc = 0;
+
+ if((conn = conn_new(ra)) == NULL){
+ return -1;
+ }
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS && check_result){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
+
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ struct berval **ruv_bervals = NULL;
+ struct berval *data = NULL;
+ char *data_guid = NULL;
+
+ decode_repl_ext_response(retsdata, &rc, &ruv_bervals, &data_guid, &data);
+ /* just free everything, we only wanted "rc" */
+ slapi_ch_free_string(&data_guid);
+ if(data)
+ ber_bvfree(data);
+ if (ruv_bervals)
+ ber_bvecfree(ruv_bervals);
+
+ if(rc == 0 ){ /* rc == 1 is success */
+ cleanruv_log(task, CLEANALLRUV_ID,"Replica %s does not support the CLEANALLRUV task. Sending replica CLEANRUV task...",
+ slapi_sdn_get_dn(agmt_get_dn_byref(ra)));
+ /*
+ * Ok, this replica doesn't know about CLEANALLRUV, so just manually
+ * add the CLEANRUV task to the replica.
+ */
+ replica_send_cleanruv_task(ra, rid, task);
+ } else {
+ /* extop was accepted */
+ rc = 0;
+ }
+ if (NULL != retoid)
+ ldap_memfree(retoid);
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
+ }
+ agmt_set_cleanruv_data(ra, rid, CLEANRUV_NOTIFIED);
+ } else {
+ /*
+ * success or failure, just return the error code
+ */
+ rc = crc;
+ }
+ } else {
+ rc =-1;
+ }
+ conn_delete_internal_ext(conn);
+
+ return rc;
+}
+
+static int
+replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn, Slapi_Task *task)
+{
+ Repl_Connection *conn = NULL;
+ LDAP *ld;
+ Slapi_DN *dn = agmt_get_replarea(agmt);
+ struct berval **vals;
+ LDAPMessage *result = NULL, *entry = NULL;
+ BerElement *ber;
+ char *attrs[2];
+ char *attr = NULL;
+ char *iter = NULL;
+ char *ruv_part = NULL;
+ int found_rid = 0;
+ int part_count = 0;
+ int rc = 0, i;
+
+ if((conn = conn_new(agmt)) == NULL){
+ return -1;
+ }
+
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ attrs[0] = "nsds50ruv";
+ attrs[1] = NULL;
+ ld = conn_get_ldap(conn);
+ if(ld == NULL){
+ conn_delete_internal_ext(conn);
+ return -1;
+ }
+ rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(dn), LDAP_SCOPE_SUBTREE,
+ "(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))",
+ attrs, 0, NULL, NULL, NULL, 0, &result);
+ slapi_sdn_free(&dn);
+ if(rc != LDAP_SUCCESS){
+ cleanruv_log(task, CLEANALLRUV_ID,"Failed to contact "
+ "agmt (%s) error (%d), will retry later.", agmt_get_long_name(agmt), rc);
+ conn_delete_internal_ext(conn);
+ return -1;
+ }
+ entry = ldap_first_entry( ld, result );
+ if ( entry != NULL ) {
+ for ( attr = ldap_first_attribute( ld, entry, &ber ); attr != NULL; attr = ldap_next_attribute( ld, entry, ber ) ){
+ /* make sure the attribute is nsds50ruv */
+ if(strcasecmp(attr,"nsds50ruv") != 0){
+ ldap_memfree( attr );
+ continue;
+ }
+ found_rid = 0;
+ if ((vals = ldap_get_values_len( ld, entry, attr)) != NULL ) {
+ for ( i = 0; vals[i] && vals[i]->bv_val; i++ ) {
+ /* look for this replica */
+ if(strstr(vals[i]->bv_val, rid_text)){
+ found_rid = 1;
+ /* get the max csn compare it to our known max csn */
+ ruv_part = ldap_utf8strtok_r(vals[i]->bv_val, " ", &iter);
+ for(part_count = 1; ruv_part && part_count < 5; part_count++){
+ ruv_part = ldap_utf8strtok_r(iter, " ", &iter);
+ }
+ if(part_count == 5){
+ /* we have the maxcsn */
+ if(strcmp(ruv_part, maxcsn)){
+ /* we are not caught up yet, free, and return */
+ ldap_value_free_len(vals);
+ ldap_memfree( attr );
+ ldap_msgfree( result );
+ if(ber){
+ ber_free( ber, 0 );
+ }
+ conn_delete_internal_ext(conn);
+ return -1;
+ } else {
+ /* ok this replica has all the updates from the deleted replica */
+ rc = 0;
+ }
+ } else {
+ /* there is no maxcsn for this rid - treat it as caught up */
+ rc = 0;
+ }
+ }
+ }
+ if(!found_rid){
+ /* must have been cleaned already */
+ rc = 0;
+ }
+ ldap_value_free_len(vals);
+ }
+ ldap_memfree( attr );
+ }
+ if ( ber != NULL ) {
+ ber_free( ber, 0 );
+ }
+ }
+ if(result)
+ ldap_msgfree( result );
+ } else {
+ rc = -1;
+ }
+ conn_delete_internal_ext(conn);
+
+ return rc;
+}
+
+static int
+replica_cleanallruv_replica_alive(Repl_Agmt *agmt)
+{
+ Repl_Connection *conn = NULL;
+ LDAP *ld = NULL;
+ LDAPMessage *result = NULL;
+ int rc = 0;
+
+ if((conn = conn_new(agmt)) == NULL){
+ return -1;
+ }
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ ld = conn_get_ldap(conn);
+ if(ld == NULL){
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "cleanAllRUV_task: failed to get LDAP "
+ "handle from the replication agmt (%s). Moving on to the next agmt.\n",agmt_get_long_name(agmt));
+ conn_delete_internal_ext(conn);
+ return -1;
+ }
+ if(ldap_search_ext_s(ld, "", LDAP_SCOPE_BASE, "objectclass=top",
+ NULL, 0, NULL, NULL, NULL, 0, &result) == LDAP_SUCCESS)
+ {
+ rc = 0;
+ } else {
+ rc = -1;
+ }
+ if(result)
+ ldap_msgfree( result );
+ } else {
+ rc = -1;
+ }
+ conn_delete_internal_ext(conn);
+
+ return rc;
}
+static int
+replica_cleanallruv_check_ruv(Repl_Agmt *ra, char *rid_text, Slapi_Task *task)
+{
+ Repl_Connection *conn = NULL;
+ BerElement *ber = NULL;
+ struct berval **vals = NULL;
+ LDAPMessage *result = NULL, *entry = NULL;
+ LDAP *ld = NULL;
+ Slapi_DN *dn = agmt_get_replarea(ra);
+ char *attrs[2];
+ char *attr = NULL;
+ int rc = 0, i;
+
+ if((conn = conn_new(ra)) == NULL){
+ return -1;
+ }
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ attrs[0] = "nsds50ruv";
+ attrs[1] = NULL;
+ ld = conn_get_ldap(conn);
+ if(ld == NULL){
+ cleanruv_log(task, CLEANALLRUV_ID,"Failed to get LDAP handle from "
+ "the replication agmt (%s). Moving on to the next agmt.",agmt_get_long_name(ra));
+ rc = -1;
+ goto done;
+ }
+
+ rc = ldap_search_ext_s(ld, slapi_sdn_get_dn(dn), LDAP_SCOPE_SUBTREE,
+ "(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))",
+ attrs, 0, NULL, NULL, NULL, 0, &result);
+ slapi_sdn_free(&dn);
+ if(rc != LDAP_SUCCESS){
+ cleanruv_log(task, CLEANALLRUV_ID,"Failed to contact "
+ "agmt (%s) error (%d), will retry later.", agmt_get_long_name(ra), rc);
+ rc = -1;
+ goto done;
+ }
+ entry = ldap_first_entry( ld, result );
+ if ( entry != NULL ) {
+ for ( attr = ldap_first_attribute( ld, entry, &ber ); attr != NULL; attr = ldap_next_attribute( ld, entry, ber ) ){
+ /* make sure the attribute is nsds50ruv */
+ if(strcasecmp(attr,"nsds50ruv") != 0){
+ ldap_memfree( attr );
+ continue;
+ }
+ if ((vals = ldap_get_values_len( ld, entry, attr)) != NULL ) {
+ for ( i = 0; vals[i] && vals[i]->bv_val; i++ ) {
+ /* look for this replica */
+ if(strstr(vals[i]->bv_val, rid_text)){
+ /* rid has not been cleaned yet, free and return */
+ rc = -1;
+ ldap_value_free_len(vals);
+ ldap_memfree( attr );
+ if ( ber != NULL ) {
+ ber_free( ber, 0 );
+ ber = NULL;
+ }
+ goto done;
+ } else {
+ rc = 0;
+ }
+ }
+ ldap_value_free_len(vals);
+ }
+ ldap_memfree( attr );
+ } /* for loop */
+ if ( ber != NULL ) {
+ ber_free( ber, 0 );
+ }
+ }
+done:
+ if(result)
+ ldap_msgfree( result );
+ } else {
+ return -1;
+ }
+ conn_delete_internal_ext(conn);
+
+ return rc;
+}
+
+static int
+get_cleanruv_task_count()
+{
+ int i, count = 0;
+
+ slapi_rwlock_wrlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ; i++){
+ if(cleaned_rids[i] != 0){
+ count++;
+ }
+ }
+ slapi_rwlock_unlock(rid_lock);
+
+ return count;
+}
+
+static int
+get_abort_cleanruv_task_count()
+{
+ int i, count = 0;
+
+ slapi_rwlock_wrlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ; i++){
+ if(aborted_rids[i] != 0){
+ count++;
+ }
+ }
+ slapi_rwlock_unlock(rid_lock);
+
+ return count;
+}
+
+/*
+ * Notify sleeping CLEANALLRUV threads to stop
+ */
void
-set_released_rid( int rid )
+stop_ruv_cleaning()
{
- released_rid = rid;
+ if(notify_lock){
+ PR_Lock( notify_lock );
+ PR_NotifyCondVar( notify_cvar );
+ PR_Unlock( notify_lock );
+ }
}
+/*
+ * Write our logging to the task and error log
+ */
void
-delete_released_rid()
+cleanruv_log(Slapi_Task *task, char *task_type, char *fmt, ...)
{
- released_rid = 0;
+ va_list ap1;
+ va_list ap2;
+ va_list ap3;
+ va_list ap4;
+ char *errlog_fmt;
+
+ va_start(ap1, fmt);
+ va_start(ap2, fmt);
+ va_start(ap3, fmt);
+ va_start(ap4, fmt);
+
+ if(task){
+ slapi_task_log_notice_ext(task, fmt, ap1);
+ slapi_task_log_status_ext(task, fmt, ap2);
+ slapi_task_inc_progress(task);
+ }
+ errlog_fmt = PR_smprintf("%s: %s\n",task_type, fmt);
+ slapi_log_error_ext(SLAPI_LOG_FATAL, repl_plugin_name, errlog_fmt, ap3, ap4);
+ slapi_ch_free_string(&errlog_fmt);
+
+ va_end(ap1);
+ va_end(ap2);
+ va_end(ap3);
+ va_end(ap4);
}
+
diff --git a/ldap/servers/plugins/replication/repl5_ruv.c b/ldap/servers/plugins/replication/repl5_ruv.c
index 9ad5c5a..fb8ea09 100644
--- a/ldap/servers/plugins/replication/repl5_ruv.c
+++ b/ldap/servers/plugins/replication/repl5_ruv.c
@@ -487,9 +487,9 @@ ruv_replace_replica_purl (RUV *ruv, ReplicaId rid, const char *replica_purl)
replica = ruvGetReplica (ruv, rid);
if (replica != NULL)
{
- if (strcmp(replica->replica_purl, replica_purl)) { /* purl updated */
+ if (replica->replica_purl == NULL || strcmp(replica->replica_purl, replica_purl)) { /* purl updated */
/* Replace replica_purl in RUV since supplier has been updated. */
- slapi_ch_free((void **)&(replica->replica_purl));
+ slapi_ch_free_string(&replica->replica_purl);
replica->replica_purl = slapi_ch_strdup(replica_purl);
/* Also, reset csn and min_csn. */
replica->csn = replica->min_csn = NULL;
@@ -863,10 +863,6 @@ ruv_covers_csn_internal(const RUV *ruv, const CSN *csn, PRBool strict)
{
rid = csn_get_replicaid(csn);
replica = ruvGetReplica (ruv, rid);
- if((is_released_rid(rid)) || (replica == NULL && is_already_released_rid()) ){
- /* this is a released rid, so return true */
- return PR_TRUE;
- }
if (replica == NULL)
{
/*
@@ -930,7 +926,7 @@ ruv_covers_csn_strict(const RUV *ruv, const CSN *csn)
* or max{maxcsns of all ruv elements} if get_the_max != 0.
*/
static int
-ruv_get_min_or_max_csn(const RUV *ruv, CSN **csn, int get_the_max)
+ruv_get_min_or_max_csn(const RUV *ruv, CSN **csn, int get_the_max, ReplicaId rid)
{
int return_value;
@@ -960,12 +956,18 @@ ruv_get_min_or_max_csn(const RUV *ruv, CSN **csn, int get_the_max)
{
continue;
}
-
- if (found == NULL ||
- (!get_the_max && csn_compare(found, replica->csn)>0) ||
- ( get_the_max && csn_compare(found, replica->csn)<0))
- {
- found = replica->csn;
+ if(rid){ /* we are only interested in this rid's maxcsn */
+ if(replica->rid == rid){
+ found = replica->csn;
+ break;
+ }
+ } else {
+ if (found == NULL ||
+ (!get_the_max && csn_compare(found, replica->csn)>0) ||
+ ( get_the_max && csn_compare(found, replica->csn)<0))
+ {
+ found = replica->csn;
+ }
}
}
if (found == NULL)
@@ -983,15 +985,20 @@ ruv_get_min_or_max_csn(const RUV *ruv, CSN **csn, int get_the_max)
}
int
+ruv_get_rid_max_csn(const RUV *ruv, CSN **csn, ReplicaId rid){
+ return ruv_get_min_or_max_csn(ruv, csn, 1 /* get the max */, rid);
+}
+
+int
ruv_get_max_csn(const RUV *ruv, CSN **csn)
{
- return ruv_get_min_or_max_csn(ruv, csn, 1 /* get the max */);
+ return ruv_get_min_or_max_csn(ruv, csn, 1 /* get the max */, 0 /* rid */);
}
int
ruv_get_min_csn(const RUV *ruv, CSN **csn)
{
- return ruv_get_min_or_max_csn(ruv, csn, 0 /* get the min */);
+ return ruv_get_min_or_max_csn(ruv, csn, 0 /* get the min */, 0 /* rid */);
}
int
@@ -1097,6 +1104,22 @@ ruv_to_bervals(const RUV *ruv, struct berval ***bvals)
return return_value;
}
+void
+ruv_get_cleaned_rids(RUV *ruv, ReplicaId *rids)
+{
+ RUVElement *replica;
+ int cookie;
+ int i = 0;
+
+ for (replica = dl_get_first (ruv->elements, &cookie); replica;
+ replica = dl_get_next (ruv->elements, &cookie))
+ {
+ if(is_cleaned_rid(replica->rid)){
+ rids[i++] = replica->rid;
+ }
+ }
+}
+
int
ruv_to_smod(const RUV *ruv, Slapi_Mod *smod)
{
@@ -1428,15 +1451,14 @@ int ruv_add_csn_inprogress (RUV *ruv, const CSN *csn)
slapi_rwlock_wrlock (ruv->lock);
if(is_cleaned_rid(rid)){
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "ruv_add_csn_inprogress: invalid replica ID"
- "(%d), aborting update\n", rid);
/* return success because we want to consume the update, but not perform it */
+ rc = RUV_COVERS_CSN;
goto done;
}
replica = ruvGetReplica (ruv, rid);
if (replica == NULL)
{
- replica = ruvAddReplicaNoCSN (ruv, csn_get_replicaid (csn), NULL/*purl*/);
+ replica = ruvAddReplicaNoCSN (ruv, rid, NULL/*purl*/);
if (replica == NULL)
{
if (slapi_is_loglevel_set(SLAPI_LOG_REPL)) {
diff --git a/ldap/servers/plugins/replication/repl5_ruv.h b/ldap/servers/plugins/replication/repl5_ruv.h
index d329dc3..f2d96f3 100644
--- a/ldap/servers/plugins/replication/repl5_ruv.h
+++ b/ldap/servers/plugins/replication/repl5_ruv.h
@@ -117,6 +117,7 @@ PRBool ruv_covers_csn(const RUV *ruv, const CSN *csn);
PRBool ruv_covers_csn_strict(const RUV *ruv, const CSN *csn);
int ruv_get_min_csn(const RUV *ruv, CSN **csn);
int ruv_get_max_csn(const RUV *ruv, CSN **csn);
+int ruv_get_rid_max_csn(const RUV *ruv, CSN **csn, ReplicaId rid);
int ruv_enumerate_elements (const RUV *ruv, FNEnumRUV fn, void *arg);
int ruv_to_smod(const RUV *ruv, Slapi_Mod *smod);
int ruv_last_modified_to_smod(const RUV *ruv, Slapi_Mod *smod);
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index f6378d2..88bb9e3 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -1338,7 +1338,7 @@ replica_config_get_mtnode_by_dn(const char *dn)
/*
* Decode the ber element passed to us by the cleanAllRUV task
*/
-static int
+int
decode_cleanruv_payload(struct berval *extop_value, char **payload)
{
BerElement *tmp_bere = NULL;
@@ -1373,313 +1373,313 @@ free_and_return:
return rc;
}
-/*
- * Process the REPL_CLEANRUV_OID extended operation.
- *
- * The payload consists of the replica ID, and the repl root dn. Since this is
- * basically a replication operation, it could of originated here and bounced
- * back from another master. So check the rid against the "cleaned_rid". If
- * it's a match, then we were already here, and we can just return success.
- *
- * Otherwise, we the set the cleaned_rid from the payload, fire off extended ops
- * to all the replica agreements on this replica. Then perform the actual
- * cleanruv_task on this replica.
- */
int
-multimaster_extop_cleanruv(Slapi_PBlock *pb){
+multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
+{
multimaster_mtnode_extension *mtnode_ext;
PRThread *thread = NULL;
- Repl_Connection *conn;
- const Slapi_DN *dn;
- Replica *r = NULL;
- Object *agmt_obj;
- Repl_Agmt *agmt;
- ConnResult crc;
- cleanruv_data *data = NULL;
- struct berval *extop_value;
+ cleanruv_data *data;
+ Replica *r;
+ ReplicaId rid;
+ CSN *maxcsn;
+ struct berval *extop_payload;
char *extop_oid;
char *repl_root;
char *payload = NULL;
char *iter;
- int send_msgid = 0;
- int agmt_count = 0;
- int rid = 0;
int rc = 0;
slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
- slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_value);
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_OID) != 0 ||
- NULL == extop_value || NULL == extop_value->bv_val){
+ NULL == extop_payload || NULL == extop_payload->bv_val){
/* something is wrong, error out */
- return -1;
+ return LDAP_OPERATIONS_ERROR;
}
/*
- * Extract the rid and repl_root from the payload
+ * Decode the payload, and grab our settings
*/
- if(decode_cleanruv_payload(extop_value, &payload)){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to decode payload. Aborting ext op\n");
- return -1;
+ if(decode_cleanruv_payload(extop_payload, &payload)){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: failed to decode payload. Aborting ext op\n");
+ return LDAP_OPERATIONS_ERROR;
}
rid = atoi(ldap_utf8strtok_r(payload, ":", &iter));
repl_root = ldap_utf8strtok_r(iter, ":", &iter);
- /*
- * If we already cleaned this server, just return success
- */
- if(is_cleaned_rid(rid)){
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "cleanAllRUV_extop: rid (%d) has already been cleaned, skipping\n",rid);
- return rc;
+ if(!is_cleaned_rid(rid) || is_task_aborted(rid)){
+ /* This replica has already been aborted, or was never cleaned, or already finished cleaning */
+ goto out;
} else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: cleaning rid (%d)...\n", rid);
- set_cleaned_rid(rid);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: aborting cleanallruv task for rid(%d)\n", rid);
}
-
/*
* Get the node, so we can get the replica and its agreements
*/
if((mtnode_ext = replica_config_get_mtnode_by_dn(repl_root)) == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to get replication node "
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: failed to get replication node "
"from (%s), aborting operation\n", repl_root);
- return -1;
+ rc = LDAP_OPERATIONS_ERROR;
+ goto out;
}
- if (mtnode_ext->replica)
+ if (mtnode_ext->replica){
object_acquire (mtnode_ext->replica);
- if (mtnode_ext->replica == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: replica is missing from (%s), "
+ } else {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: replica is missing from (%s), "
"aborting operation\n",repl_root);
rc = LDAP_OPERATIONS_ERROR;
- goto free_and_return;
+ goto out;
}
r = (Replica*)object_get_data (mtnode_ext->replica);
+ if(r == NULL){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: replica is NULL, aborting task\n");
+ rc = LDAP_OPERATIONS_ERROR;
+ goto out;
+ }
/*
- * Send out extended ops to each repl agreement
+ * Prepare the abort data
*/
- agmt_obj = agmtlist_get_first_agreement_for_replica (r);
- while (agmt_obj)
- {
- agmt = (Repl_Agmt*)object_get_data (agmt_obj);
- if(!agmt_is_enabled(agmt)){
- agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
- continue;
- }
- dn = agmt_get_dn_byref(agmt);
- conn = (Repl_Connection *)agmt_get_connection(agmt);
- if(conn == NULL){
- /* no connection for this agreement, move on to the next agmt */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: the replica (%s), is "
- "missing the connection. This replica will not be cleaned.\n", slapi_sdn_get_dn(dn));
- agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
- continue;
- }
- crc = conn_connect(conn);
- if (CONN_OPERATION_FAILED == crc ){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to connect "
- "to repl agreement connection (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_TRANSIENT_ERROR);
- rc = LDAP_OPERATIONS_ERROR;
- } else if (CONN_SSL_NOT_ENABLED == crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to acquire "
- "repl agmt connection (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_FATAL_ERROR);
- rc = LDAP_OPERATIONS_ERROR;
- } else {
- conn_cancel_linger(conn);
- crc = conn_send_extended_operation(conn, REPL_CLEANRUV_OID, extop_value, NULL, &send_msgid);
- if (CONN_OPERATION_SUCCESS != crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to send "
- "clean_ruv extended op to repl agmt (%s), error %d\n", slapi_sdn_get_dn(dn), crc);
- rc = LDAP_OPERATIONS_ERROR;
- } else {
- /* success */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: successfully sent "
- "extended op to (%s)\n",slapi_sdn_get_dn(dn) );
- agmt_count++;
- }
- conn_start_linger(conn);
- }
- if(crc != CONN_OPERATION_SUCCESS){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: replica (%s) has not "
- "been cleaned. You will need to rerun the CLEANALLRUV task on this replica\n",
- slapi_sdn_get_dn(dn) );
- rc = LDAP_OPERATIONS_ERROR;
- }
- agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
- }
-
- /* now clean the ruv */
- replica_execute_cleanruv_task_ext(mtnode_ext->replica, rid);
-
-free_and_return:
-
- if(rc == 0 && agmt_count > 0){
- /*
- * Launch the cleanruv monitoring thread. Once all the replicas are cleaned it will release the rid
- */
- data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
- if (data == NULL) {
- slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to allocate "
- "cleanruv_Data\n");
- return -1;
- }
- data->repl_obj = mtnode_ext->replica;
- data->rid = rid;
-
- thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_monitor_thread,
- (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
- PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
- if (thread == NULL) {
- slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: unable to create cleanAllRUV "
- "monitoring thread. Aborting task.\n");
+ data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
+ if (data == NULL) {
+ slapi_log_error( SLAPI_LOG_REPL, repl_plugin_name, "Abort cleanAllRUV task: failed to allocate "
+ "abort_cleanruv_data. Aborting task.\n");
+ rc = LDAP_OPERATIONS_ERROR;
+ goto out;
+ }
+ data->repl_obj = mtnode_ext->replica; /* released in replica_abort_task_thread() */
+ data->replica = r;
+ data->task = NULL;
+ data->payload = slapi_ch_bvdup(extop_payload);
+ data->rid = rid;
+ data->repl_root = slapi_ch_strdup(repl_root);
+ /*
+ * Stop the cleaning, and delete the rid
+ */
+ maxcsn = replica_get_cleanruv_maxcsn(r, rid);
+ delete_cleaned_rid(r, rid, maxcsn);
+ csn_free(&maxcsn);
+ add_aborted_rid(rid, r, repl_root);
+ stop_ruv_cleaning();
+ /*
+ * Send out the extended ops to the replicas
+ */
+ thread = PR_CreateThread(PR_USER_THREAD, replica_abort_task_thread,
+ (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
+ if (thread == NULL) {
+ if(mtnode_ext->replica){
+ object_release(mtnode_ext->replica);
}
- } else if (rc == 0){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: Successfully Finished.\n");
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanALLRUV_extop: failed to clean rid (%d), error (%d)\n",rid, rc);
+ slapi_log_error( SLAPI_LOG_REPL, repl_plugin_name, "Abort cleanAllRUV task: unable to create abort "
+ "thread. Aborting task.\n");
+ rc = LDAP_OPERATIONS_ERROR;
}
- if (mtnode_ext->replica)
- object_release (mtnode_ext->replica);
+out:
+ slapi_ch_free_string(&payload);
return rc;
}
-
/*
- * Process the REPL_RELEASERUV_OID extended operation
+ * Process the REPL_CLEANRUV_OID extended operation.
*
- * Once, all the replicas in the replication farm have been cleaned, then
- * we need to "release" the cleaned_rid, or else we will reject all updates
- * that come from that rid until we restart the server.
+ * The payload consists of the replica ID, repl root dn, and the maxcsn. Since this is
+ * basically a replication operation, it could of originated here and bounced
+ * back from another master. So check the rid against the "cleaned_rid". If
+ * it's a match, then we were already here, and we can just return success.
*
- * We set the cleaned_ruv to zero(invalid rid), and then fire off extended
- * operations to all of the replicas
+ * Otherwise, we the set the cleaned_rid from the payload, fire off extended ops
+ * to all the replica agreements on this replica. Then perform the actual
+ * cleanruv_task on this replica.
*/
int
-multimaster_extop_releaseruv(Slapi_PBlock *pb){
+multimaster_extop_cleanruv(Slapi_PBlock *pb)
+{
multimaster_mtnode_extension *mtnode_ext;
- Repl_Connection *conn;
- const Slapi_DN *dn;
+ PRThread *thread = NULL;
Replica *r = NULL;
- Object *agmt_obj;
- Repl_Agmt *agmt;
- ConnResult crc;
- struct berval *extop_value;
- char *payload = NULL;
+ cleanruv_data *data = NULL;
+ CSN *maxcsn;
+ struct berval *extop_payload;
+ struct berval *resp_bval = NULL;
+ BerElement *resp_bere = NULL;
char *extop_oid;
char *repl_root;
+ char *payload = NULL;
+ char *csnstr = NULL;
char *iter;
- int send_msgid = 0;
+ int release_it = 0;
int rid = 0;
int rc = 0;
slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
- slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_value);
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
- if (NULL == extop_oid || strcmp(extop_oid, REPL_RELEASERUV_OID) != 0 ||
- NULL == extop_value || NULL == extop_value->bv_val){
+ if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_OID) != 0 ||
+ NULL == extop_payload || NULL == extop_payload->bv_val){
/* something is wrong, error out */
- return -1;
+ rc = -1;
+ goto free_and_return;
}
-
- if(decode_cleanruv_payload(extop_value, &payload)){
- slapi_log_error(SLAPI_LOG_FATAL,repl_plugin_name, "releaseRUV_extop: failed to decode payload, aborting ext op.\n");
- return -1;
+ /*
+ * Decode the payload
+ */
+ if(decode_cleanruv_payload(extop_payload, &payload)){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to decode payload. Aborting ext op\n");
+ rc = -1;
+ goto free_and_return;
}
rid = atoi(ldap_utf8strtok_r(payload, ":", &iter));
repl_root = ldap_utf8strtok_r(iter, ":", &iter);
-
+ csnstr = ldap_utf8strtok_r(iter, ":", &iter);
+ maxcsn = csn_new();
+ csn_init_by_string(maxcsn, csnstr);
/*
- * If we already released this ruv, just return.
+ * If we already cleaned this server, just return success
*/
- if(is_released_rid(rid) || is_already_released_rid()){
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "cleanAllRUV_extop: rid (%d) has already been released, skipping.\n",rid);
- return 0;
+ if(is_cleaned_rid(rid)){
+ csn_free(&maxcsn);
+ rc = 1;
+ goto free_and_return;
} else {
- /* set the released rid, and trigger trimming */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: releasing rid (%d)...\n", rid);
- set_released_rid((int)rid);
- trigger_cl_trimming();
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: cleaning rid (%d)...\n", rid);
}
+ /*
+ * Get the node, so we can get the replica and its agreements
+ */
if((mtnode_ext = replica_config_get_mtnode_by_dn(repl_root)) == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_extop: failed to get node "
- "from replication root dn(%s), aborting operation.\n", repl_root);
- return -1;
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to get replication node "
+ "from (%s), aborting operation\n", repl_root);
+ rc = -1;
+ goto free_and_return;
}
- if (mtnode_ext->replica)
+
+ if (mtnode_ext->replica){
object_acquire (mtnode_ext->replica);
+ release_it = 1;
+ }
if (mtnode_ext->replica == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_extop: replica is missing from (%s), "
- "aborting operation.\n", repl_root);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica is missing from (%s), "
+ "aborting operation\n",repl_root);
rc = LDAP_OPERATIONS_ERROR;
goto free_and_return;
}
+
r = (Replica*)object_get_data (mtnode_ext->replica);
- /*
- * Loop over the agreements, and send out extended ops
- */
- agmt_obj = agmtlist_get_first_agreement_for_replica (r);
- while (agmt_obj)
- {
- agmt = (Repl_Agmt*)object_get_data (agmt_obj);
- if(!agmt_is_enabled(agmt)){
- agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
- continue;
+ if(r == NULL){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica is NULL, aborting task\n");
+ rc = -1;
+ goto free_and_return;
+ }
+
+ if(replica_get_type(r) != REPLICA_TYPE_READONLY){
+ /*
+ * Launch the cleanruv monitoring thread. Once all the replicas are cleaned it will release the rid
+ *
+ * This will also release mtnode_ext->replica
+ */
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: launching cleanAllRUV thread...\n");
+ data = (cleanruv_data*)slapi_ch_calloc(1, sizeof(cleanruv_data));
+ if (data == NULL) {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: failed to allocate "
+ "cleanruv_Data\n");
+ rc = -1;
+ goto free_and_return;
}
- dn = agmt_get_dn_byref(agmt);
- conn = (Repl_Connection *)agmt_get_connection(agmt);
- if(conn == NULL){
- /* no connection for this agreement, log error, and move on */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: the replica (%s), is "
- "missing the connection. This replica will not be released.\n", slapi_sdn_get_dn(dn));
- agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
- continue;
+ data->repl_obj = mtnode_ext->replica;
+ data->replica = r;
+ data->rid = rid;
+ data->task = NULL;
+ data->maxcsn = maxcsn;
+ data->payload = slapi_ch_bvdup(extop_payload);
+
+ thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_thread_ext,
+ (void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+ PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
+ if (thread == NULL) {
+ rc = -1;
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: unable to create cleanAllRUV "
+ "monitoring thread. Aborting task.\n");
}
- crc = conn_connect(conn);
- if (CONN_OPERATION_FAILED == crc ){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_extop: failed to connect "
- "to repl agreement connection (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_TRANSIENT_ERROR);
- rc = LDAP_OPERATIONS_ERROR;
- } else if (CONN_SSL_NOT_ENABLED == crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "releaseRUV_extop: failed to acquire "
- "repl agmt connection (%s), error %d\n",slapi_sdn_get_dn(dn), ACQUIRE_FATAL_ERROR);
- rc = LDAP_OPERATIONS_ERROR;
- } else {
- conn_cancel_linger(conn);
- crc = conn_send_extended_operation(conn, REPL_RELEASERUV_OID, extop_value, NULL, &send_msgid);
- if (CONN_OPERATION_SUCCESS != crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: failed to send "
- "releaseRUV extended op to repl agmt (%s), error %d\n", slapi_sdn_get_dn(dn), crc);
- rc = LDAP_OPERATIONS_ERROR;
+ } else { /* this is a read-only consumer */
+ /*
+ * wait for the maxcsn to be covered
+ */
+ Object *ruv_obj;
+ const RUV *ruv;
+
+ ruv_obj = replica_get_ruv(r);
+ ruv = object_get_data (ruv_obj);
+
+ while(!is_task_aborted(rid) && !slapi_is_shutting_down()){
+ if(!ruv_contains_replica(ruv, rid)){
+ /* we've already been cleaned */
+ break;
+ }
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: checking if we're caught up...\n");
+ if(ruv_covers_csn(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
+ /* We are caught up */
+ break;
} else {
- /* success */
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: successfully sent "
- "releaseRUV extended op to (%s)\n",slapi_sdn_get_dn(dn) );
- rc = 0;
+ char csnstr[CSN_STRSIZE];
+ csn_as_string(maxcsn, PR_FALSE, csnstr);
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: not ruv caught up maxcsn(%s)\n", csnstr);
}
- conn_start_linger(conn);
- }
- if(crc){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: replica (%s) has not "
- "been released. You will need to rerun the task.\n",
- slapi_sdn_get_dn(dn) );
+ DS_Sleep(PR_SecondsToInterval(5));
}
- agmt_obj = agmtlist_get_next_agreement_for_replica (r, agmt_obj);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: we're caught up...\n");
+ /*
+ * Set cleaned rid in memory only - does not survive a server restart
+ */
+ set_cleaned_rid(rid);
+ /*
+ * Clean the ruv
+ */
+ replica_execute_cleanruv_task_ext(mtnode_ext->replica, rid);
+
+ /* free everything */
+ object_release(ruv_obj);
+ csn_free(&maxcsn);
+ if (mtnode_ext->replica && release_it)
+ object_release (mtnode_ext->replica);
+ /*
+ * This read-only replica has no easy way to tell when it's safe to release the rid.
+ * So we won't release it, not until a server restart.
+ */
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: You must restart the server if you want to reuse rid(%d).\n", rid);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: Successfully cleaned rid(%d).\n", rid);
}
free_and_return:
+ if(rc && release_it){
+ if (mtnode_ext->replica)
+ object_release (mtnode_ext->replica);
+ }
+ slapi_ch_free_string(&payload);
+
/*
- * Set the rid as "ALREADY_RELEASED, and remove the cleaned ruv
+ * Craft a message so we know this replica supports the task
*/
- if(rc == 0){
- set_released_rid(ALREADY_RELEASED);
- delete_cleaned_rid();
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: Successfully released rid (%d)\n", rid);
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_extop: Failed to release rid(%d), error (%d), "
- "please retry the task.\n",rid, rc);
- }
+ if ((resp_bere = der_alloc())){
- if(mtnode_ext->replica)
- object_release (mtnode_ext->replica);
+ ber_int_t response = 1;
+
+ ber_printf(resp_bere, "{e}", response);
+ ber_flatten(resp_bere, &resp_bval);
+ slapi_pblock_set(pb, SLAPI_EXT_OP_RET_VALUE, resp_bval);
+ slapi_send_ldap_result(pb, LDAP_SUCCESS, NULL, NULL, 0, NULL);
+ /* resp_bere */
+ if (NULL != resp_bere)
+ {
+ ber_free(resp_bere, 1);
+ }
+ /* resp_bval */
+ if (NULL != resp_bval)
+ {
+ ber_bvfree(resp_bval);
+ }
+ }
return rc;
}
diff --git a/ldap/servers/plugins/replication/repl_globals.c b/ldap/servers/plugins/replication/repl_globals.c
index 9445394..383d562 100644
--- a/ldap/servers/plugins/replication/repl_globals.c
+++ b/ldap/servers/plugins/replication/repl_globals.c
@@ -110,6 +110,8 @@ const char *type_replicaChangeCount = "nsds5ReplicaChangeCount";
const char *type_replicaTombstonePurgeInterval = "nsds5ReplicaTombstonePurgeInterval";
const char *type_replicaLegacyConsumer = "nsds5ReplicaLegacyConsumer";
const char *type_ruvElementUpdatetime = "nsruvReplicaLastModified";
+const char *type_replicaCleanRUV = "nsds5ReplicaCleanRUV";
+const char *type_replicaAbortCleanRUV = "nsds5ReplicaAbortCleanRUV";
/* Attribute names for replication agreement attributes */
const char *type_nsds5ReplicaHost = "nsds5ReplicaHost";
@@ -128,6 +130,7 @@ const char *type_nsds5ReplicaBusyWaitTime = "nsds5ReplicaBusyWaitTime";
const char *type_nsds5ReplicaSessionPauseTime = "nsds5ReplicaSessionPauseTime";
const char *type_nsds5ReplicaEnabled = "nsds5ReplicaEnabled";
const char *type_nsds5ReplicaStripAttrs = "nsds5ReplicaStripAttrs";
+const char *type_nsds5ReplicaCleanRUVnotified = "nsds5ReplicaCleanRUVNotified";
/* windows sync specific attributes */
const char *type_nsds7WindowsReplicaArea = "nsds7WindowsReplicaSubtree";
@@ -139,7 +142,7 @@ const char *type_nsds7DirsyncCookie = "nsds7DirsyncCookie";
const char *type_winSyncInterval = "winSyncInterval";
const char *type_oneWaySync = "oneWaySync";
-/* To Allow Consumer Initialisation when adding an agreement - */
+/* To Allow Consumer Initialization when adding an agreement - */
const char *type_nsds5BeginReplicaRefresh = "nsds5BeginReplicaRefresh";
static int repl_active_threads;
diff --git a/ldap/servers/slapd/log.c b/ldap/servers/slapd/log.c
index 2ffd1f6..e622485 100644
--- a/ldap/servers/slapd/log.c
+++ b/ldap/servers/slapd/log.c
@@ -1969,6 +1969,33 @@ slapi_log_error( int severity, char *subsystem, char *fmt, ... )
}
int
+slapi_log_error_ext(int severity, char *subsystem, char *fmt, va_list varg1, va_list varg2)
+{
+ int rc = 0;
+
+ if ( severity < SLAPI_LOG_MIN || severity > SLAPI_LOG_MAX ) {
+ (void)slapd_log_error_proc( subsystem, "slapi_log_error: invalid severity %d (message %s)\n",
+ severity, fmt );
+ return( -1 );
+ }
+
+ if (
+ #ifdef _WIN32
+ *module_ldap_debug
+ #else
+ slapd_ldap_debug
+ #endif
+ & slapi_log_map[ severity ] )
+ {
+ rc = slapd_log_error_proc_internal( subsystem, fmt, varg1, varg2 );
+ } else {
+ rc = 0; /* nothing to be logged --> always return success */
+ }
+
+ return( rc );
+}
+
+int
slapi_is_loglevel_set ( const int loglevel )
{
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index 3fd8aed..c16800f 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -5636,6 +5636,7 @@ int slapi_log_error( int severity, char *subsystem, char *fmt, ... )
#else
;
#endif
+int slapi_log_error_ext( int severity, char *subsystem, char *fmt, va_list varg1, va_list varg2);
/* allowed values for the "severity" parameter */
#define SLAPI_LOG_FATAL 0
@@ -6146,6 +6147,8 @@ void slapi_task_log_notice(Slapi_Task *task, char *format, ...)
#else
;
#endif
+void slapi_task_log_status_ext(Slapi_Task *task, char *format, va_list varg);
+void slapi_task_log_notice_ext(Slapi_Task *task, char *format, va_list varg);
/*
* slapi_new_task: create new task, fill in DN, and setup modify callback
diff --git a/ldap/servers/slapd/task.c b/ldap/servers/slapd/task.c
index 6d60775..5fc0b08 100644
--- a/ldap/servers/slapd/task.c
+++ b/ldap/servers/slapd/task.c
@@ -215,6 +215,17 @@ void slapi_task_log_status(Slapi_Task *task, char *format, ...)
slapi_task_status_changed(task);
}
+void slapi_task_log_status_ext(Slapi_Task *task, char *format, va_list ap)
+{
+ if (! task->task_status)
+ task->task_status = (char *)slapi_ch_malloc(10 * LOG_BUFFER);
+ if (! task->task_status)
+ return; /* out of memory? */
+
+ PR_vsnprintf(task->task_status, (10 * LOG_BUFFER), format, ap);
+ slapi_task_status_changed(task);
+}
+
/* this adds a line to the 'nsTaskLog' value, which is cumulative (anything
* logged here is added to the end)
*/
@@ -266,6 +277,51 @@ void slapi_task_log_notice(Slapi_Task *task, char *format, ...)
slapi_task_status_changed(task);
}
+void slapi_task_log_notice_ext(Slapi_Task *task, char *format, va_list ap)
+{
+ char buffer[LOG_BUFFER];
+ size_t len;
+
+ PR_vsnprintf(buffer, LOG_BUFFER, format, ap);
+
+ if (task->task_log_lock) {
+ PR_Lock(task->task_log_lock);
+ }
+ len = 2 + strlen(buffer) + (task->task_log ? strlen(task->task_log) : 0);
+ if ((len > MAX_SCROLLBACK_BUFFER) && task->task_log) {
+ size_t i;
+ char *newbuf;
+
+ /* start from middle of buffer, and find next linefeed */
+ i = strlen(task->task_log)/2;
+ while (task->task_log[i] && (task->task_log[i] != '\n'))
+ i++;
+ if (task->task_log[i])
+ i++;
+ len = strlen(task->task_log) - i + 2 + strlen(buffer);
+ newbuf = (char *)slapi_ch_malloc(len);
+ strcpy(newbuf, task->task_log + i);
+ slapi_ch_free((void **)&task->task_log);
+ task->task_log = newbuf;
+ } else {
+ if (! task->task_log) {
+ task->task_log = (char *)slapi_ch_malloc(len);
+ task->task_log[0] = 0;
+ } else {
+ task->task_log = (char *)slapi_ch_realloc(task->task_log, len);
+ }
+ }
+
+ if (task->task_log[0])
+ strcat(task->task_log, "\n");
+ strcat(task->task_log, buffer);
+ if (task->task_log_lock) {
+ PR_Unlock(task->task_log_lock);
+ }
+
+ slapi_task_status_changed(task);
+}
+
/* update attributes in the entry under "cn=tasks" to match the current
* status of the task. */
void slapi_task_status_changed(Slapi_Task *task)
1
0
ldap/servers/plugins/replication/repl5.h | 1
ldap/servers/plugins/replication/repl5_agmt.c | 24 ++++++++++++++++++++++
ldap/servers/plugins/replication/repl5_agmtlist.c | 9 ++++++++
3 files changed, 34 insertions(+)
New commits:
commit e86013506df7f3da280d67be2b3bd9ab24b241bf
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Aug 1 15:45:21 2012 -0400
Ticket 413 - "Server is unwilling to perform" when running ldapmodify on nsds5ReplicaStripAttrs
Bug Description: trying to set nsds5ReplicaStripAttrs yields an error 53
Fix Description: Needed to check for this new attribute when in the agmtlist modify
callback. When it doesn't recognize the attribute it returns error 53.
https://fedorahosted.org/389/ticket/413
Reviewed by: Richm(Thanks!)
diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h
index b04d9c4..d7ba6a6 100644
--- a/ldap/servers/plugins/replication/repl5.h
+++ b/ldap/servers/plugins/replication/repl5.h
@@ -358,6 +358,7 @@ int agmt_has_protocol(Repl_Agmt *agmt);
PRBool agmt_is_enabled(Repl_Agmt *ra);
int agmt_set_enabled_from_entry(Repl_Agmt *ra, Slapi_Entry *e);
char **agmt_get_attrs_to_strip(Repl_Agmt *ra);
+int agmt_set_attrs_to_strip(Repl_Agmt *ra, Slapi_Entry *e);
typedef struct replica Replica;
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index 4beb13a..2978aba 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -2547,3 +2547,27 @@ agmt_get_attrs_to_strip(Repl_Agmt *ra)
return NULL;
}
}
+
+int
+agmt_set_attrs_to_strip(Repl_Agmt *ra, Slapi_Entry *e)
+{
+ char *tmpstr = NULL;
+
+ PR_Lock(ra->lock);
+
+ tmpstr = slapi_entry_attr_get_charptr(e, type_nsds5ReplicaStripAttrs);
+ if (NULL != tmpstr){
+ if(ra->attrs_to_strip){
+ slapi_ch_array_free(&ra->attrs_to_strip);
+ }
+ ra->attrs_to_strip = slapi_str2charray_ext(tmpstr, " ", 0);
+ PR_Unlock(ra->lock);
+ prot_notify_agmt_changed(ra->protocol, ra->long_name);
+ slapi_ch_free_string(&tmpstr);
+ return 0;
+ }
+
+ PR_Unlock(ra->lock);
+
+ return -1;
+}
diff --git a/ldap/servers/plugins/replication/repl5_agmtlist.c b/ldap/servers/plugins/replication/repl5_agmtlist.c
index 1c18a85..86f06bf 100644
--- a/ldap/servers/plugins/replication/repl5_agmtlist.c
+++ b/ldap/servers/plugins/replication/repl5_agmtlist.c
@@ -499,6 +499,15 @@ agmtlist_modify_callback(Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry
rc = SLAPI_DSE_CALLBACK_ERROR;
}
}
+ else if (slapi_attr_types_equivalent(mods[i]->mod_type, type_nsds5ReplicaStripAttrs))
+ {
+ if(agmt_set_attrs_to_strip(agmt, e) != 0){
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: "
+ "failed to set replica agmt attributes to strip for %s\n",agmt_get_long_name(agmt));
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ }
+ }
else if (0 == windows_handle_modify_agreement(agmt, mods[i]->mod_type, e))
{
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: "
1
0
ldap/servers/plugins/acl/acllas.c | 17
ldap/servers/plugins/memberof/memberof.c | 24 -
ldap/servers/plugins/referint/referint.c | 5
ldap/servers/plugins/replication/urp.c | 3
ldap/servers/plugins/replication/windows_protocol_util.c | 90 ++--
ldap/servers/slapd/attr.c | 58 +--
ldap/servers/slapd/filter.c | 51 +-
ldap/servers/slapd/ldaputil.c | 145 +++----
ldap/servers/slapd/libslapd.def | 4
ldap/servers/slapd/main.c | 8
ldap/servers/slapd/mapping_tree.c | 14
ldap/servers/slapd/plugin.c | 2
ldap/servers/slapd/slapi-plugin.h | 15
ldap/servers/slapd/slapi-private.h | 1
ldap/servers/slapd/util.c | 278 ++++++++++++++-
15 files changed, 500 insertions(+), 215 deletions(-)
New commits:
commit 3cf9a521fa43183c657a5dca507dec3a4379e383
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Aug 1 12:40:31 2012 -0400
Ticket 328 - make sure all internal search filters are properly escaped
Bug Description: Not all internal search fitlers are properly escaped.
Fix Description: Created a new sprintf type function, and a filter value escape function.
The sprintf function(slapi_filter_sprintf) varies from sprintf as you pass
a description argument before the value you want to escape/normalize:
ESC_NEXT_VAL - escape the next argument
NORM_NEXT_VAL - normalize the next argument
ESC_AND_NORM_NEXT_VAL - escape and normalize the next argument
In order to correctly normalize the value, the function also parses out the attribute
so we can get the syntax plugin normalization function.
As a side effect you must add an additional string format character for the description
arg(%s):
sprintf(buf,"cn=%s", value);
escaped_val = slapi_filter_sprintf("cn=%s%s", ESC_NEXT_VAL, value);
Also did some code cleanup.
https://fedorahosted.org/389/ticket/328
reviewed by: Noriko(Thanks!)
diff --git a/ldap/servers/plugins/acl/acllas.c b/ldap/servers/plugins/acl/acllas.c
index cc556c4..5bcb482 100644
--- a/ldap/servers/plugins/acl/acllas.c
+++ b/ldap/servers/plugins/acl/acllas.c
@@ -2896,7 +2896,6 @@ acllas__eval_memberGroupDnAttr (char *attrName, Slapi_Entry *e,
** client is a member of.
*/
if (enumerate_groups) {
- char filter_str[BUFSIZ];
char *attrs[3];
struct eval_info info = {0};
char *curMemberDn;
@@ -2934,23 +2933,15 @@ acllas__eval_memberGroupDnAttr (char *attrName, Slapi_Entry *e,
curMemberDn = n_clientdn;
while (!Done) {
- char *filter_str_ptr = &filter_str[0];
- char *new_filter_str = NULL;
- int lenf = strlen(curMemberDn)<<1;
-
- if (lenf > (BUFSIZ - 28)) { /* 28 for "(|(uniquemember=%s)(member=%s))" */
- new_filter_str = slapi_ch_malloc(lenf + 28);
- filter_str_ptr = new_filter_str;
- }
+ char *filter_str_ptr;
/*
** Search the db for groups that the client is a member of.
** Once found cache it. cache only unique groups.
*/
tt = info.lu_idx;
- sprintf (filter_str_ptr,"(|(uniquemember=%s)(member=%s))",
- curMemberDn, curMemberDn);
-
+ filter_str_ptr = slapi_filter_sprintf("(|(uniquemember=%s%s)(member=%s%s))",
+ ESC_AND_NORM_NEXT_VAL, curMemberDn, ESC_AND_NORM_NEXT_VAL ,curMemberDn);
/* Use new search internal API */
{
Slapi_PBlock *aPb = slapi_pblock_new ();
@@ -2976,7 +2967,7 @@ acllas__eval_memberGroupDnAttr (char *attrName, Slapi_Entry *e,
slapi_pblock_destroy (aPb);
}
- if (new_filter_str) slapi_ch_free((void **) &new_filter_str);
+ slapi_ch_free_string(&filter_str_ptr);
if (tt == info.lu_idx) {
slapi_log_error( SLAPI_LOG_ACL, plugin_name, "currDn:(%s) \n\tNO MEMBER ADDED\n",
diff --git a/ldap/servers/plugins/memberof/memberof.c b/ldap/servers/plugins/memberof/memberof.c
index a2fdbd9..a69dd16 100644
--- a/ldap/servers/plugins/memberof/memberof.c
+++ b/ldap/servers/plugins/memberof/memberof.c
@@ -520,12 +520,14 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, Slapi_DN *sdn,
Slapi_PBlock *search_pb = NULL;
Slapi_DN *base_sdn = NULL;
Slapi_Backend *be = NULL;
+ char *escaped_filter_val;
char *filter_str = NULL;
char *cookie = NULL;
int all_backends = memberof_config_get_all_backends();
int types_name_len = 0;
int num_types = 0;
int dn_len = slapi_sdn_get_ndn_len(sdn);
+ int free_it = 0;
int rc = 0;
int i = 0;
@@ -537,7 +539,15 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, Slapi_DN *sdn,
types_name_len += strlen(types[num_types]);
}
- /* Build the search filter. */
+ /* Escape the dn, and build the search filter. */
+ escaped_filter_val = slapi_escape_filter_value((char *)slapi_sdn_get_dn(sdn), dn_len);
+ if(escaped_filter_val){
+ dn_len = strlen(escaped_filter_val);
+ free_it = 1;
+ } else {
+ escaped_filter_val = (char *)slapi_sdn_get_dn(sdn);
+ }
+
if (num_types > 1)
{
int bytes_out = 0;
@@ -553,7 +563,7 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, Slapi_DN *sdn,
for (i = 0; types[i]; i++)
{
bytes_out += snprintf(filter_str + bytes_out, filter_str_len - bytes_out,
- "(%s=%s)", types[i], slapi_sdn_get_ndn(sdn));
+ "(%s=%s)", types[i], escaped_filter_val);
}
/* Add end of filter. */
@@ -561,10 +571,12 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, Slapi_DN *sdn,
}
else if (num_types == 1)
{
- filter_str =
- slapi_ch_smprintf("(%s=%s)", types[0], slapi_sdn_get_ndn(sdn));
+ filter_str = slapi_ch_smprintf("(%s=%s)", types[0], escaped_filter_val);
}
+ if(free_it)
+ slapi_ch_free_string(&escaped_filter_val);
+
if(filter_str == NULL){
return rc;
}
@@ -1131,12 +1143,12 @@ memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config,
Slapi_PBlock *search_pb = slapi_pblock_new();
Slapi_DN *base_sdn = 0;
Slapi_Backend *be = 0;
- char *filter_str = 0;
+ char *filter_str;
char *cookie = NULL;
int n_entries = 0;
int all_backends = config->allBackends;
- filter_str = slapi_ch_smprintf("(%s=%s)", config->memberof_attr, op_to);
+ filter_str = slapi_filter_sprintf("(%s=%s%s)", config->memberof_attr, ESC_NEXT_VAL, op_to);
be = slapi_get_first_backend(&cookie);
while(be){
/*
diff --git a/ldap/servers/plugins/referint/referint.c b/ldap/servers/plugins/referint/referint.c
index 3342634..0d381fe 100644
--- a/ldap/servers/plugins/referint/referint.c
+++ b/ldap/servers/plugins/referint/referint.c
@@ -684,7 +684,6 @@ update_integrity(char **argv, Slapi_DN *origSDN,
char *attrName = NULL;
char *filter = NULL;
char *attrs[2];
- size_t len = slapi_sdn_get_ndn_len(origSDN);
int search_result;
int nval = 0;
int i, j;
@@ -709,9 +708,7 @@ update_integrity(char **argv, Slapi_DN *origSDN,
search_base = slapi_sdn_get_dn( sdn );
for(i = 3; argv[i] != NULL; i++){
- char buf[BUFSIZ];
- filter = slapi_ch_smprintf("(%s=*%s)", argv[i],
- escape_filter_value(origDN, len, buf));
+ filter = slapi_filter_sprintf("(%s=*%s%s)", argv[i], ESC_NEXT_VAL, origDN);
if ( filter ) {
/* Need only the current attribute and its subtypes */
attrs[0] = argv[i];
diff --git a/ldap/servers/plugins/replication/urp.c b/ldap/servers/plugins/replication/urp.c
index 1d8799a..7608382 100644
--- a/ldap/servers/plugins/replication/urp.c
+++ b/ldap/servers/plugins/replication/urp.c
@@ -1082,7 +1082,8 @@ urp_get_min_naming_conflict_entry ( Slapi_PBlock *pb, char *sessionid, CSN *opcs
slapi_log_error ( SLAPI_LOG_REPL, sessionid,
"Enter urp_get_min_naming_conflict_entry for %s\n", basedn);
- filter = PR_smprintf("(%s=%s %s)", ATTR_NSDS5_REPLCONFLICT, REASON_ANNOTATE_DN, basedn);
+ filter = slapi_filter_sprintf("(%s=%s %s%s)", ATTR_NSDS5_REPLCONFLICT, REASON_ANNOTATE_DN,
+ ESC_NEXT_VAL, basedn);
/* server_ctrls will be freed when newpb is destroyed */
server_ctrls = (LDAPControl **)slapi_ch_calloc (2, sizeof (LDAPControl *));
diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c
index 3970353..fb10fb0 100644
--- a/ldap/servers/plugins/replication/windows_protocol_util.c
+++ b/ldap/servers/plugins/replication/windows_protocol_util.c
@@ -2913,14 +2913,9 @@ find_entry_by_attr_value_remote(const char *attribute, const char *value, Slapi_
char *filter = NULL;
const char *searchbase = NULL;
Slapi_Entry *found_entry = NULL;
- char *filter_escaped_value = NULL;
- size_t vallen = 0;
- vallen = value ? strlen(value) : 0;
- filter_escaped_value = slapi_ch_calloc(sizeof(char), vallen*3+1);
/* should not have to escape attribute names */
- filter = PR_smprintf("(%s=%s)",attribute,escape_filter_value(value, vallen, filter_escaped_value));
- slapi_ch_free_string(&filter_escaped_value);
+ filter = slapi_filter_sprintf("(%s=%s%s)",attribute, ESC_NEXT_VAL, value);
searchbase = slapi_sdn_get_dn(windows_private_get_windows_subtree(prp->agmt));
cres = windows_search_entry(prp->conn, (char*)searchbase, filter, &found_entry);
if (cres)
@@ -2935,7 +2930,7 @@ find_entry_by_attr_value_remote(const char *attribute, const char *value, Slapi_
}
if (filter)
{
- PR_smprintf_free(filter);
+ slapi_ch_free_string(&filter);
filter = NULL;
}
return retval;
@@ -3035,33 +3030,28 @@ find_entry_by_attr_value(const char *attribute, const char *value, Slapi_Entry *
{
Slapi_PBlock *pb = slapi_pblock_new();
Slapi_Entry **entries = NULL, **ep = NULL;
- Slapi_Entry *entry_found = NULL;
+ Slapi_Entry *entry_found = NULL;
+ LDAPControl **server_controls = NULL;
+ const char *subtree_dn = NULL;
+ char *subtree_dn_copy = NULL;
+ char **attrs = NULL;
char *query = NULL;
- int found_or_not = ENTRY_NOTFOUND;
- int rval = 0;
- const char *subtree_dn = NULL;
- int not_unique = 0;
- char *subtree_dn_copy = NULL;
- int scope = LDAP_SCOPE_SUBTREE;
- char **attrs = NULL;
- LDAPControl **server_controls = NULL;
- char *filter_escaped_value = NULL;
- size_t vallen = 0;
+ int found_or_not = ENTRY_NOTFOUND;
+ int scope = LDAP_SCOPE_SUBTREE;
+ int not_unique = 0;
+ int rval = 0;
if (pb == NULL)
goto done;
- vallen = value ? strlen(value) : 0;
- filter_escaped_value = slapi_ch_calloc(sizeof(char), vallen*3+1);
/* should not have to escape attribute names */
- query = slapi_ch_smprintf("(%s=%s)", attribute, escape_filter_value(value, vallen, filter_escaped_value));
- slapi_ch_free_string(&filter_escaped_value);
+ query = slapi_filter_sprintf("(%s=%s%s)", attribute, ESC_NEXT_VAL, value);
if (query == NULL)
- goto done;
+ goto done;
- subtree_dn = slapi_sdn_get_dn(windows_private_get_directory_subtree(ra));
- subtree_dn_copy = slapi_ch_strdup(subtree_dn);
+ subtree_dn = slapi_sdn_get_dn(windows_private_get_directory_subtree(ra));
+ subtree_dn_copy = slapi_ch_strdup(subtree_dn);
winsync_plugin_call_pre_ds_search_entry_cb(ra, NULL, &subtree_dn_copy, &scope, &query,
&attrs, &server_controls);
@@ -3079,35 +3069,35 @@ find_entry_by_attr_value(const char *attribute, const char *value, Slapi_Entry *
slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rval);
if (rval != LDAP_SUCCESS)
- {
- goto done;
- }
+ {
+ goto done;
+ }
slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &entries);
if ((entries == NULL) || (entries[0] == NULL))
- {
- goto done;
- }
- entry_found = entries[0];
- for (ep = entries; *ep; ep++) {
- if (not_unique)
- {
- found_or_not = ENTRY_NOT_UNIQUE;
- }
- not_unique = 1;
- }
+ {
+ goto done;
+ }
+ entry_found = entries[0];
+ for (ep = entries; *ep; ep++) {
+ if (not_unique)
+ {
+ found_or_not = ENTRY_NOT_UNIQUE;
+ }
+ not_unique = 1;
+ }
done:
- if (entry_found && (found_or_not != ENTRY_NOT_UNIQUE))
- {
- found_or_not = 0;
- *e = slapi_entry_dup(entry_found);
- }
- if (pb)
- {
- slapi_free_search_results_internal(pb);
- slapi_pblock_destroy(pb);
- }
- return found_or_not;
+ if (entry_found && (found_or_not != ENTRY_NOT_UNIQUE))
+ {
+ found_or_not = 0;
+ *e = slapi_entry_dup(entry_found);
+ }
+ if (pb)
+ {
+ slapi_free_search_results_internal(pb);
+ slapi_pblock_destroy(pb);
+ }
+ return found_or_not;
}
static int
diff --git a/ldap/servers/slapd/attr.c b/ldap/servers/slapd/attr.c
index 7fb613c..73892bf 100644
--- a/ldap/servers/slapd/attr.c
+++ b/ldap/servers/slapd/attr.c
@@ -574,36 +574,36 @@ slapi_attr_value_cmp( const Slapi_Attr *a, const struct berval *v1, const struct
int
slapi_attr_value_cmp_ext(const Slapi_Attr *a, Slapi_Value *v1, Slapi_Value *v2)
{
- int retVal;
- const struct berval *bv2 = slapi_value_get_berval(v2);
-
- if ( a->a_flags & SLAPI_ATTR_FLAG_CMP_BITBYBIT )
- {
- const struct berval *bv1 = slapi_value_get_berval(v1);
- return slapi_attr_value_cmp(a, bv1, bv2);
- }
- else
- {
- Slapi_Attr a2;
- struct ava ava;
- Slapi_Value *cvals[2];
- unsigned long v2_flags = v2->v_flags;
-
- a2 = *a;
- cvals[0] = v1;
- cvals[1] = NULL;
- a2.a_present_values.va = cvals; /* JCM - PUKE */
+ int retVal;
+ const struct berval *bv2 = slapi_value_get_berval(v2);
- ava.ava_type = a->a_type;
- ava.ava_value = *bv2;
- if (v2_flags) {
- ava.ava_private = &v2_flags;
- } else {
- ava.ava_private = NULL;
- }
- retVal = plugin_call_syntax_filter_ava(&a2, LDAP_FILTER_EQUALITY, &ava);
- }
- return retVal;
+ if ( a->a_flags & SLAPI_ATTR_FLAG_CMP_BITBYBIT )
+ {
+ const struct berval *bv1 = slapi_value_get_berval(v1);
+ return slapi_attr_value_cmp(a, bv1, bv2);
+ }
+ else
+ {
+ Slapi_Attr a2;
+ struct ava ava;
+ Slapi_Value *cvals[2];
+ unsigned long v2_flags = v2->v_flags;
+
+ a2 = *a;
+ cvals[0] = v1;
+ cvals[1] = NULL;
+ a2.a_present_values.va = cvals; /* JCM - PUKE */
+
+ ava.ava_type = a->a_type;
+ ava.ava_value = *bv2;
+ if (v2_flags) {
+ ava.ava_private = &v2_flags;
+ } else {
+ ava.ava_private = NULL;
+ }
+ retVal = plugin_call_syntax_filter_ava(&a2, LDAP_FILTER_EQUALITY, &ava);
+ }
+ return retVal;
}
/*
diff --git a/ldap/servers/slapd/filter.c b/ldap/servers/slapd/filter.c
index ae87e5c..65e9de4 100644
--- a/ldap/servers/slapd/filter.c
+++ b/ldap/servers/slapd/filter.c
@@ -124,11 +124,11 @@ get_filter( Connection *conn, BerElement *ber, int scope,
}
-#define FILTER_EQ_FMT "(%s=%s)"
-#define FILTER_GE_FMT "(%s>=%s)"
-#define FILTER_LE_FMT "(%s<=%s)"
-#define FILTER_APROX_FMT "(%s~=%s)"
-#define FILTER_EXTENDED_FMT "(%s%s%s%s:=%s)"
+#define FILTER_EQ_FMT "(%s=%s%s)"
+#define FILTER_GE_FMT "(%s>=%s%s)"
+#define FILTER_LE_FMT "(%s<=%s%s)"
+#define FILTER_APROX_FMT "(%s~=%s%s)"
+#define FILTER_EXTENDED_FMT "(%s%s%s%s:=%s%s)"
#define FILTER_EQ_LEN 4
#define FILTER_GE_LEN 5
#define FILTER_LE_LEN 5
@@ -140,16 +140,14 @@ get_filter( Connection *conn, BerElement *ber, int scope,
static char *
filter_escape_filter_value_extended(struct slapi_filter *f)
{
- char ebuf[BUFSIZ], *ptr;
- const char *estr;
+ char *ptr;
- estr = escape_filter_value( f->f_mr_value.bv_val, f->f_mr_value.bv_len, ebuf );
- ptr = slapi_ch_smprintf(FILTER_EXTENDED_FMT,
+ ptr = slapi_filter_sprintf(FILTER_EXTENDED_FMT,
f->f_mr_type ? f->f_mr_type : "",
f->f_mr_dnAttrs ? ":dn" : "",
f->f_mr_oid ? ":" : "",
f->f_mr_oid ? f->f_mr_oid : "",
- estr );
+ ESC_NEXT_VAL, f->f_mr_value.bv_val);
return ptr;
}
@@ -158,12 +156,11 @@ filter_escape_filter_value_extended(struct slapi_filter *f)
static char *
filter_escape_filter_value(struct slapi_filter *f, const char *fmt, size_t len)
{
- char ebuf[BUFSIZ], *ptr;
- const char *estr;
+ char *ptr;
+
+ filter_compute_hash(f);
+ ptr = slapi_filter_sprintf(fmt, f->f_avtype, ESC_NEXT_VAL, f->f_avvalue.bv_val );
- estr = escape_filter_value( f->f_avvalue.bv_val, f->f_avvalue.bv_len, ebuf );
- filter_compute_hash(f);
- ptr = slapi_ch_smprintf(fmt, f->f_avtype, estr );
return ptr;
}
@@ -474,8 +471,7 @@ get_substring_filter(
{
ber_tag_t tag, rc;
ber_len_t len = -1;
- char *val, *last, *type = NULL;
- char ebuf[BUFSIZ];
+ char *val, *eval, *last, *type = NULL;
LDAPDebug( LDAP_DEBUG_FILTER, "=> get_substring_filter\n", 0, 0, 0 );
@@ -516,8 +512,11 @@ get_substring_filter(
return( LDAP_PROTOCOL_ERROR );
}
f->f_sub_initial = val;
- /* jcm: Had to cast away a const */
- val = (char*)escape_filter_value( val, -1, ebuf );
+ eval = (char*)slapi_escape_filter_value( val, -1);
+ if(eval){
+ slapi_ch_free_string(&val);
+ val = eval;
+ }
*fstr = slapi_ch_realloc( *fstr, strlen( *fstr ) +
strlen( val ) + 1 );
strcat( *fstr, val );
@@ -526,8 +525,11 @@ get_substring_filter(
case LDAP_SUBSTRING_ANY:
LDAPDebug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );
charray_add( &f->f_sub_any, val );
- /* jcm: Had to cast away a const */
- val = (char*)escape_filter_value( val, -1, ebuf );
+ eval = (char*)slapi_escape_filter_value( val, -1);
+ if(eval){
+ slapi_ch_free_string(&val);
+ val = eval;
+ }
*fstr = slapi_ch_realloc( *fstr, strlen( *fstr ) +
strlen( val ) + 2 );
strcat( *fstr, "*" );
@@ -540,8 +542,11 @@ get_substring_filter(
return( LDAP_PROTOCOL_ERROR );
}
f->f_sub_final = val;
- /* jcm: Had to cast away a const */
- val = (char*)escape_filter_value( val, -1, ebuf );
+ eval = (char*)slapi_escape_filter_value( val, -1);
+ if(eval){
+ slapi_ch_free_string(&val);
+ val = eval;
+ }
*fstr = slapi_ch_realloc( *fstr, strlen( *fstr ) +
strlen( val ) + 2 );
strcat( *fstr, "*" );
diff --git a/ldap/servers/slapd/ldaputil.c b/ldap/servers/slapd/ldaputil.c
index aaca1af..7d77644 100644
--- a/ldap/servers/slapd/ldaputil.c
+++ b/ldap/servers/slapd/ldaputil.c
@@ -304,53 +304,56 @@ slapi_ldap_url_parse(const char *url, LDAPURLDesc **ludpp, int require_dn, int *
replace all but the last colon with %3A
Go to the 3rd '/' or to the end of the string (convert only the host:port part) */
if (url) {
- char *p = strstr(url, "://");
- if (p) {
- int foundspace = 0;
- int coloncount = 0;
- char *lastcolon = NULL;
- p += 3;
- for (; *p && (*p != '/'); p++) {
- if (*p == ' ') {
- foundspace = 1;
- }
- if (*p == ':') {
- coloncount++;
- lastcolon = p;
- }
- }
- if (foundspace) {
- char *src = NULL, *dest = NULL;
- /* have to convert url */
- /* len * 3 is way too much, but acceptable */
- urlescaped = slapi_ch_calloc(strlen(url) * 3, sizeof(char));
- dest = urlescaped;
- /* copy the scheme */
- src = strstr(url, "://");
- src += 3;
- memcpy(dest, url, src-url);
- dest += (src-url);
- /* we have to convert all spaces to %20 - we have to convert
- all colons except the last one to %3A */
- for (; *src; ++src) {
- if (src < p) {
- if (*src == ' ') {
- memcpy(dest, "%20", 3);
- dest += 3;
- } else if ((coloncount > 1) && (*src == ':') && (src != lastcolon)) {
- memcpy(dest, "%3A", 3);
- dest += 3;
- } else {
- *dest++ = *src;
- }
- } else {
- *dest++ = *src;
- }
- }
- *dest = '\0';
- url_to_use = urlescaped;
- }
- }
+ char *p = strstr(url, "://");
+ if (p) {
+ int foundspace = 0;
+ int coloncount = 0;
+ char *lastcolon = NULL;
+
+ p += 3;
+ for (; *p && (*p != '/'); p++) {
+ if (*p == ' ') {
+ foundspace = 1;
+ }
+ if (*p == ':') {
+ coloncount++;
+ lastcolon = p;
+ }
+ }
+ if (foundspace) {
+ char *src = NULL, *dest = NULL;
+
+ /* have to convert url, len * 3 is way too much, but acceptable */
+ urlescaped = slapi_ch_calloc(strlen(url) * 3, sizeof(char));
+ dest = urlescaped;
+ /* copy the scheme */
+ src = strstr(url, "://");
+ src += 3;
+ memcpy(dest, url, src-url);
+ dest += (src-url);
+ /*
+ * we have to convert all spaces to %20 - we have to convert
+ * all colons except the last one to %3A
+ */
+ for (; *src; ++src) {
+ if (src < p) {
+ if (*src == ' ') {
+ memcpy(dest, "%20", 3);
+ dest += 3;
+ } else if ((coloncount > 1) && (*src == ':') && (src != lastcolon)) {
+ memcpy(dest, "%3A", 3);
+ dest += 3;
+ } else {
+ *dest++ = *src;
+ }
+ } else {
+ *dest++ = *src;
+ }
+ }
+ *dest = '\0';
+ url_to_use = urlescaped;
+ }
+ }
}
#endif
@@ -388,30 +391,30 @@ slapi_ldap_url_parse(const char *url, LDAPURLDesc **ludpp, int require_dn, int *
#if defined(USE_OPENLDAP)
if (urlescaped && (*ludpp) && (*ludpp)->lud_host) {
- /* have to unescape lud_host - can unescape in place */
- char *p = strstr((*ludpp)->lud_host, "://");
- if (p) {
- char *dest = NULL;
- p += 3;
- dest = p;
- /* up to the first '/', unescape the host */
- for (; *p && (*p != '/'); p++) {
- if (!strncmp(p, "%20", 3)) {
- *dest++ = ' ';
- p += 2;
- } else if (!strncmp(p, "%3A", 3)) {
- *dest++ = ':';
- p += 2;
- } else {
- *dest++ = *p;
- }
- }
- /* just copy the remainder of the host, if any */
- while (*p) {
- *dest++ = *p++;
- }
- *dest = '\0';
- }
+ /* have to unescape lud_host - can unescape in place */
+ char *p = strstr((*ludpp)->lud_host, "://");
+ if (p) {
+ char *dest = NULL;
+ p += 3;
+ dest = p;
+ /* up to the first '/', unescape the host */
+ for (; *p && (*p != '/'); p++) {
+ if (!strncmp(p, "%20", 3)) {
+ *dest++ = ' ';
+ p += 2;
+ } else if (!strncmp(p, "%3A", 3)) {
+ *dest++ = ':';
+ p += 2;
+ } else {
+ *dest++ = *p;
+ }
+ }
+ /* just copy the remainder of the host, if any */
+ while (*p) {
+ *dest++ = *p++;
+ }
+ *dest = '\0';
+ }
}
slapi_ch_free_string(&urlescaped);
#endif
diff --git a/ldap/servers/slapd/libslapd.def b/ldap/servers/slapd/libslapd.def
index c5fd242..70a2993 100644
--- a/ldap/servers/slapd/libslapd.def
+++ b/ldap/servers/slapd/libslapd.def
@@ -1097,8 +1097,8 @@ EXPORTS
slapi_mtn_get_dn @1098
dl_add_index @1099
dl_replace @1100
- send_referrals_from_entry @1101
- escape_filter_value @1102
+ send_referrals_from_entry @1101
+ slapi_escape_filter_value @1102
slapd_pk11_destroyContext @1103
secoid_destroyAlgorithmID @1104
op_shared_is_allowed_attr @1105
diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c
index 7b15249..d60913f 100644
--- a/ldap/servers/slapd/main.c
+++ b/ldap/servers/slapd/main.c
@@ -1929,7 +1929,8 @@ lookup_instance_name_by_suffix(char *suffix,
goto done;
if (isexact) {
- query = slapi_ch_smprintf("(&(objectclass=nsmappingtree)(|(cn=\"%s\")(cn=%s)))", suffix, suffix);
+ query = slapi_filter_sprintf("(&(objectclass=nsmappingtree)(|(cn=\"%s%s\")(cn=%s%s)))",
+ ESC_NEXT_VAL, suffix, ESC_NEXT_VAL, suffix);
if (query == NULL)
goto done;
@@ -1951,7 +1952,8 @@ lookup_instance_name_by_suffix(char *suffix,
} else {
char *suffixp = suffix;
while (NULL != suffixp && strlen(suffixp) > 0) {
- query = slapi_ch_smprintf("(&(objectclass=nsmappingtree)(|(cn=*%s\")(cn=*%s)))", suffixp, suffixp);
+ query = slapi_filter_sprintf("(&(objectclass=nsmappingtree)(|(cn=*%s%s\")(cn=*%s%s)))",
+ ESC_NEXT_VAL, suffixp, ESC_NEXT_VAL, suffixp);
if (query == NULL)
goto done;
/* Note: This DN is no need to be normalized. */
@@ -2036,7 +2038,7 @@ static struct slapdplugin *lookup_plugin_by_instance_name(const char *name)
if (pb == NULL)
return NULL;
- query = slapi_ch_smprintf("(&(cn=%s)(objectclass=nsBackendInstance))", name);
+ query = slapi_filter_sprintf("(&(cn=%s%s)(objectclass=nsBackendInstance))", ESC_AND_NORM_NEXT_VAL, name);
if (query == NULL) {
slapi_pblock_destroy(pb);
return NULL;
diff --git a/ldap/servers/slapd/mapping_tree.c b/ldap/servers/slapd/mapping_tree.c
index e8e414f..dad5940 100644
--- a/ldap/servers/slapd/mapping_tree.c
+++ b/ldap/servers/slapd/mapping_tree.c
@@ -908,9 +908,9 @@ static int
mapping_tree_node_get_children(mapping_tree_node *target, int is_root)
{
Slapi_PBlock *pb;
- char * filter = NULL;
- int res;
Slapi_Entry **entries = NULL;
+ char *filter = NULL;
+ int res;
int x;
int result = 0;
@@ -923,11 +923,11 @@ mapping_tree_node_get_children(mapping_tree_node *target, int is_root)
filter = slapi_ch_smprintf("(&(objectclass=nsMappingTree)(!(%s=*)))",
MAPPING_TREE_PARENT_ATTRIBUTE);
} else {
- filter = slapi_ch_smprintf("(&(objectclass=nsMappingTree)(|(%s=\"%s\")(%s=%s)))",
- MAPPING_TREE_PARENT_ATTRIBUTE,
- slapi_sdn_get_dn(target->mtn_subtree),
- MAPPING_TREE_PARENT_ATTRIBUTE,
- slapi_sdn_get_dn(target->mtn_subtree));
+ const char *filter_value = slapi_sdn_get_dn(target->mtn_subtree);
+
+ filter = slapi_filter_sprintf("(&(objectclass=nsMappingTree)(|(%s=\"%s%s\")(%s=%s%s)))",
+ MAPPING_TREE_PARENT_ATTRIBUTE, ESC_NEXT_VAL, filter_value,
+ MAPPING_TREE_PARENT_ATTRIBUTE, ESC_NEXT_VAL, filter_value );
}
slapi_search_internal_set_pb(pb, MAPPING_TREE_BASE_DN, LDAP_SCOPE_ONELEVEL,
diff --git a/ldap/servers/slapd/plugin.c b/ldap/servers/slapd/plugin.c
index 436cc02..f90bd0d 100644
--- a/ldap/servers/slapd/plugin.c
+++ b/ldap/servers/slapd/plugin.c
@@ -3024,7 +3024,7 @@ plugin_enabled(const char *plugin_name, void *identity)
char *filter = NULL;
int rc = 0; /* disabled, by default */
- filter = slapi_ch_smprintf("cn=%s", plugin_name);
+ filter = slapi_filter_sprintf("cn=%s%s", ESC_NEXT_VAL, plugin_name);
search_pb = slapi_pblock_new();
slapi_search_internal_set_pb(search_pb, PLUGIN_BASE_DN, LDAP_SCOPE_ONELEVEL,
filter, NULL, 0, NULL, NULL, identity, 0);
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index 192d663..3fd8aed 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -3593,6 +3593,21 @@ void slapi_rand_array(void *randx, size_t len);
*/
int slapi_rand();
+/**
+ * Escape special characters in a search filter value
+ *
+ * \param filter_str A ldap search filter value (cn=VALUE_TO_BE_ESCAPED)
+ * \param len length of the search filter value. -1 indicates the string is null terminated
+ * \param buf the buffer to store the escaped filter value string
+ * \return the escaped filter value string
+ */
+char* slapi_escape_filter_value(char* filter_str, int len);
+
+#define ESC_NEXT_VAL "__ESC__NEXT__VAL__"
+#define NORM_NEXT_VAL "__NORM__NEXT__VAL__"
+#define ESC_AND_NORM_NEXT_VAL "__ESC__AND__NORM__NEXT__VAL__"
+
+char* slapi_filter_sprintf(const char *fmt, ...);
/*
* attribute routines
diff --git a/ldap/servers/slapd/slapi-private.h b/ldap/servers/slapd/slapi-private.h
index 68c2329..a57b453 100644
--- a/ldap/servers/slapd/slapi-private.h
+++ b/ldap/servers/slapd/slapi-private.h
@@ -1143,7 +1143,6 @@ char* slapd_get_tmp_dir( void );
#include <stdio.h> /* GGOODREPL - For BUFSIZ, below, gak */
const char* escape_string (const char* str, char buf[BUFSIZ]);
const char* escape_string_with_punctuation(const char* str, char buf[BUFSIZ]);
-const char* escape_filter_value(const char* str, int len, char buf[BUFSIZ]);
void strcpy_unescape_value( char *d, const char *s );
char *slapi_berval_get_string_copy(const struct berval *bval);
diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c
index 48a452f..c3f3593 100644
--- a/ldap/servers/slapd/util.c
+++ b/ldap/servers/slapd/util.c
@@ -72,6 +72,10 @@
#define _CSEP '/'
#endif
+/* slapi_filter_sprintf macros */
+#define ATTRSIZE 256 /* size allowed for an attr name */
+#define FILTER_BUF 128 /* initial buffer size for attr value */
+#define BUF_INCR 16 /* the amount to increase the FILTER_BUF once it fills up */
static int special_np(unsigned char c)
{
@@ -95,6 +99,7 @@ static int special_np_and_punct(unsigned char c)
return UTIL_ESCAPE_NONE;
}
+#ifndef USE_OPENLDAP
static int special_filter(unsigned char c)
{
/*
@@ -110,6 +115,27 @@ static int special_filter(unsigned char c)
c == '\\' ||
c == '"') ? UTIL_ESCAPE_HEX : UTIL_ESCAPE_NONE;
}
+#endif
+
+/*
+ * Used by filter_stuff_func to help extract an attribute so we know
+ * how to normalize the value.
+ */
+static int
+special_attr_char(unsigned char c)
+{
+ return (c < 32 ||
+ c > 126 ||
+ c == '*' ||
+ c == '|' ||
+ c == '&' ||
+ c == '!' ||
+ c == '(' ||
+ c == ')' ||
+ c == '\\' ||
+ c == '=' ||
+ c == '"');
+}
static const char*
do_escape_string (
@@ -180,7 +206,7 @@ do_escape_string (
*bufNext = '\0';
return buf;
}
- }
+ }
return str;
}
@@ -206,10 +232,254 @@ escape_string_with_punctuation(const char* str, char buf[BUFSIZ])
return do_escape_string(str,-1,buf,special_np_and_punct);
}
-const char*
-escape_filter_value(const char* str, int len, char buf[BUFSIZ])
+#define ESCAPE_FILTER 1
+#define NORM_FILTER 2
+
+struct filter_ctx {
+ char *buf;
+ char attr[ATTRSIZE];
+ int attr_position;
+ int attr_found;
+ int buf_size;
+ int buf_len;
+ int next_arg_needs_esc_norm;
+ int skip_escape;
+};
+
+/*
+ * This function is called by slapi_filter_sprintf to escape/normalize certain values
+ */
+static PRIntn
+filter_stuff_func(void *arg, const char *val, PRUint32 slen)
{
- return do_escape_string(str,len,buf,special_filter);
+ struct filter_ctx *ctx = (struct filter_ctx *)arg;
+ struct berval escaped_filter;
+ struct berval raw_filter;
+ char *buf = (char *)val;
+ int extra_space;
+ int filter_len = slen;
+ int free_buf = 0;
+
+ /* look at val - if val is one of our special keywords, and make a note of it for the next pass */
+ if (strcmp(val, ESC_NEXT_VAL) == 0){
+ ctx->next_arg_needs_esc_norm |= ESCAPE_FILTER;
+ return 0;
+ }
+ if (strcmp(val, NORM_NEXT_VAL) == 0){
+ ctx->next_arg_needs_esc_norm |= NORM_FILTER;
+ return 0;
+ }
+ if (strcmp(val, ESC_AND_NORM_NEXT_VAL) == 0){
+ ctx->next_arg_needs_esc_norm = NORM_FILTER | ESCAPE_FILTER;
+ return 0;
+ }
+ /*
+ * Start collecting the attribute name so we can use the correct
+ * syntax normalization func.
+ */
+ if(ctx->attr_found == 0 && ctx->attr_position < (ATTRSIZE - 1)){
+ if(ctx->attr[0] == '\0'){
+ if(strstr(val,"=")){
+ /* we have an attr we need to record */
+ if(!special_attr_char(val[0])){
+ memcpy(ctx->attr, val, 1);
+ ctx->attr_position++;
+ }
+ } else {
+ /*
+ * We have passed in an attribute as a arg - so we can just set the
+ * attr with val. The next pass should be '=', otherwise we will
+ * reset it.
+ */
+ memcpy(ctx->attr, val, slen);
+ ctx->attr_position = slen;
+ }
+ } else {
+ if(val[0] == '='){ /* hit the end of the attribute name */
+ ctx->attr_found = 1;
+ } else {
+ if(special_attr_char(val[0])){
+ /* this is not an attribute, we should not be collecting this, reset everything */
+ memset(ctx->attr, '\0', ATTRSIZE);
+ ctx->attr_position = 0;
+ } else {
+ memcpy(ctx->attr + ctx->attr_position, val, 1);
+ ctx->attr_position++;
+ }
+ }
+ }
+ }
+
+ if (ctx->next_arg_needs_esc_norm && !ctx->skip_escape){
+ /*
+ * Normalize the filter value first
+ */
+ if(ctx->next_arg_needs_esc_norm & NORM_FILTER){
+ char *norm_val = NULL;
+
+ if(ctx->attr_found){
+ slapi_attr_value_normalize(NULL, NULL, ctx->attr , buf, 1, &norm_val );
+ if(norm_val){
+ buf = norm_val;
+ filter_len = strlen(buf);
+ }
+ }
+ }
+ /*
+ * Escape the filter value
+ */
+ if(ctx->next_arg_needs_esc_norm & ESCAPE_FILTER){
+#if defined (USE_OPENLDAP)
+ raw_filter.bv_val = (char *)buf;
+ raw_filter.bv_len = filter_len;
+ if(ldap_bv2escaped_filter_value(&raw_filter, &escaped_filter) != 0){
+ LDAPDebug(LDAP_DEBUG_TRACE, "slapi_filter_sprintf: failed to escape filter value(%s)\n",val,0,0);
+ ctx->next_arg_needs_esc_norm = 0;
+ return -1;
+ } else {
+ filter_len = escaped_filter.bv_len;
+ buf = escaped_filter.bv_val;
+ }
+#else
+ buf = slapi_ch_calloc(sizeof(char), filter_len*3 + 1);
+ free_buf = 1;
+ if(do_escape_string(val, filter_len, buf, special_filter) == NULL){
+ LDAPDebug(LDAP_DEBUG_TRACE, "slapi_filter_sprintf: failed to escape filter value(%s)\n",val,0,0);
+ ctx->next_arg_needs_esc_norm = 0;
+ slapi_ch_free_string(&buf);
+ return -1;
+ } else {
+ filter_len = strlen(buf);
+ }
+#endif
+ }
+
+ /*
+ * Now add the new value to the buffer, and allocate more memory if needed
+ */
+ if (ctx->buf_size + filter_len >= ctx->buf_len){
+ /* increase buffer for this filter */
+ extra_space = (ctx->buf_len + filter_len + BUF_INCR);
+ slapi_ch_realloc(ctx->buf, sizeof(char) * extra_space);
+ ctx->buf_len = extra_space;
+ }
+
+ /* append the escaped value */
+ memcpy(ctx->buf + ctx->buf_size, buf, filter_len);
+ ctx->buf_size += filter_len;
+
+ /* done with the value, reset everything */
+ ctx->next_arg_needs_esc_norm = 0;
+ ctx->attr_found = 0;
+ ctx->attr_position = 0;
+ memset(ctx->attr, '\0', ATTRSIZE);
+ if(free_buf){
+ slapi_ch_free_string(&buf);
+ }
+
+ return filter_len;
+ } else { /* process arg as is */
+ /* check if we have enough room in our buffer */
+ if (ctx->buf_size + slen >= ctx->buf_len){
+ /* increase buffer for this filter */
+ extra_space = (ctx->buf_len + slen + BUF_INCR);
+ ctx->buf = slapi_ch_realloc((char *)ctx->buf, sizeof(char) * extra_space);
+ ctx->buf_len = extra_space;
+ }
+ memcpy(ctx->buf + ctx->buf_size, buf, slen);
+ ctx->buf_size += slen;
+
+ return slen;
+ }
+}
+
+/*
+ * This is basically like slapi_ch_smprintf() except it can handle special
+ * keywords that will cause the next value to be escaped and/or normalized.
+ *
+ * ESC_NEXT_VAL - escape the next value
+ * NORM_NEXT_VAL - normalize the next value
+ * ESC_AND_NORM_NEXT_VAL - escape and normalize the next value
+ *
+ * Example:
+ *
+ * slapi_filter_sprintf("cn=%s%s", ESC_NEXT_VAL, value);
+ * slapi_filter_sprintf("(|(cn=%s%s)(sn=%s%s))", ESC_NEXT_VAL, value, NORM_NEXT_VAL, value);
+ *
+ * Note: you need a string format specifier(%s) for each keyword
+ */
+char*
+slapi_filter_sprintf(const char *fmt, ...)
+{
+ struct filter_ctx ctx;
+ va_list args;
+ char *buf;
+ int rc;
+
+ buf = slapi_ch_calloc(sizeof(char), FILTER_BUF + 1);
+ ctx.buf = buf;
+ memset(ctx.attr,'\0', ATTRSIZE);
+ ctx.attr_position = 0;
+ ctx.attr_found = 0;
+ ctx.buf_len = FILTER_BUF;
+ ctx.buf_size = 0;
+ ctx.next_arg_needs_esc_norm = 0;
+ ctx.skip_escape = 0;
+
+ va_start(args, fmt);
+ rc = PR_vsxprintf(filter_stuff_func, &ctx, fmt, args);
+ if(rc == -1){
+ /* transformation failed, just return non-normalized/escaped string */
+ ctx.skip_escape = 1;
+ PR_vsxprintf(filter_stuff_func, &ctx, fmt, args);
+ }
+ va_end(args);
+
+ return buf;
+}
+
+/*
+ * escape special characters in values used in search filters
+ *
+ * caller must free the returned value
+ */
+char*
+slapi_escape_filter_value(char* filter_str, int len)
+{
+ struct berval *escaped_filter = NULL;
+ struct berval raw_filter;
+ int filter_len;
+
+ /*
+ * Check the length for special cases
+ */
+ if(len == -1){
+ /* filter str is null terminated */
+ filter_len = strlen(filter_str);
+ } else if (len == 0){
+ /* return the filter as is */
+ return slapi_ch_strdup(filter_str);
+ } else {
+ /* the len is the length */
+ filter_len = len;
+ }
+#if defined (USE_OPENLDAP)
+ /*
+ * Construct the berval and escape it
+ */
+ raw_filter.bv_val = filter_str;
+ raw_filter.bv_len = filter_len;
+ if(ldap_bv2escaped_filter_value(&raw_filter, escaped_filter) != 0){
+ LDAPDebug(LDAP_DEBUG_TRACE, "slapi_escape_filter_value: failed to escape filter value(%s)\n",filter_str,0,0);
+ return NULL;
+ } else {
+ return slapi_ch_strdup(escaped_filter->bv_val);
+ }
+#else
+ char *buf = slapi_ch_calloc(sizeof(char), filter_len*3+1);
+
+ return do_escape_string(filter_str, filter_len, buf, special_filter);
+#endif
}
/*
1
0