ldap/schema/02common.ldif | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 77f126b85db760f0ad8e56575a8bac135b15fe49
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Thu Nov 29 10:49:33 2012 -0500
Ticket 216 - disable replication agreements
Bug Description: Objectclass violation when trying to add "nsds5ReplicaEnabled"
to a winSync agmt.
Fix Description: Add this attribute to the "MAY" list for objectclass: nsDSWindowsReplicationAgreement
https://fedorahosted.org/389/ticket/216
Reviewed by: richm(Thanks)
(cherry picked from commit b3a2f4010d4eae7bd62a0c09576b1a643eca3901)
diff --git a/ldap/schema/02common.ldif b/ldap/schema/02common.ldif
index c6cc6b8..ffec7ce 100644
--- a/ldap/schema/02common.ldif
+++ b/ldap/schema/02common.ldif
@@ -180,7 +180,7 @@ objectClasses: ( 2.16.840.1.113730.3.2.99 NAME 'cosSuperDefinition' DESC 'Netsca
objectClasses: ( 2.16.840.1.113730.3.2.100 NAME 'cosClassicDefinition' DESC 'Netscape defined objectclass' SUP cosSuperDefinition MAY ( cosTemplateDn $ cosspecifier ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.101 NAME 'cosPointerDefinition' DESC 'Netscape defined objectclass' SUP cosSuperDefinition MAY ( cosTemplateDn ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.102 NAME 'cosIndirectDefinition' DESC 'Netscape defined objectclass' SUP cosSuperDefinition MAY ( cosIndirectSpecifier ) X-ORIGIN 'Netscape Directory Server' )
-objectClasses: ( 2.16.840.1.113730.3.2.503 NAME 'nsDSWindowsReplicationAgreement' DESC 'Netscape defined objectclass' SUP top MUST ( cn ) MAY ( nsDS5ReplicaHost $ nsDS5ReplicaPort $ nsDS5ReplicaTransportInfo $ nsDS5ReplicaBindDN $ nsDS5ReplicaCredentials $ nsDS5ReplicaBindMethod $ nsDS5ReplicaRoot $ nsDS5ReplicatedAttributeList $ nsDS5ReplicaUpdateSchedule $ nsds5BeginReplicaRefresh $ description $ nsds50ruv $ nsruvReplicaLastModified $ nsds5ReplicaTimeout $ nsds5replicaChangesSentSinceStartup $ nsds5replicaLastUpdateEnd $ nsds5replicaLastUpdateStart $ nsds5replicaLastUpdateStatus $ nsds5replicaUpdateInProgress $ nsds5replicaLastInitEnd $ nsds5replicaLastInitStart $ nsds5replicaLastInitStatus $ nsds5debugreplicatimeout $ nsds5replicaBusyWaitTime $ nsds5replicaSessionPauseTime $ nsds7WindowsReplicaSubtree $ nsds7DirectoryReplicaSubtree $ nsds7NewWinUserSyncEnabled $ nsds7NewWinGroupSyncEnabled $ nsds7WindowsDomain $ nsds7DirsyncCookie $ winSyncInterval $ oneWaySync $ winSyncM
oveAction) X-ORIGIN 'Netscape Directory Server' )
+objectClasses: ( 2.16.840.1.113730.3.2.503 NAME 'nsDSWindowsReplicationAgreement' DESC 'Netscape defined objectclass' SUP top MUST ( cn ) MAY ( nsDS5ReplicaHost $ nsDS5ReplicaPort $ nsDS5ReplicaTransportInfo $ nsDS5ReplicaBindDN $ nsDS5ReplicaCredentials $ nsDS5ReplicaBindMethod $ nsDS5ReplicaRoot $ nsDS5ReplicatedAttributeList $ nsDS5ReplicaUpdateSchedule $ nsds5BeginReplicaRefresh $ description $ nsds50ruv $ nsruvReplicaLastModified $ nsds5ReplicaTimeout $ nsds5replicaChangesSentSinceStartup $ nsds5replicaLastUpdateEnd $ nsds5replicaLastUpdateStart $ nsds5replicaLastUpdateStatus $ nsds5replicaUpdateInProgress $ nsds5replicaLastInitEnd $ nsds5replicaLastInitStart $ nsds5replicaLastInitStatus $ nsds5debugreplicatimeout $ nsds5replicaBusyWaitTime $ nsds5replicaSessionPauseTime $ nsds7WindowsReplicaSubtree $ nsds7DirectoryReplicaSubtree $ nsds7NewWinUserSyncEnabled $ nsds7NewWinGroupSyncEnabled $ nsds7WindowsDomain $ nsds7DirsyncCookie $ winSyncInterval $ oneWaySync $ winSyncM
oveAction $ nsds5ReplicaEnabled ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.128 NAME 'costemplate' DESC 'Netscape defined objectclass' SUP top MAY ( cn $ cospriority ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.304 NAME 'nsView' DESC 'Netscape defined objectclass' SUP top AUXILIARY MAY ( nsViewFilter $ description ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.316 NAME 'nsAttributeEncryption' DESC 'Netscape defined objectclass' SUP top MUST ( cn $ nsEncryptionAlgorithm ) X-ORIGIN 'Netscape Directory Server' )
1
0
ldap/schema/02common.ldif | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b3a2f4010d4eae7bd62a0c09576b1a643eca3901
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Thu Nov 29 10:49:33 2012 -0500
Ticket 216 - disable replication agreements
Bug Description: Objectclass violation when trying to add "nsds5ReplicaEnabled"
to a winSync agmt.
Fix Description: Add this attribute to the "MAY" list for objectclass: nsDSWindowsReplicationAgreement
https://fedorahosted.org/389/ticket/216
Reviewed by: richm(Thanks)
diff --git a/ldap/schema/02common.ldif b/ldap/schema/02common.ldif
index 7ebaa1e..c0ac751 100644
--- a/ldap/schema/02common.ldif
+++ b/ldap/schema/02common.ldif
@@ -180,7 +180,7 @@ objectClasses: ( 2.16.840.1.113730.3.2.99 NAME 'cosSuperDefinition' DESC 'Netsca
objectClasses: ( 2.16.840.1.113730.3.2.100 NAME 'cosClassicDefinition' DESC 'Netscape defined objectclass' SUP cosSuperDefinition MAY ( cosTemplateDn $ cosspecifier ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.101 NAME 'cosPointerDefinition' DESC 'Netscape defined objectclass' SUP cosSuperDefinition MAY ( cosTemplateDn ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.102 NAME 'cosIndirectDefinition' DESC 'Netscape defined objectclass' SUP cosSuperDefinition MAY ( cosIndirectSpecifier ) X-ORIGIN 'Netscape Directory Server' )
-objectClasses: ( 2.16.840.1.113730.3.2.503 NAME 'nsDSWindowsReplicationAgreement' DESC 'Netscape defined objectclass' SUP top MUST ( cn ) MAY ( nsDS5ReplicaHost $ nsDS5ReplicaPort $ nsDS5ReplicaTransportInfo $ nsDS5ReplicaBindDN $ nsDS5ReplicaCredentials $ nsDS5ReplicaBindMethod $ nsDS5ReplicaRoot $ nsDS5ReplicatedAttributeList $ nsDS5ReplicaUpdateSchedule $ nsds5BeginReplicaRefresh $ description $ nsds50ruv $ nsruvReplicaLastModified $ nsds5ReplicaTimeout $ nsds5replicaChangesSentSinceStartup $ nsds5replicaLastUpdateEnd $ nsds5replicaLastUpdateStart $ nsds5replicaLastUpdateStatus $ nsds5replicaUpdateInProgress $ nsds5replicaLastInitEnd $ nsds5replicaLastInitStart $ nsds5replicaLastInitStatus $ nsds5debugreplicatimeout $ nsds5replicaBusyWaitTime $ nsds5replicaSessionPauseTime $ nsds7WindowsReplicaSubtree $ nsds7DirectoryReplicaSubtree $ nsds7NewWinUserSyncEnabled $ nsds7NewWinGroupSyncEnabled $ nsds7WindowsDomain $ nsds7DirsyncCookie $ winSyncInterval $ oneWaySync $ winSyncM
oveAction) X-ORIGIN 'Netscape Directory Server' )
+objectClasses: ( 2.16.840.1.113730.3.2.503 NAME 'nsDSWindowsReplicationAgreement' DESC 'Netscape defined objectclass' SUP top MUST ( cn ) MAY ( nsDS5ReplicaHost $ nsDS5ReplicaPort $ nsDS5ReplicaTransportInfo $ nsDS5ReplicaBindDN $ nsDS5ReplicaCredentials $ nsDS5ReplicaBindMethod $ nsDS5ReplicaRoot $ nsDS5ReplicatedAttributeList $ nsDS5ReplicaUpdateSchedule $ nsds5BeginReplicaRefresh $ description $ nsds50ruv $ nsruvReplicaLastModified $ nsds5ReplicaTimeout $ nsds5replicaChangesSentSinceStartup $ nsds5replicaLastUpdateEnd $ nsds5replicaLastUpdateStart $ nsds5replicaLastUpdateStatus $ nsds5replicaUpdateInProgress $ nsds5replicaLastInitEnd $ nsds5replicaLastInitStart $ nsds5replicaLastInitStatus $ nsds5debugreplicatimeout $ nsds5replicaBusyWaitTime $ nsds5replicaSessionPauseTime $ nsds7WindowsReplicaSubtree $ nsds7DirectoryReplicaSubtree $ nsds7NewWinUserSyncEnabled $ nsds7NewWinGroupSyncEnabled $ nsds7WindowsDomain $ nsds7DirsyncCookie $ winSyncInterval $ oneWaySync $ winSyncM
oveAction $ nsds5ReplicaEnabled ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.128 NAME 'costemplate' DESC 'Netscape defined objectclass' SUP top MAY ( cn $ cospriority ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.304 NAME 'nsView' DESC 'Netscape defined objectclass' SUP top AUXILIARY MAY ( nsViewFilter $ description ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.316 NAME 'nsAttributeEncryption' DESC 'Netscape defined objectclass' SUP top MUST ( cn $ nsEncryptionAlgorithm ) X-ORIGIN 'Netscape Directory Server' )
1
0
ldap/servers/slapd/config.c | 32 ++++-----------------
ldap/servers/slapd/dse.c | 60 ++++++++++++++++++++++++++--------------
ldap/servers/slapd/proto-slap.h | 1
3 files changed, 47 insertions(+), 46 deletions(-)
New commits:
commit b3ca9eec5d50c2ca503582e55b6681b9b3ad6ad3
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Fri Nov 23 11:15:52 2012 +0100
Ticket 518 - dse.ldif is 0 length after server kill or machine kill
Bug Description: If a machine is powered off while slapd is running, dse.ldif can have 0 bytes and
server doesn't start even if a dse.ldif.tmp or dse.ldif.bak exists
Fix Description: I see no way to prevent a 0 byte ldif in case of a machine crash from slapd code,
but the server should try all avaialble backup dse.ldif files to be able to start,
https://fedorahosted.org/389/ticket/518
Reviewed by: RichM (Thanks)
diff --git a/ldap/servers/slapd/config.c b/ldap/servers/slapd/config.c
index d97a575..3edc24b 100644
--- a/ldap/servers/slapd/config.c
+++ b/ldap/servers/slapd/config.c
@@ -165,6 +165,7 @@ slapd_bootstrap_config(const char *configdir)
char *buf = 0;
char *lastp = 0;
char *entrystr = 0;
+ char tmpfile[MAXPATHLEN+1];
if (NULL == configdir) {
slapi_log_error(SLAPI_LOG_FATAL,
@@ -173,33 +174,14 @@ slapd_bootstrap_config(const char *configdir)
}
PR_snprintf(configfile, sizeof(configfile), "%s/%s", configdir,
CONFIG_FILENAME);
- if ( (rc = PR_GetFileInfo( configfile, &prfinfo )) != PR_SUCCESS )
- {
- /* the "real" file does not exist; see if there is a tmpfile */
- char tmpfile[MAXPATHLEN+1];
- slapi_log_error(SLAPI_LOG_FATAL, "config",
- "The configuration file %s does not exist\n", configfile);
- PR_snprintf(tmpfile, sizeof(tmpfile), "%s/%s.tmp", configdir,
+ PR_snprintf(tmpfile, sizeof(tmpfile), "%s/%s.tmp", configdir,
CONFIG_FILENAME);
- if ( PR_GetFileInfo( tmpfile, &prfinfo ) == PR_SUCCESS ) {
- rc = PR_Rename(tmpfile, configfile);
- if (rc == PR_SUCCESS) {
- slapi_log_error(SLAPI_LOG_FATAL, "config",
- "The configuration file %s was restored from backup %s\n",
- configfile, tmpfile);
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, "config",
- "The configuration file %s was not restored from backup %s, error %d\n",
- configfile, tmpfile, rc);
- return rc; /* Fail */
- }
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, "config",
- "The backup configuration file %s does not exist, either.\n",
- tmpfile);
- return rc; /* Fail */
- }
+ if ( (rc = dse_check_file(configfile, tmpfile)) == 0 ) {
+ PR_snprintf(tmpfile, sizeof(tmpfile), "%s/%s.bak", configdir,
+ CONFIG_FILENAME);
+ rc = dse_check_file(configfile, tmpfile);
}
+
if ( (rc = PR_GetFileInfo( configfile, &prfinfo )) != PR_SUCCESS )
{
PRErrorCode prerr = PR_GetError();
diff --git a/ldap/servers/slapd/dse.c b/ldap/servers/slapd/dse.c
index 3d2955c..53d8736 100644
--- a/ldap/servers/slapd/dse.c
+++ b/ldap/servers/slapd/dse.c
@@ -651,6 +651,40 @@ dse_updateNumSubOfParent(struct dse *pdse, const Slapi_DN *child, int op)
slapi_sdn_done(&parent);
}
+/* check if a file is valid, or if a provided backup file can be used.
+ * there is no way to determine if the file contents is usable, the only
+ * checks that can be done is that the file exists and that it is not size 0
+ */
+int
+dse_check_file(char *filename, char *backupname)
+{
+ int rc= 0; /* Fail */
+ PRFileInfo prfinfo;
+
+ if (PR_GetFileInfo( filename, &prfinfo ) == PR_SUCCESS) {
+ if ( prfinfo.size > 0)
+ return (1);
+ else {
+ rc = PR_Delete (filename);
+ }
+ }
+
+ if (backupname)
+ rc = PR_Rename (backupname, filename);
+ else
+ return (0);
+
+ if ( PR_GetFileInfo( filename, &prfinfo ) == PR_SUCCESS && prfinfo.size > 0 ) {
+ slapi_log_error(SLAPI_LOG_FATAL, "dse",
+ "The configuration file %s was restored from backup %s\n", filename, backupname);
+ return (1);
+ } else {
+ slapi_log_error(SLAPI_LOG_FATAL, "dse",
+ "The configuration file %s was not restored from backup %s, error %d\n",
+ filename, backupname, rc);
+ return (0);
+ }
+}
static int
dse_read_one_file(struct dse *pdse, const char *filename, Slapi_PBlock *pb,
int primary_file )
@@ -669,27 +703,11 @@ dse_read_one_file(struct dse *pdse, const char *filename, Slapi_PBlock *pb,
if ( (NULL != pdse) && (NULL != filename) )
{
- if ( (rc = PR_GetFileInfo( filename, &prfinfo )) != PR_SUCCESS )
- {
- /* the "real" file does not exist; see if there is a tmpfile */
- if ( pdse->dse_tmpfile &&
- PR_GetFileInfo( pdse->dse_tmpfile, &prfinfo ) == PR_SUCCESS ) {
- rc = PR_Rename(pdse->dse_tmpfile, filename);
- if (rc == PR_SUCCESS) {
- slapi_log_error(SLAPI_LOG_FATAL, "dse",
- "The configuration file %s was restored from backup %s\n",
- filename, pdse->dse_tmpfile);
- rc = 1;
- } else {
- slapi_log_error(SLAPI_LOG_FATAL, "dse",
- "The configuration file %s was not restored from backup %s, error %d\n",
- filename, pdse->dse_tmpfile, rc);
- rc = 0;
- }
- } else {
- rc = 0; /* fail */
- }
- }
+ /* check if the "real" file exists and cam be used, if not try tmp as backup */
+ rc = dse_check_file(filename, pdse->dse_tmpfile);
+ if (!rc)
+ rc = dse_check_file(filename, pdse->dse_fileback);
+
if ( (rc = PR_GetFileInfo( filename, &prfinfo )) != PR_SUCCESS )
{
slapi_log_error(SLAPI_LOG_FATAL, "dse",
diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
index d206c6d..a17f40d 100644
--- a/ldap/servers/slapd/proto-slap.h
+++ b/ldap/servers/slapd/proto-slap.h
@@ -661,6 +661,7 @@ struct dse *dse_new( char *filename, char *tmpfilename, char *backfilename, char
struct dse *dse_new_with_filelist(char *filename, char *tmpfilename, char *backfilename, char *startokfilename, const char *configdir, char **filelist);
int dse_deletedse(Slapi_PBlock *pb);
int dse_destroy(struct dse *pdse);
+int dse_check_file(char *filename, char *backupname);
int dse_read_file(struct dse *pdse, Slapi_PBlock *pb);
int dse_bind( Slapi_PBlock *pb );
int dse_unbind( Slapi_PBlock *pb );
1
0
ldap/servers/plugins/replication/repl5.h | 2 +
ldap/servers/plugins/replication/repl5_agmt.c | 10 ++++++
ldap/servers/plugins/replication/windows_inc_protocol.c | 23 +++++++---------
ldap/servers/plugins/replication/windows_private.c | 10 +++++-
4 files changed, 31 insertions(+), 14 deletions(-)
New commits:
commit 8799a86f36c40169f9077d1e836ba1b4f32080d7
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Nov 27 15:16:45 2012 -0500
Ticket 393 - Change in winSyncInterval does not take immediate effect
Bug Description: If you change the sync interval you must restart the DS for
it to take effect.
Fix Description: When we change certain config settings(like the interval), notify
the repl protocol that the agmt has changed. This iputs the incr_run
into the START state where we will pick the interval change.
We do not want to notify the protocol when updating these attributes:
nsds7WindowsReplicaSubtree
nsds7DirectoryReplicaSubtree
nsds7WindowsDomain
Notifying the protocol automatically triggers these attributes to be
updated, so we don't want to renotify the protocol and end up in an
infinite loop.
https://fedorahosted.org/389/ticket/393
Reviewed by: richm(Thanks!)
diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h
index 4c57ee5..f1d6ef4 100644
--- a/ldap/servers/plugins/replication/repl5.h
+++ b/ldap/servers/plugins/replication/repl5.h
@@ -492,6 +492,8 @@ void prot_notify_window_closed (Repl_Protocol *rp);
Object *prot_get_replica_object(Repl_Protocol *rp);
void prot_replicate_now(Repl_Protocol *rp);
+Repl_Protocol *agmt_get_protocol(Repl_Agmt *ra);
+
/* In repl5_replica.c */
typedef enum
{
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index 935fb37..da68e16 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -2497,6 +2497,16 @@ void* agmt_get_connection(Repl_Agmt *ra)
}
}
+Repl_Protocol *
+agmt_get_protocol(Repl_Agmt *ra)
+{
+ if(ra){
+ return ra->protocol;
+ } else {
+ return NULL;
+ }
+}
+
int
agmt_has_protocol(Repl_Agmt *agmt)
{
diff --git a/ldap/servers/plugins/replication/windows_inc_protocol.c b/ldap/servers/plugins/replication/windows_inc_protocol.c
index b5fcadc..20a1c7a 100644
--- a/ldap/servers/plugins/replication/windows_inc_protocol.c
+++ b/ldap/servers/plugins/replication/windows_inc_protocol.c
@@ -147,7 +147,7 @@ static const char* event2name (int event);
static const char* acquire2name (int code);
static void periodic_dirsync(time_t when, void *arg);
-static Slapi_Eq_Context dirsync;
+static Slapi_Eq_Context dirsync = NULL;
/*
* It's specifically ok to delete a protocol instance that
* is currently running. The instance will be shut down, and
@@ -292,8 +292,8 @@ windows_inc_run(Private_Repl_Protocol *prp)
PRBool use_busy_backoff_timer = PR_FALSE;
long pausetime = 0;
long busywaittime = 0;
- /* Some operations should only be done the first time STATE_START is true. */
- static PRBool is_first_start = PR_TRUE;
+ unsigned long current_interval = 0;
+ unsigned long interval = 0;
int one_way;
PRBool run_dirsync = PR_FALSE;
@@ -357,17 +357,16 @@ windows_inc_run(Private_Repl_Protocol *prp)
w_set_pause_and_busy_time(&pausetime, &busywaittime);
}
-
- if (is_first_start) {
- unsigned long interval = windows_private_get_sync_interval(prp->agmt) * 1000;
- /*
- * The function, the arguments, the time (hence) when it is first to be called,
- * and the repeat interval.
- */
- /* DBDB: we should probably make this polling interval configurable */
+ /* Check if the interval changed */
+ interval = windows_private_get_sync_interval(prp->agmt) * 1000;
+ if(interval != current_interval){
+ current_interval = interval;
+ if(dirsync){
+ slapi_eq_cancel(dirsync);
+ }
dirsync = slapi_eq_repeat(periodic_dirsync, (void*) prp, (time_t)0 , interval);
- is_first_start = PR_FALSE;
}
+
break;
case STATE_WAIT_WINDOW_OPEN:
diff --git a/ldap/servers/plugins/replication/windows_private.c b/ldap/servers/plugins/replication/windows_private.c
index cc007aa..6b509a1 100644
--- a/ldap/servers/plugins/replication/windows_private.c
+++ b/ldap/servers/plugins/replication/windows_private.c
@@ -180,8 +180,9 @@ windows_parse_config_entry(Repl_Agmt *ra, const char *type, Slapi_Entry *e)
{
windows_private_set_create_users(ra, PR_FALSE);
}
- retval = 1;
slapi_ch_free((void**)&tmpstr);
+ prot_notify_agmt_changed(agmt_get_protocol(ra), (char *)agmt_get_long_name(ra));
+ retval = 1;
}
if (type == NULL || slapi_attr_types_equivalent(type,type_nsds7CreateNewGroups))
{
@@ -194,8 +195,9 @@ windows_parse_config_entry(Repl_Agmt *ra, const char *type, Slapi_Entry *e)
{
windows_private_set_create_groups(ra, PR_FALSE);
}
- retval = 1;
slapi_ch_free((void**)&tmpstr);
+ prot_notify_agmt_changed(agmt_get_protocol(ra), (char *)agmt_get_long_name(ra));
+ retval = 1;
}
if (type == NULL || slapi_attr_types_equivalent(type,type_nsds7WindowsDomain))
{
@@ -214,6 +216,7 @@ windows_parse_config_entry(Repl_Agmt *ra, const char *type, Slapi_Entry *e)
if (NULL != tmpstr)
{
windows_private_set_sync_interval(ra,tmpstr);
+ prot_notify_agmt_changed(agmt_get_protocol(ra), (char *)agmt_get_long_name(ra));
}
slapi_ch_free_string(&tmpstr);
retval = 1;
@@ -240,6 +243,7 @@ windows_parse_config_entry(Repl_Agmt *ra, const char *type, Slapi_Entry *e)
windows_private_set_one_way(ra, ONE_WAY_SYNC_DISABLED);
}
slapi_ch_free((void**)&tmpstr);
+ prot_notify_agmt_changed(agmt_get_protocol(ra), (char *)agmt_get_long_name(ra));
retval = 1;
}
if (type == NULL || slapi_attr_types_equivalent(type,type_winsyncMoveAction))
@@ -266,8 +270,10 @@ windows_parse_config_entry(Repl_Agmt *ra, const char *type, Slapi_Entry *e)
windows_private_set_move_action(ra, MOVE_DOES_NOTHING);
}
slapi_ch_free((void**)&tmpstr);
+ prot_notify_agmt_changed(agmt_get_protocol(ra), (char *)agmt_get_long_name(ra));
retval = 1;
}
+
return retval;
}
1
0
ldap/servers/plugins/automember/automember.c | 44 +++++++++------
ldap/servers/slapd/errormap.c | 10 +++
ldap/servers/slapd/slapi-plugin.h | 75 +++++++++++++++++++++++++++
3 files changed, 111 insertions(+), 18 deletions(-)
New commits:
commit bf2bfaab8e61f335442e4341ff33521a822bd830
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Nov 27 10:24:02 2012 -0500
Ticket 20 - Allow automember to work on entries that have already been added
Bug Description: If the server can not open a ldif for reading(mapping task), an
incorrect error and file name is returned.
Fix Description: Report the correct file name, and correctly grab the OS error/string.
Also made slapd_pr_strerr() and slapd_system_strerr() public, so I
refactored the function names to be "slapi_" - so a lot of files are
touched but the main change for this ticket is still in automember.c
https://fedorahosted.org/389/ticket/20
Reviewed by: richm(Thanks)
diff --git a/ldap/servers/plugins/automember/automember.c b/ldap/servers/plugins/automember/automember.c
index a11909f..424b507 100644
--- a/ldap/servers/plugins/automember/automember.c
+++ b/ldap/servers/plugins/automember/automember.c
@@ -2333,6 +2333,7 @@ void automember_export_task_thread(void *arg){
task_data *td = NULL;
PRFileDesc *ldif_fd;
int i = 0;
+ int rc = 0;
td = (task_data *)slapi_task_get_data(task);
slapi_task_begin(task, 1);
@@ -2341,13 +2342,14 @@ void automember_export_task_thread(void *arg){
/* make sure we can open the ldif file */
if (( ldif_fd = PR_Open( td->ldif_out, PR_CREATE_FILE | PR_WRONLY, DEFAULT_FILE_MODE )) == NULL ){
- slapi_task_log_notice(task, "Automember export task could not open ldif file \"%s\" for writing %d\n",
- td->ldif_out, PR_GetError() );
- slapi_task_log_status(task, "Automember export task could not open ldif file \"%s\" for writing %d\n",
- td->ldif_out, PR_GetError() );
+ rc = PR_GetOSError();
+ slapi_task_log_notice(task, "Automember export task could not open ldif file \"%s\" for writing, error %d (%s)\n",
+ td->ldif_out, rc, slapi_system_strerror(rc));
+ slapi_task_log_status(task, "Automember export task could not open ldif file \"%s\" for writing, error %d (%s)\n",
+ td->ldif_out, rc, slapi_system_strerror(rc) );
slapi_log_error( SLAPI_LOG_FATAL, AUTOMEMBER_PLUGIN_SUBSYSTEM,
- "Could not open ldif file \"%s\" for writing %d\n",
- td->ldif_out, PR_GetError() );
+ "Could not open ldif file \"%s\" for writing, error %d (%s)\n",
+ td->ldif_out, rc, slapi_system_strerror(rc) );
result = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
@@ -2516,6 +2518,7 @@ void automember_map_task_thread(void *arg){
task_data *td = NULL;
PRFileDesc *ldif_fd_out = NULL;
char *entrystr = NULL;
+ char *errstr = NULL;
#if defined(USE_OPENLDAP)
int buflen = 0;
LDIFFP *ldif_fd_in = NULL;
@@ -2534,29 +2537,34 @@ void automember_map_task_thread(void *arg){
/* make sure we can open the ldif files */
if(( ldif_fd_out = PR_Open( td->ldif_out, PR_CREATE_FILE | PR_WRONLY, DEFAULT_FILE_MODE )) == NULL ){
- slapi_task_log_notice(task, "The ldif file %s could not be accessed, error %d. Aborting task.\n",
- td->ldif_out, rc);
- slapi_task_log_status(task, "The ldif file %s could not be accessed, error %d. Aborting task.\n",
- td->ldif_out, rc);
+ rc = PR_GetOSError();
+ slapi_task_log_notice(task, "The ldif file %s could not be accessed, error %d (%s). Aborting task.\n",
+ td->ldif_out, rc, slapi_system_strerror(rc));
+ slapi_task_log_status(task, "The ldif file %s could not be accessed, error %d (%s). Aborting task.\n",
+ td->ldif_out, rc, slapi_system_strerror(rc));
slapi_log_error( SLAPI_LOG_FATAL, AUTOMEMBER_PLUGIN_SUBSYSTEM,
- "Could not open ldif file \"%s\" for writing %d\n",
- td->ldif_out, PR_GetError() );
+ "Could not open ldif file \"%s\" for writing, error %d (%s)\n",
+ td->ldif_out, rc, slapi_system_strerror(rc) );
result = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
#if defined(USE_OPENLDAP)
if(( ldif_fd_in = ldif_open(td->ldif_in, "r")) == NULL ){
+ rc = errno;
+ errstr = strerror(rc);
#else
if(( ldif_fd_in = PR_Open( td->ldif_in, PR_RDONLY, DEFAULT_FILE_MODE )) == NULL ){
+ rc = PR_GetOSError();
+ errstr = slapi_system_strerror(rc);
#endif
- slapi_task_log_notice(task, "The ldif file %s could not be accessed, error %d. Aborting task.\n",
- td->ldif_in, rc);
- slapi_task_log_status(task, "The ldif file %s could not be accessed, error %d. Aborting task.\n",
- td->ldif_in, rc);
+ slapi_task_log_notice(task, "The ldif file %s could not be accessed, error %d (%s). Aborting task.\n",
+ td->ldif_in, rc, errstr);
+ slapi_task_log_status(task, "The ldif file %s could not be accessed, error %d (%s). Aborting task.\n",
+ td->ldif_in, rc, errstr);
slapi_log_error( SLAPI_LOG_FATAL, AUTOMEMBER_PLUGIN_SUBSYSTEM,
- "Could not open ldif file \"%s\" for reading %d\n",
- td->ldif_out, PR_GetError() );
+ "Could not open ldif file \"%s\" for reading, error %d (%s)\n",
+ td->ldif_in, rc, errstr );
result = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
diff --git a/ldap/servers/slapd/errormap.c b/ldap/servers/slapd/errormap.c
index d05e495..c585d25 100644
--- a/ldap/servers/slapd/errormap.c
+++ b/ldap/servers/slapd/errormap.c
@@ -73,6 +73,11 @@ slapd_pr_strerror( const int prerrno )
return( s );
}
+char *
+slapi_pr_strerror( const int prerrno )
+{
+ return slapd_pr_strerror(prerrno);
+}
/*
* return the string equivalent of a system error
@@ -92,6 +97,11 @@ slapd_system_strerror( const int syserrno )
return( s );
}
+const char *
+slapi_system_strerror( const int syserrno )
+{
+ return slapd_system_strerror(syserrno);
+}
/*
* return the string equivalent of an NSPR error. If "prerrno" is not
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index 4316833..4962b2a 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -65,6 +65,7 @@ extern "C" {
#include "prtypes.h"
#include "ldap.h"
#include "prprf.h"
+#include "nspr.h"
NSPR_API(PRUint32) PR_snprintf(char *out, PRUint32 outlen, const char *fmt, ...)
#ifdef __GNUC__
__attribute__ ((format (printf, 3, 4)));
@@ -7156,6 +7157,80 @@ uint64_t slapi_str_to_u64(const char *s);
void slapi_set_plugin_open_rootdn_bind(Slapi_PBlock *pb);
+/*
+ * Public entry extension getter/setter functions
+ *
+ * Currently, only slapi_pw_get/set_entry_ext is implemented.
+ * The functions are in pw.c. Detailed usage of the factory
+ * is found in the comments at the top of factory.c.
+ *
+ * When you plan to add other entry extension code AND
+ * the type-value pair is managed via ordinary mod,
+ * setter, getter and copy function having the same API
+ * are supposed to be implemented, then add the set to
+ * attrs_in_extension list in entry.c. The set is called
+ * in slapi_entry_apply_mod_extension.
+ *
+ * Note: setter and getter are public, but copy function
+ * is not. (for the copy function, see pw_copy_entry_ext in pw.c)
+ */
+/* operation used in the entry extension setter */
+#define SLAPI_EXT_SET_ADD 0
+#define SLAPI_EXT_SET_REPLACE 1
+
+/**
+ * Get entry extension
+ *
+ * \param entry is the entry to retrieve the extension from
+ * \param vals is the array of (Slapi_Value *), which directly refers the extension. Caller must duplicate it to use it for other than referring.
+ *
+ * \return LDAP_SUCCESS if successful.
+ * \return non-zero otherwise.
+ */
+int slapi_pw_get_entry_ext(Slapi_Entry *entry, Slapi_Value ***vals);
+
+/**
+ * Set entry extension
+ *
+ * \param entry is the entry to set the extension to
+ * \param vals is the array of (Slapi_Value *), which is consumed in slapi_pw_set_ext if the call is successful.
+ * \param flags: SLAPI_EXT_SET_ADD -- add vals to the existing extension if any.
+ * SLAPI_EXT_SET_REPLACE -- replace vals with the existing extension if any.
+ * No difference if there is no extension in the entry.
+ *
+ * \return LDAP_SUCCESS if successful.
+ * \return non-zero otherwise.
+ */
+int slapi_pw_set_entry_ext(Slapi_Entry *entry, Slapi_Value **vals, int flags);
+
+/**
+ * Get stashed clear password.
+ * If multiple of them are in the extension, the first one is returned.
+ *
+ * \param entry is the entry to retrieve the extension from
+ *
+ * \return a pointer to the clear password string. Caller is responsible to free the string.
+ */
+char *slapi_get_first_clear_text_pw(Slapi_Entry *entry);
+
+/**
+ * Return the string equivalent of an NSPR error
+ * *
+ * \param a NSPR error code
+ *
+ * \return a pointer to the error code string.
+ */
+char *slapi_pr_strerror( const PRErrorCode prerrno );
+
+/**
+ * Return the string equivalent of an OS error
+ *
+ * \param a OS error code
+ *
+ * \return a pointer to the system error code string.
+ */
+const char *slapi_system_strerror( const int syserrno );
+
#ifdef __cplusplus
}
#endif
1
0
ldap/servers/plugins/automember/automember.c | 44 +++++++++++++++------------
ldap/servers/slapd/errormap.c | 10 ++++++
ldap/servers/slapd/slapi-plugin.h | 19 +++++++++++
3 files changed, 55 insertions(+), 18 deletions(-)
New commits:
commit 2b98d672c11a5e4111e5d22a322f4e8a414ca104
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Nov 27 10:24:02 2012 -0500
Ticket 20 - Allow automember to work on entries that have already been added
Bug Description: If the server can not open a ldif for reading(mapping task), an
incorrect error and file name is returned.
Fix Description: Report the correct file name, and correctly grab the OS error/string.
Also made slapd_pr_strerr() and slapd_system_strerr() public, so I
refactored the function names to be "slapi_" - so a lot of files are
touched but the main change for this ticket is still in automember.c
https://fedorahosted.org/389/ticket/20
Reviewed by: richm(Thanks)
diff --git a/ldap/servers/plugins/automember/automember.c b/ldap/servers/plugins/automember/automember.c
index a11909f..424b507 100644
--- a/ldap/servers/plugins/automember/automember.c
+++ b/ldap/servers/plugins/automember/automember.c
@@ -2333,6 +2333,7 @@ void automember_export_task_thread(void *arg){
task_data *td = NULL;
PRFileDesc *ldif_fd;
int i = 0;
+ int rc = 0;
td = (task_data *)slapi_task_get_data(task);
slapi_task_begin(task, 1);
@@ -2341,13 +2342,14 @@ void automember_export_task_thread(void *arg){
/* make sure we can open the ldif file */
if (( ldif_fd = PR_Open( td->ldif_out, PR_CREATE_FILE | PR_WRONLY, DEFAULT_FILE_MODE )) == NULL ){
- slapi_task_log_notice(task, "Automember export task could not open ldif file \"%s\" for writing %d\n",
- td->ldif_out, PR_GetError() );
- slapi_task_log_status(task, "Automember export task could not open ldif file \"%s\" for writing %d\n",
- td->ldif_out, PR_GetError() );
+ rc = PR_GetOSError();
+ slapi_task_log_notice(task, "Automember export task could not open ldif file \"%s\" for writing, error %d (%s)\n",
+ td->ldif_out, rc, slapi_system_strerror(rc));
+ slapi_task_log_status(task, "Automember export task could not open ldif file \"%s\" for writing, error %d (%s)\n",
+ td->ldif_out, rc, slapi_system_strerror(rc) );
slapi_log_error( SLAPI_LOG_FATAL, AUTOMEMBER_PLUGIN_SUBSYSTEM,
- "Could not open ldif file \"%s\" for writing %d\n",
- td->ldif_out, PR_GetError() );
+ "Could not open ldif file \"%s\" for writing, error %d (%s)\n",
+ td->ldif_out, rc, slapi_system_strerror(rc) );
result = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
@@ -2516,6 +2518,7 @@ void automember_map_task_thread(void *arg){
task_data *td = NULL;
PRFileDesc *ldif_fd_out = NULL;
char *entrystr = NULL;
+ char *errstr = NULL;
#if defined(USE_OPENLDAP)
int buflen = 0;
LDIFFP *ldif_fd_in = NULL;
@@ -2534,29 +2537,34 @@ void automember_map_task_thread(void *arg){
/* make sure we can open the ldif files */
if(( ldif_fd_out = PR_Open( td->ldif_out, PR_CREATE_FILE | PR_WRONLY, DEFAULT_FILE_MODE )) == NULL ){
- slapi_task_log_notice(task, "The ldif file %s could not be accessed, error %d. Aborting task.\n",
- td->ldif_out, rc);
- slapi_task_log_status(task, "The ldif file %s could not be accessed, error %d. Aborting task.\n",
- td->ldif_out, rc);
+ rc = PR_GetOSError();
+ slapi_task_log_notice(task, "The ldif file %s could not be accessed, error %d (%s). Aborting task.\n",
+ td->ldif_out, rc, slapi_system_strerror(rc));
+ slapi_task_log_status(task, "The ldif file %s could not be accessed, error %d (%s). Aborting task.\n",
+ td->ldif_out, rc, slapi_system_strerror(rc));
slapi_log_error( SLAPI_LOG_FATAL, AUTOMEMBER_PLUGIN_SUBSYSTEM,
- "Could not open ldif file \"%s\" for writing %d\n",
- td->ldif_out, PR_GetError() );
+ "Could not open ldif file \"%s\" for writing, error %d (%s)\n",
+ td->ldif_out, rc, slapi_system_strerror(rc) );
result = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
#if defined(USE_OPENLDAP)
if(( ldif_fd_in = ldif_open(td->ldif_in, "r")) == NULL ){
+ rc = errno;
+ errstr = strerror(rc);
#else
if(( ldif_fd_in = PR_Open( td->ldif_in, PR_RDONLY, DEFAULT_FILE_MODE )) == NULL ){
+ rc = PR_GetOSError();
+ errstr = slapi_system_strerror(rc);
#endif
- slapi_task_log_notice(task, "The ldif file %s could not be accessed, error %d. Aborting task.\n",
- td->ldif_in, rc);
- slapi_task_log_status(task, "The ldif file %s could not be accessed, error %d. Aborting task.\n",
- td->ldif_in, rc);
+ slapi_task_log_notice(task, "The ldif file %s could not be accessed, error %d (%s). Aborting task.\n",
+ td->ldif_in, rc, errstr);
+ slapi_task_log_status(task, "The ldif file %s could not be accessed, error %d (%s). Aborting task.\n",
+ td->ldif_in, rc, errstr);
slapi_log_error( SLAPI_LOG_FATAL, AUTOMEMBER_PLUGIN_SUBSYSTEM,
- "Could not open ldif file \"%s\" for reading %d\n",
- td->ldif_out, PR_GetError() );
+ "Could not open ldif file \"%s\" for reading, error %d (%s)\n",
+ td->ldif_in, rc, errstr );
result = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
diff --git a/ldap/servers/slapd/errormap.c b/ldap/servers/slapd/errormap.c
index d05e495..c585d25 100644
--- a/ldap/servers/slapd/errormap.c
+++ b/ldap/servers/slapd/errormap.c
@@ -73,6 +73,11 @@ slapd_pr_strerror( const int prerrno )
return( s );
}
+char *
+slapi_pr_strerror( const int prerrno )
+{
+ return slapd_pr_strerror(prerrno);
+}
/*
* return the string equivalent of a system error
@@ -92,6 +97,11 @@ slapd_system_strerror( const int syserrno )
return( s );
}
+const char *
+slapi_system_strerror( const int syserrno )
+{
+ return slapd_system_strerror(syserrno);
+}
/*
* return the string equivalent of an NSPR error. If "prerrno" is not
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index 978b02c..0e7220b 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -65,6 +65,7 @@ extern "C" {
#include "prtypes.h"
#include "ldap.h"
#include "prprf.h"
+#include "nspr.h"
NSPR_API(PRUint32) PR_snprintf(char *out, PRUint32 outlen, const char *fmt, ...)
#ifdef __GNUC__
__attribute__ ((format (printf, 3, 4)));
@@ -7303,6 +7304,24 @@ int slapi_pw_set_entry_ext(Slapi_Entry *entry, Slapi_Value **vals, int flags);
*/
char *slapi_get_first_clear_text_pw(Slapi_Entry *entry);
+/**
+ * Return the string equivalent of an NSPR error
+ * *
+ * \param a NSPR error code
+ *
+ * \return a pointer to the error code string.
+ */
+char *slapi_pr_strerror( const PRErrorCode prerrno );
+
+/**
+ * Return the string equivalent of an OS error
+ *
+ * \param a OS error code
+ *
+ * \return a pointer to the system error code string.
+ */
+const char *slapi_system_strerror( const int syserrno );
+
#ifdef __cplusplus
}
#endif
1
0
ldap/servers/plugins/replication/cl5_api.c | 3 ---
ldap/servers/plugins/replication/repl5_replica_config.c | 6 ++++--
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 7d22bc2eca8d71ac212879fb28d39c8a31a7be58
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Nov 26 11:04:36 2012 -0500
Coverity Fixes
12626
13030
13114
13115
13116
Reviewed by: richm (Thanks Rich!)
(cherry picked from commit 4850b2720a6d2a1cf65b2cbfa296e37f04f85c5d)
diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
index 6c94b3d..175eb80 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.c
@@ -6554,9 +6554,6 @@ cl5CleanRUV(ReplicaId rid){
ruv_delete_replica(file->maxRUV, rid);
obj = objset_next_obj(s_cl5Desc.dbFiles, obj);
}
- if(obj){
- object_release (obj);
- }
slapi_rwlock_unlock (s_cl5Desc.stLock);
}
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index 0fd785b..e234c15 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -1743,7 +1743,7 @@ check_replicas_are_done_cleaning(cleanruv_data *data )
{
Object *agmt_obj;
Repl_Agmt *agmt;
- char csnstr[CSN_STRSIZE];
+ char *csnstr = NULL;
char *filter = NULL;
int not_all_cleaned = 1;
int interval = 10;
@@ -1786,6 +1786,7 @@ check_replicas_are_done_cleaning(cleanruv_data *data )
interval = 14400;
}
}
+ slapi_ch_free_string(&csnstr);
slapi_ch_free_string(&filter);
}
@@ -2356,7 +2357,7 @@ delete_cleaned_rid_config(cleanruv_data *clean_data)
struct berval *vals[2];
struct berval val;
char data[CSN_STRSIZE + 15];
- char csnstr[CSN_STRSIZE];
+ char *csnstr = NULL;
char *dn;
int rc;
@@ -2399,6 +2400,7 @@ delete_cleaned_rid_config(cleanruv_data *clean_data)
}
slapi_pblock_destroy (pb);
slapi_ch_free_string(&dn);
+ slapi_ch_free_string(&csnstr);
}
/*
1
0
ldap/servers/plugins/replication/cl5_api.c | 3 ---
ldap/servers/plugins/replication/repl5_replica_config.c | 6 ++++--
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 4850b2720a6d2a1cf65b2cbfa296e37f04f85c5d
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Nov 26 11:04:36 2012 -0500
Coverity Fixes
12626
13030
13114
13115
13116
Reviewed by: richm (Thanks Rich!)
diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
index 6c94b3d..175eb80 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.c
@@ -6554,9 +6554,6 @@ cl5CleanRUV(ReplicaId rid){
ruv_delete_replica(file->maxRUV, rid);
obj = objset_next_obj(s_cl5Desc.dbFiles, obj);
}
- if(obj){
- object_release (obj);
- }
slapi_rwlock_unlock (s_cl5Desc.stLock);
}
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index f1baef2..aef9c13 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -1743,7 +1743,7 @@ check_replicas_are_done_cleaning(cleanruv_data *data )
{
Object *agmt_obj;
Repl_Agmt *agmt;
- char csnstr[CSN_STRSIZE];
+ char *csnstr = NULL;
char *filter = NULL;
int not_all_cleaned = 1;
int interval = 10;
@@ -1786,6 +1786,7 @@ check_replicas_are_done_cleaning(cleanruv_data *data )
interval = 14400;
}
}
+ slapi_ch_free_string(&csnstr);
slapi_ch_free_string(&filter);
}
@@ -2356,7 +2357,7 @@ delete_cleaned_rid_config(cleanruv_data *clean_data)
struct berval *vals[2];
struct berval val;
char data[CSN_STRSIZE + 15];
- char csnstr[CSN_STRSIZE];
+ char *csnstr = NULL;
char *dn;
int rc;
@@ -2399,6 +2400,7 @@ delete_cleaned_rid_config(cleanruv_data *clean_data)
}
slapi_pblock_destroy (pb);
slapi_ch_free_string(&dn);
+ slapi_ch_free_string(&csnstr);
}
/*
1
0
ldap/schema/02common.ldif | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit da4e8686e530757e6c1005588e5e0c4e185f12e1
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Wed Nov 21 10:08:45 2012 +0100
Ticket 349 - nsViewFilter syntax issue in 389DS 1.2.5
Bug Description: current nsViewFilter syntax is IA5string, this is too restictive
for definition of views in DIT using international chareacters
Fix Description: change syntax of nsViewFilter to directory string
NOTE: there could be deployments relying on the case sensitivity of IA5string
although not very likely. Probably need to doc in RN
https://fedorahosted.org/389/ticket/349
Reviewed by: ?
diff --git a/ldap/schema/02common.ldif b/ldap/schema/02common.ldif
index c6cc6b8..7ebaa1e 100644
--- a/ldap/schema/02common.ldif
+++ b/ldap/schema/02common.ldif
@@ -148,7 +148,7 @@ attributeTypes: ( 2.16.840.1.113730.3.1.1100 NAME 'oneWaySync' DESC 'Netscape de
attributeTypes: ( 2.16.840.1.113730.3.1.2139 NAME 'winSyncMoveAction' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 1.3.6.1.1.4 NAME 'vendorName' EQUALITY 1.3.6.1.4.1.1466.109.114.1 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation X-ORIGIN 'RFC 3045' )
attributeTypes: ( 1.3.6.1.1.5 NAME 'vendorVersion' EQUALITY 1.3.6.1.4.1.1466.109.114.1 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation X-ORIGIN 'RFC 3045' )
-attributeTypes: ( 2.16.840.1.113730.3.1.3023 NAME 'nsViewFilter' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.3023 NAME 'nsViewFilter' 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.2063 NAME 'nsEncryptionAlgorithm' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.2093 NAME 'nsslapd-changelogsuffix' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'Netscape' )
attributeTypes: ( 2.16.840.1.113730.3.1.2094 NAME 'nsslapd-parent-suffix' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'Netscape' )
1
0
ldap/servers/plugins/replication/cl5_api.c | 21
ldap/servers/plugins/replication/repl5.h | 29
ldap/servers/plugins/replication/repl5_agmt.c | 99 -
ldap/servers/plugins/replication/repl5_agmtlist.c | 11
ldap/servers/plugins/replication/repl5_connection.c | 6
ldap/servers/plugins/replication/repl5_init.c | 69 +
ldap/servers/plugins/replication/repl5_replica.c | 132 --
ldap/servers/plugins/replication/repl5_replica_config.c | 1055 ++++++++++------
ldap/servers/plugins/replication/repl_extop.c | 266 +++-
ldap/servers/plugins/replication/replutil.c | 47
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 7
ldap/servers/slapd/back-ldbm/misc.c | 2
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 1
ldap/servers/slapd/entry.c | 10
ldap/servers/slapd/slapi-private.h | 2
15 files changed, 1104 insertions(+), 653 deletions(-)
New commits:
commit 7a3014c0746134403f1fe9a25eac9581750aef0b
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Nov 20 16:14:42 2012 -0500
Ticket 337 - improve CLEANRUV functionality
Bug Description: Without anonymous access allowed, then task could not
contact other servers and retrieve data(ruv, maxcsns, etc).
Fix Description: Changed all communication to use extended operations, and improved
sychronization between the replicas.
https://fedorahosted.org/389/ticket/337
Reviewed by: richm(Thanks Rich!)
(cherry picked from commit ecbd8b7513d05dab5876a88ca56b102c08a7a67c)
diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
index a347c57..6c94b3d 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.c
@@ -1474,13 +1474,13 @@ int cl5WriteOperation(const char *replName, const char *replGen,
}
/* Name: cl5CreateReplayIterator
- Description: creates an iterator that allows to retireve changes that should
- to be sent to the consumer identified by ruv. The iteration is peformed by
+ Description: creates an iterator that allows to retrieve changes that should
+ to be sent to the consumer identified by ruv. The iteration is performed by
repeated calls to cl5GetNextOperationToReplay.
Parameters: replica - replica whose data we wish to iterate;
ruv - consumer ruv;
iterator - iterator to be passed to cl5GetNextOperationToReplay call
- Return: CL5_SUCCESS, if function is successfull;
+ Return: CL5_SUCCESS, if function is successful;
CL5_MISSING_DATA, if data that should be in the changelog is missing
CL5_PURGED_DATA, if some data that consumer needs has been purged.
Note that the iterator can be non null if the supplier contains
@@ -1488,14 +1488,14 @@ int cl5WriteOperation(const char *replName, const char *replGen,
CL5_NOTFOUND if the consumer is up to data with respect to the supplier
CL5_BAD_DATA if invalid parameter is passed;
CL5_BAD_STATE if db has not been open;
- CL5_DB_ERROR if any other db error occured;
+ CL5_DB_ERROR if any other db error occurred;
CL5_MEMORY_ERROR if memory allocation fails.
Algorithm: Build a list of csns from consumer's and supplier's ruv. For each element
of the consumer's ruv put max csn into the csn list. For each element
of the supplier's ruv not in the consumer's ruv put min csn from the
supplier's ruv into the list. The list contains, for each known replica,
the starting point for changes to be sent to the consumer.
- Sort the list in accending order.
+ Sort the list in ascending order.
Build a hash which contains, for each known replica, whether the
supplier can bring the consumer up to data with respect to that replica.
The hash is used to decide whether a change can be sent to the consumer
@@ -1503,7 +1503,7 @@ int cl5WriteOperation(const char *replName, const char *replGen,
we can bring the consumer up to date.
Position the db cursor on the change entry that corresponds to this csn.
Hash entries are created for each replica traversed so far. sendChanges
- flag is set to FALSE for all repolicas except the last traversed.
+ flag is set to FALSE for all replicas except the last traversed.
*/
int cl5CreateReplayIteratorEx (Private_Repl_Protocol *prp, const RUV *consumerRuv,
@@ -6543,7 +6543,9 @@ bail:
void
cl5CleanRUV(ReplicaId rid){
CL5DBFile *file;
- Object *obj;
+ Object *obj = NULL;
+
+ slapi_rwlock_wrlock (s_cl5Desc.stLock);
obj = objset_first_obj(s_cl5Desc.dbFiles);
while (obj){
@@ -6552,6 +6554,11 @@ cl5CleanRUV(ReplicaId rid){
ruv_delete_replica(file->maxRUV, rid);
obj = objset_next_obj(s_cl5Desc.dbFiles, obj);
}
+ if(obj){
+ object_release (obj);
+ }
+
+ slapi_rwlock_unlock (s_cl5Desc.stLock);
}
void trigger_cl_trimming(ReplicaId rid){
diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h
index 61b51b0..bd582bc 100644
--- a/ldap/servers/plugins/replication/repl5.h
+++ b/ldap/servers/plugins/replication/repl5.h
@@ -97,8 +97,14 @@
/* cleanallruv extended ops */
#define REPL_CLEANRUV_OID "2.16.840.1.113730.3.6.5"
#define REPL_ABORT_CLEANRUV_OID "2.16.840.1.113730.3.6.6"
-#define CLEANRUV_NOTIFIED 0
-#define CLEANRUV_RELEASED 1
+#define REPL_CLEANRUV_GET_MAXCSN_OID "2.16.840.1.113730.3.6.7"
+#define REPL_CLEANRUV_CHECK_STATUS_OID "2.16.840.1.113730.3.6.8"
+
+#define CLEANRUV_ACCEPTED "accepted"
+#define CLEANRUV_REJECTED "rejected"
+#define CLEANRUV_FINISHED "finished"
+#define CLEANRUV_CLEANING "cleaning"
+#define CLEANRUV_NO_MAXCSN "no maxcsn"
/* DS 5.0 replication protocol error codes */
#define NSDS50_REPL_REPLICA_READY 0x00 /* Replica ready, go ahead */
@@ -230,6 +236,8 @@ int multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb);
int multimaster_extop_EndNSDS50ReplicationRequest(Slapi_PBlock *pb);
int multimaster_extop_cleanruv(Slapi_PBlock *pb);
int multimaster_extop_abort_cleanruv(Slapi_PBlock *pb);
+int multimaster_extop_cleanruv_get_maxcsn(Slapi_PBlock *pb);
+int multimaster_extop_cleanruv_check_status(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);
@@ -365,9 +373,6 @@ PRBool agmt_is_enabled(Repl_Agmt *ra);
int agmt_set_enabled_from_entry(Repl_Agmt *ra, Slapi_Entry *e, char *returntext);
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);
void agmt_update_done(Repl_Agmt *ra, int is_total);
@@ -454,6 +459,7 @@ 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);
+const char* conn_get_bindmethod(Repl_Connection *conn);
/* In repl5_protocol.c */
typedef struct repl_protocol Repl_Protocol;
@@ -608,7 +614,7 @@ 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 add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn);
+void add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn, char *forcing);
int is_cleaned_rid(ReplicaId rid);
int replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
int *returncode, char *returntext, void *arg);
@@ -616,17 +622,15 @@ 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);
+void remove_cleaned_rid(ReplicaId rid);
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);
+struct berval *create_cleanruv_payload(char *value);
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 delete_aborted_rid(Replica *replica, ReplicaId rid, char *repl_root, int skip);
+int is_pre_cleaned_rid(ReplicaId rid);
void set_cleaned_rid(ReplicaId rid);
void cleanruv_log(Slapi_Task *task, char *task_type, char *fmt, ...);
@@ -643,6 +647,7 @@ typedef struct _cleanruv_data
char *repl_root;
Slapi_DN *sdn;
char *certify;
+ char *force;
} cleanruv_data;
/* replutil.c */
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index d25f54b..935fb37 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -141,7 +141,6 @@ 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 */
@@ -252,7 +251,6 @@ 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";
@@ -431,20 +429,6 @@ 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]);
- }
- if(i < CLEANRIDSIZ)
- 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);
@@ -2623,89 +2607,6 @@ 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]);
- }
- if( i < CLEANRIDSIZ )
- ra->cleanruv_notified[i + 1] = 0;
- slapi_ch_array_free(attr_vals);
- } else {
- ra->cleanruv_notified[0] = 0;
- }
- PR_Unlock(ra->lock);
-}
-
/* this is called whenever an update (total/incremental)
is completed */
void
diff --git a/ldap/servers/plugins/replication/repl5_agmtlist.c b/ldap/servers/plugins/replication/repl5_agmtlist.c
index 537cfd8..70f71a8 100644
--- a/ldap/servers/plugins/replication/repl5_agmtlist.c
+++ b/ldap/servers/plugins/replication/repl5_agmtlist.c
@@ -248,7 +248,12 @@ agmtlist_modify_callback(Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry
/* we don't allow delete attribute operations unless it was issued by
the replication plugin - handled above */
if (mods[i]->mod_op & LDAP_MOD_DELETE)
- {
+ {
+ if(strcasecmp (mods[i]->mod_type, type_nsds5ReplicaCleanRUVnotified) == 0){
+ /* allow the deletion of cleanallruv agmt attr */
+ continue;
+ }
+
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: "
"deletion of %s attribute is not allowed\n", type_nsds5ReplicaInitialize);
*returncode = LDAP_UNWILLING_TO_PERFORM;
@@ -508,10 +513,6 @@ 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 51a2bc5..5efd0e6 100644
--- a/ldap/servers/plugins/replication/repl5_connection.c
+++ b/ldap/servers/plugins/replication/repl5_connection.c
@@ -1760,6 +1760,12 @@ bind_method_to_mech(int bindmethod)
return LDAP_SASL_SIMPLE;
}
+const char*
+conn_get_bindmethod(Repl_Connection *conn)
+{
+ return (bind_method_to_mech(conn->bindmethod));
+}
+
/*
* Check the result of an ldap BIND operation to see we it
* contains the expiration controls
diff --git a/ldap/servers/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c
index 7a80c6f..a0f02fe 100644
--- a/ldap/servers/plugins/replication/repl5_init.c
+++ b/ldap/servers/plugins/replication/repl5_init.c
@@ -123,7 +123,7 @@ static char *cleanruv_oid_list[] = {
NULL
};
static char *cleanruv_name_list[] = {
- NSDS_REPL_NAME_PREFIX " Cleanruv",
+ NSDS_REPL_NAME_PREFIX " CleanAllRUV",
NULL
};
static char *cleanruv_abort_oid_list[] = {
@@ -131,9 +131,26 @@ static char *cleanruv_abort_oid_list[] = {
NULL
};
static char *cleanruv_abort_name_list[] = {
- NSDS_REPL_NAME_PREFIX " Cleanruv Abort",
+ NSDS_REPL_NAME_PREFIX " CleanAllRUV Abort",
NULL
};
+static char *cleanruv_maxcsn_oid_list[] = {
+ REPL_CLEANRUV_GET_MAXCSN_OID,
+ NULL
+};
+static char *cleanruv_maxcsn_name_list[] = {
+ NSDS_REPL_NAME_PREFIX " CleanAllRUV Retrieve MaxCSN",
+ NULL
+};
+static char *cleanruv_status_oid_list[] = {
+ REPL_CLEANRUV_CHECK_STATUS_OID,
+ NULL
+};
+static char *cleanruv_status_name_list[] = {
+ NSDS_REPL_NAME_PREFIX " CleanAllRUV Check Status",
+ NULL
+};
+
/* List of plugin identities for every plugin registered. Plugin identity
is passed by the server in the plugin init function and must be supplied
@@ -403,6 +420,52 @@ multimaster_end_extop_init( Slapi_PBlock *pb )
return rc;
}
+int
+multimaster_cleanruv_maxcsn_extop_init( Slapi_PBlock *pb )
+{
+ int rc= 0; /* OK */
+ void *identity = NULL;
+
+ /* get plugin identity and store it to pass to internal operations */
+ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
+ PR_ASSERT (identity);
+
+ 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 *)cleanruv_maxcsn_oid_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, (void *)cleanruv_maxcsn_name_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_FN, (void *)multimaster_extop_cleanruv_get_maxcsn ))
+ {
+ slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, "multimaster_cleanruv_extop_init failed\n" );
+ rc= -1;
+ }
+
+ return rc;
+}
+
+int
+multimaster_cleanruv_status_extop_init( Slapi_PBlock *pb )
+{
+ int rc= 0; /* OK */
+ void *identity = NULL;
+
+ /* get plugin identity and store it to pass to internal operations */
+ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
+ PR_ASSERT (identity);
+
+ 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 *)cleanruv_status_oid_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, (void *)cleanruv_status_name_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_FN, (void *)multimaster_extop_cleanruv_check_status ))
+ {
+ slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, "multimaster_cleanruv_extop_init failed\n" );
+ rc= -1;
+ }
+
+ return rc;
+}
+
int
multimaster_total_extop_init( Slapi_PBlock *pb )
@@ -679,6 +742,8 @@ int replication_multimaster_plugin_init(Slapi_PBlock *pb)
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_cleanruv_abort_extop_init", multimaster_cleanruv_abort_extop_init, "Multimaster replication cleanruv abort extended operation plugin", NULL, identity);
+ rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_maxcsn_extop_init", multimaster_cleanruv_maxcsn_extop_init, "Multimaster replication cleanruv maxcsn extended operation plugin", NULL, identity);
+ rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_status_extop_init", multimaster_cleanruv_status_extop_init, "Multimaster replication cleanruv status extended operation plugin", NULL, identity);
if (0 == rc)
{
multimaster_initialised = 1;
diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
index 2b1d958..b3df831 100644
--- a/ldap/servers/plugins/replication/repl5_replica.c
+++ b/ldap/servers/plugins/replication/repl5_replica.c
@@ -88,7 +88,6 @@ struct replica {
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];
};
@@ -310,7 +309,6 @@ replica_destroy(void **arg)
{
Replica *r;
void *repl_name;
- int i;
if (arg == NULL)
return;
@@ -397,10 +395,6 @@ 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);
}
@@ -1502,7 +1496,7 @@ int replica_check_for_data_reload (Replica *r, void *arg)
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_check_for_data_reload: "
"Warning: for replica %s there were some differences between the changelog max RUV and the "
"database RUV. If there are obsolete elements in the database RUV, you "
- "should remove them using CLEANRUV task. If they are not obsolete, "
+ "should remove them using the CLEANALLRUV task. If they are not obsolete, "
"you should check their status to see why there are no changes from those "
"servers in the changelog.\n",
slapi_sdn_get_dn(r->repl_root));
@@ -1819,12 +1813,13 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
PRThread *thread = NULL;
struct berval *payload = NULL;
CSN *maxcsn = NULL;
- char *csnpart;
- char *iter;
+ ReplicaId rid;
char csnstr[CSN_STRSIZE];
- char *ridstr;
char *token = NULL;
- ReplicaId rid;
+ char *forcing;
+ char *csnpart;
+ char *ridstr;
+ char *iter;
int i;
for(i = 0; i < CLEANRIDSIZ && clean_vals[i]; i++){
@@ -1833,7 +1828,6 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
/*
* 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);
@@ -1851,15 +1845,18 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
maxcsn = csn_new();
csn_init_by_string(maxcsn, csnpart);
csn_as_string(maxcsn, PR_FALSE, csnstr);
- add_cleaned_rid(rid, r, csnstr);
+ forcing = ldap_utf8strtok_r(iter, ":", &iter);
+ if(forcing == NULL){
+ forcing = "no";
+ }
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);
+ ridstr = slapi_ch_smprintf("%d:%s:%s:%s", rid, slapi_sdn_get_dn(replica_get_root(r)), csnstr, forcing);
+ payload = create_cleanruv_payload(ridstr);
slapi_ch_free_string(&ridstr);
if(payload == NULL){
@@ -1882,8 +1879,10 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
data->rid = rid;
data->task = NULL;
data->maxcsn = maxcsn;
- data->sdn = slapi_sdn_dup(r->repl_root);
data->payload = payload;
+ data->sdn = slapi_sdn_dup(r->repl_root);
+ data->force = slapi_ch_strdup(forcing);
+ data->repl_root = NULL;
thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_thread_ext,
(void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
@@ -1895,11 +1894,11 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
csn_free(&maxcsn);
slapi_sdn_free(&data->sdn);
ber_bvfree(data->payload);
+ slapi_ch_free_string(&data->force);
slapi_ch_free((void **)&data);
}
}
}
- r->repl_cleanruv_data[i] = NULL;
done:
slapi_ch_array_free(clean_vals);
@@ -1909,13 +1908,12 @@ done:
{
PRThread *thread = NULL;
struct berval *payload;
- CSN *maxcsn = NULL;
- char *iter;
+ ReplicaId rid;
+ char *certify = NULL;
char *ridstr = NULL;
- char *repl_root;
char *token = NULL;
- char *certify = NULL;
- ReplicaId rid;
+ char *repl_root;
+ char *iter;
int i;
for(i = 0; clean_vals[i]; i++){
@@ -1926,21 +1924,27 @@ done:
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);
+ "aborting abort task.\n", rid);
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]);
+ "data (%s), aborting abort task.\n",clean_vals[i]);
goto done2;
}
repl_root = ldap_utf8strtok_r(iter, ":", &iter);
certify = ldap_utf8strtok_r(iter, ":", &iter);
+
+ if(!is_cleaned_rid(rid)){
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: replica id(%d) is not "
+ "being cleaned, nothing to abort. Aborting abort task.\n", rid);
+ delete_aborted_rid(r, rid, repl_root, 0);
+ goto done2;
+ }
+
+ add_aborted_rid(rid, r, repl_root);
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);
@@ -1951,8 +1955,8 @@ done:
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);
+ ridstr = slapi_ch_smprintf("%d:%s:%s", rid, repl_root, certify);
+ payload = create_cleanruv_payload(ridstr);
slapi_ch_free_string(&ridstr);
if(payload == NULL){
@@ -2583,7 +2587,7 @@ replica_ruv_smods_for_op( Slapi_PBlock *pb, char **uniqueid, Slapi_Mods **smods
must use the CLEANRUV task instead */
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_ruv_smods_for_op: attempted to directly modify the tombstone RUV "
- "entry [%s] - use the CLEANRUV task instead\n",
+ "entry [%s] - use the CLEANALLRUV task instead\n",
slapi_entry_get_dn_const(target_entry));
return (-1);
}
@@ -3430,7 +3434,7 @@ 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))
+ if ((rc != LDAP_NO_SUCH_OBJECT && rc != LDAP_TYPE_OR_VALUE_EXISTS) || !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 "
@@ -3794,69 +3798,3 @@ 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 */
- if( i < CLEANRIDSIZ){
- r->repl_cleanruv_data[i] = slapi_ch_strdup(val); /* append to list */
- r->repl_cleanruv_data[i + 1] = 0;
- }
-
- 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 c5ca965..0fd785b 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -64,6 +64,7 @@
int slapi_log_urp = SLAPI_LOG_REPL;
static ReplicaId cleaned_rids[CLEANRIDSIZ + 1] = {0};
+static ReplicaId pre_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;
@@ -84,20 +85,27 @@ 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, Slapi_Task *task, char *returntext);
+static int replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, const char *force_cleaning, char *returntext);
static void replica_cleanallruv_thread(void *arg);
-static void replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task);
+static void replica_send_cleanruv_task(Repl_Agmt *agmt, cleanruv_data *clean_data);
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 check_agmts_are_caught_up(cleanruv_data *data, char *maxcsn);
+static int replica_cleanallruv_send_extop(Repl_Agmt *ra, cleanruv_data *data, 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_check_maxcsn(Repl_Agmt *agmt, char *basedn, 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 replica_cleanallruv_check_ruv(char *repl_root, 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 void delete_cleaned_rid_config(cleanruv_data *data);
+static int replica_cleanallruv_is_finished(Repl_Agmt *agmt, char *filter, Slapi_Task *task);
+static void check_replicas_are_done_cleaning(cleanruv_data *data);
+static void check_replicas_are_done_aborting(cleanruv_data *data );
+static CSN* replica_cleanallruv_find_maxcsn(Replica *replica, ReplicaId rid, char *basedn);
+static int replica_cleanallruv_get_replica_maxcsn(Repl_Agmt *agmt, char *rid_text, char *basedn, CSN **csn);
+static void preset_cleaned_rid(ReplicaId rid);
static multimaster_mtnode_extension * _replica_config_get_mtnode_ext (const Slapi_Entry *e);
/*
@@ -385,6 +393,12 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
if (apply_mods)
replica_set_legacy_consumer (r, PR_FALSE);
}
+ else if (strcasecmp (config_attr, type_replicaCleanRUV) == 0 ||
+ strcasecmp (config_attr, type_replicaAbortCleanRUV) == 0)
+ {
+ /* only allow the deletion of the cleanAllRUV config attributes */
+ continue;
+ }
else
{
*returncode = LDAP_UNWILLING_TO_PERFORM;
@@ -891,7 +905,7 @@ static int replica_execute_task (Object *r, const char *task_name, char *returnt
if (apply_mods)
{
Slapi_Task *empty_task = NULL;
- return replica_execute_cleanall_ruv_task(r, (ReplicaId)temprid, empty_task, returntext);
+ return replica_execute_cleanall_ruv_task(r, (ReplicaId)temprid, empty_task, returntext, "no");
}
else
return LDAP_SUCCESS;
@@ -1225,35 +1239,52 @@ replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
Slapi_Task *task = NULL;
const Slapi_DN *task_dn;
Slapi_DN *dn = NULL;
+ ReplicaId rid;
Object *r;
+ const char *force_cleaning;
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));
+ task_dn = slapi_entry_get_sdn(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;
}
-
/*
* Get our task settings
*/
if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Missing replica-base-dn attribute");
+ cleanruv_log(task, CLEANALLRUV_ID, "%s", returntext);
*returncode = LDAP_OBJECT_CLASS_VIOLATION;
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
if ((rid_str = fetch_attr(e, "replica-id", 0)) == NULL){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Missing replica-id attribute");
+ cleanruv_log(task, CLEANALLRUV_ID, "%s", returntext);
*returncode = LDAP_OBJECT_CLASS_VIOLATION;
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
- task_dn = slapi_entry_get_sdn(e);
+ if ((force_cleaning = fetch_attr(e, "replica-force-cleaning", 0)) != NULL){
+ if(strcasecmp(force_cleaning,"yes") != 0 && strcasecmp(force_cleaning,"no") != 0){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Invalid value for replica-force-cleaning "
+ "(%s). Value must be \"yes\" or \"no\" for task - (%s)",
+ force_cleaning, slapi_sdn_get_dn(task_dn));
+ cleanruv_log(task, CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ } else {
+ force_cleaning = "no";
+ }
/*
* Check the rid
*/
@@ -1266,6 +1297,14 @@ replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
+ if(is_cleaned_rid(rid)){
+ /* we are already cleaning this rid */
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Replica id (%d) is already being cleaned", rid);
+ cleanruv_log(task, CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
/*
* Get the replica object
*/
@@ -1279,7 +1318,7 @@ replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
}
/* clean the RUV's */
- rc = replica_execute_cleanall_ruv_task (r, rid, task, returntext);
+ rc = replica_execute_cleanall_ruv_task (r, rid, task, force_cleaning, returntext);
out:
if(rc){
@@ -1302,31 +1341,36 @@ out:
*
*/
static int
-replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, char *returntext)
+replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, const char* force_cleaning, char *returntext)
{
- PRThread *thread = NULL;
+ struct berval *payload = NULL;
Slapi_Task *pre_task = NULL; /* this is supposed to be null for logging */
- Replica *replica;
- Object *ruv_obj;
cleanruv_data *data = NULL;
+ PRThread *thread = NULL;
CSN *maxcsn = NULL;
- const RUV *ruv;
- struct berval *payload = NULL;
- char *ridstr = NULL;
+ Replica *replica;
char csnstr[CSN_STRSIZE];
+ char *ridstr = NULL;
+ char *basedn = NULL;
int rc = 0;
+ cleanruv_log(pre_task, CLEANALLRUV_ID,"Initiating CleanAllRUV Task...");
+
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);
return LDAP_UNWILLING_TO_PERFORM;
}
-
/*
* Grab the replica
*/
- replica = (Replica*)object_get_data (r);
+ if(r){
+ replica = (Replica*)object_get_data (r);
+ } else {
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Replica object is NULL, aborting task");
+ return -1;
+ }
/*
* Check if this is a consumer
*/
@@ -1342,32 +1386,25 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, c
/*
* 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);
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Retrieving maxcsn...");
+ basedn = (char *)slapi_sdn_get_dn(replica_get_root(replica));
+ maxcsn = replica_cleanallruv_find_maxcsn(replica, rid, basedn);
+ 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);
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Found maxcsn (%s)",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);
+ ridstr = slapi_ch_smprintf("%d:%s:%s:%s", rid, basedn, csnstr, force_cleaning);
+ payload = create_cleanruv_payload(ridstr);
slapi_ch_free_string(&ridstr);
if(payload == NULL){
@@ -1389,15 +1426,19 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, c
data->replica = replica;
data->rid = rid;
data->task = task;
- data->maxcsn = maxcsn;
data->payload = payload;
data->sdn = NULL;
+ data->maxcsn = maxcsn;
+ data->repl_root = slapi_ch_strdup(basedn);
+ data->force = slapi_ch_strdup(force_cleaning);
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;
+ slapi_ch_free_string(&data->force);
+ slapi_ch_free_string(&data->repl_root);
goto fail;
} else {
goto done;
@@ -1441,11 +1482,11 @@ replica_cleanallruv_thread_ext(void *arg)
static void
replica_cleanallruv_thread(void *arg)
{
- Object *ruv_obj = NULL;
+ cleanruv_data *data = arg;
Object *agmt_obj = NULL;
+ Object *ruv_obj = NULL;
Repl_Agmt *agmt = NULL;
RUV *ruv = NULL;
- cleanruv_data *data = arg;
char csnstr[CSN_STRSIZE];
char *returntext = NULL;
char *rid_text = NULL;
@@ -1466,7 +1507,7 @@ replica_cleanallruv_thread(void *arg)
* the backends might not be online yet.
*/
PR_Lock( notify_lock );
- PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(5) );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(10) );
PR_Unlock( notify_lock );
data->repl_obj = replica_get_replica_from_dn(data->sdn);
if(data->repl_obj == NULL){
@@ -1488,17 +1529,25 @@ replica_cleanallruv_thread(void *arg)
aborted = 1;
goto done;
}
+ if(data->repl_root == NULL){
+ /* we must have resumed from start up, fill in the repl root */
+ data->repl_root = slapi_ch_strdup(slapi_sdn_get_dn(replica_get_root(data->replica)));
+ }
if(data->task){
slapi_task_begin(data->task, 1);
}
- rid_text = slapi_ch_smprintf("{replica %d ldap", data->rid);
+ /*
+ * Presetting the rid prevents duplicate thread creation, but allows the db and changelog to still
+ * process updates from the rid. set_cleaned_rid() blocks updates, so we don't want to do that... yet.
+ */
+ preset_cleaned_rid(data->rid);
+ rid_text = slapi_ch_smprintf("%d", data->rid);
csn_as_string(data->maxcsn, PR_FALSE, csnstr);
-
/*
* Add the cleanallruv task to the repl config - so we can handle restarts
*/
+ add_cleaned_rid(data->rid, data->replica, csnstr, data->force); /* marks config that we started cleaning a rid */
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
*/
@@ -1506,7 +1555,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_cleanallruv(ruv,data->maxcsn)){
+ if(csn_get_replicaid(data->maxcsn) == 0 || ruv_covers_csn_cleanallruv(ruv,data->maxcsn) || strcasecmp(data->force,"yes") == 0){
/* We are caught up, now we can clean the ruv's */
break;
}
@@ -1517,6 +1566,8 @@ replica_cleanallruv_thread(void *arg)
object_release(ruv_obj);
/*
* Next, make sure all the replicas are up and running before sending off the clean ruv tasks
+ *
+ * Even if we are forcing the cleaning, the replicas still need to be up
*/
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)){
@@ -1528,7 +1579,7 @@ replica_cleanallruv_thread(void *arg)
* 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)){
+ if(strcasecmp(data->force,"no") == 0 && check_agmts_are_caught_up(data, csnstr)){
/* error, aborted or shutdown */
aborted = 1;
goto done;
@@ -1555,10 +1606,11 @@ replica_cleanallruv_thread(void *arg)
agmt_not_notified = 0;
continue;
}
- if(replica_cleanallruv_send_extop(agmt, data->rid, data->task, data->payload, 1) == 0){
+ if(replica_cleanallruv_send_extop(agmt, data, 1) == 0){
agmt_not_notified = 0;
} else {
agmt_not_notified = 1;
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Failed to send task to replica (%s)",agmt_get_long_name(agmt));
break;
}
agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
@@ -1609,10 +1661,11 @@ replica_cleanallruv_thread(void *arg)
found_dirty_rid = 0;
continue;
}
- if(replica_cleanallruv_check_ruv(agmt, rid_text, data->task) == 0){
+ if(replica_cleanallruv_check_ruv(data->repl_root, agmt, rid_text, data->task) == 0){
found_dirty_rid = 0;
} else {
found_dirty_rid = 1;
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Replica is not cleaned yet (%s)",agmt_get_long_name(agmt));
break;
}
agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
@@ -1623,7 +1676,7 @@ replica_cleanallruv_thread(void *arg)
goto done;
}
if(found_dirty_rid == 0){
- break;
+ break;
}
/*
* need to sleep between passes
@@ -1647,9 +1700,11 @@ done:
*/
if(!aborted){
trigger_cl_trimming(data->rid);
- delete_cleaned_rid(data->replica, data->rid, data->maxcsn);
+ delete_cleaned_rid_config(data);
+ /* make sure all the replicas have been "pre_cleaned" before finishing */
+ check_replicas_are_done_cleaning(data);
cleanruv_log(data->task, CLEANALLRUV_ID, "Successfully cleaned rid(%d).", data->rid);
- slapi_task_finish(data->task, rc);
+ remove_cleaned_rid(data->rid);
} else {
/*
* Shutdown or abort
@@ -1658,29 +1713,189 @@ done:
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);
+ delete_cleaned_rid_config(data);
+ remove_cleaned_rid(data->rid);
}
}
-
+ if(data->task){
+ slapi_task_finish(data->task, rc);
+ }
if(data->payload){
ber_bvfree(data->payload);
}
if(data->repl_obj && free_obj){
object_release(data->repl_obj);
}
+ csn_free(&data->maxcsn);
slapi_sdn_free(&data->sdn);
+ slapi_ch_free_string(&data->repl_root);
+ slapi_ch_free_string(&data->force);
slapi_ch_free_string(&rid_text);
- csn_free(&data->maxcsn);
slapi_ch_free((void **)&data);
}
/*
+ * Loop over the agmts, and check if they are in the last phase of cleaning, meaning they have
+ * released cleanallruv data from the config
+ */
+static void
+check_replicas_are_done_cleaning(cleanruv_data *data )
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ char csnstr[CSN_STRSIZE];
+ char *filter = NULL;
+ int not_all_cleaned = 1;
+ int interval = 10;
+
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Waiting for all the replicas to finish cleaning...");
+
+ csn_as_string(data->maxcsn, PR_FALSE, csnstr);
+ filter = PR_smprintf("(%s=%d:%s:%s)", type_replicaCleanRUV,(int)data->rid, csnstr, data->force);
+ while(not_all_cleaned && !is_task_aborted(data->rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
+ if(agmt_obj == NULL){
+ not_all_cleaned = 0;
+ break;
+ }
+ while (agmt_obj && !slapi_is_shutting_down()){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt) || get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ not_all_cleaned = 0;
+ continue;
+ }
+ if(replica_cleanallruv_is_finished(agmt, filter, data->task) == 0){
+ not_all_cleaned = 0;
+ } else {
+ not_all_cleaned = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ }
+ if(not_all_cleaned == 0 || is_task_aborted(data->rid) ){
+ break;
+ }
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Not all replicas finished cleaning, 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(&filter);
+}
+
+/*
+ * Search this replica for the nsds5ReplicaCleanruv attribute, we don't return
+ * an entry, we know it has finished cleaning.
+ */
+static int
+replica_cleanallruv_is_finished(Repl_Agmt *agmt, char *filter, Slapi_Task *task)
+{
+ Repl_Connection *conn = NULL;
+ ConnResult crc = 0;
+ struct berval *payload = NULL;
+ int msgid = 0;
+ int rc = -1;
+
+ if((conn = conn_new(agmt)) == NULL){
+ return -1;
+ }
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ payload = create_cleanruv_payload(filter);
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_CHECK_STATUS_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
+
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ char *response = NULL;
+
+ decode_cleanruv_payload(retsdata, &response);
+ if(response && strcmp(response,CLEANRUV_FINISHED) == 0){
+ /* finished cleaning */
+ rc = 0;
+ }
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
+ slapi_ch_free_string(&response);
+ slapi_ch_free_string(&retoid);
+ }
+ }
+ } else {
+ rc = -1;
+ }
+ conn_delete_internal_ext(conn);
+ if(payload)
+ ber_bvfree(payload);
+
+ return rc;
+}
+
+/*
+ * Loop over the agmts, and check if they are in the last phase of aborting, meaning they have
+ * released the abort cleanallruv data from the config
+ */
+static void
+check_replicas_are_done_aborting(cleanruv_data *data )
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ char *filter = NULL;
+ int not_all_aborted = 1;
+ int interval = 10;
+
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID,"Waiting for all the replicas to finish aborting...");
+
+ filter = PR_smprintf("(%s=%d:%s)", type_replicaAbortCleanRUV, data->rid, data->repl_root);
+
+ while(not_all_aborted && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
+ if(agmt_obj == NULL){
+ not_all_aborted = 0;
+ break;
+ }
+ while (agmt_obj && !slapi_is_shutting_down()){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ not_all_aborted = 0;
+ continue;
+ }
+ if(replica_cleanallruv_is_finished(agmt, filter, data->task) == 0){
+ not_all_aborted = 0;
+ } else {
+ not_all_aborted = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ }
+ if(not_all_aborted == 0){
+ break;
+ }
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Not all replicas finished aborting, 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(&filter);
+}
+
+/*
* 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)
+check_agmts_are_caught_up(cleanruv_data *data, char *maxcsn)
{
Object *agmt_obj;
Repl_Agmt *agmt;
@@ -1688,10 +1903,10 @@ check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_T
int not_all_caughtup = 1;
int interval = 10;
- rid_text = slapi_ch_smprintf("{replica %d ldap", rid);
+ rid_text = slapi_ch_smprintf("%d", data->rid);
- while(not_all_caughtup && !is_task_aborted(rid) && !slapi_is_shutting_down()){
- agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
+ while(not_all_caughtup && !is_task_aborted(data->rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
if(agmt_obj == NULL){
not_all_caughtup = 0;
break;
@@ -1699,23 +1914,24 @@ check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_T
while (agmt_obj){
agmt = (Repl_Agmt*)object_get_data (agmt_obj);
if(!agmt_is_enabled(agmt) || get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
not_all_caughtup = 0;
continue;
}
- if(replica_cleanallruv_check_maxcsn(agmt, rid_text, maxcsn, task) == 0){
+ if(replica_cleanallruv_check_maxcsn(agmt, data->repl_root, rid_text, maxcsn, data->task) == 0){
not_all_caughtup = 0;
} else {
not_all_caughtup = 1;
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Replica not caught up (%s)",agmt_get_long_name(agmt));
break;
}
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- } /* agmt while */
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ }
- if(not_all_caughtup == 0 || is_task_aborted(rid) ){
+ if(not_all_caughtup == 0 || is_task_aborted(data->rid) ){
break;
}
- cleanruv_log(task, CLEANALLRUV_ID, "Not all replicas caught up, retrying in %d seconds",interval);
+ cleanruv_log(data->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 );
@@ -1728,7 +1944,7 @@ check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_T
}
slapi_ch_free_string(&rid_text);
- if(is_task_aborted(rid)){
+ if(is_task_aborted(data->rid)){
return -1;
}
@@ -1763,6 +1979,7 @@ check_agmts_are_alive(Replica *replica, ReplicaId rid, Slapi_Task *task)
not_all_alive = 0;
} else {
not_all_alive = 1;
+ cleanruv_log(task, CLEANALLRUV_ID, "Replica not online (%s)",agmt_get_long_name(agmt));
break;
}
agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
@@ -1793,7 +2010,7 @@ check_agmts_are_alive(Replica *replica, ReplicaId rid, Slapi_Task *task)
* Create the CLEANALLRUV extended op payload
*/
struct berval *
-create_ruv_payload(char *value)
+create_cleanruv_payload(char *value)
{
struct berval *req_data = NULL;
BerElement *tmp_bere = NULL;
@@ -1801,10 +2018,7 @@ create_ruv_payload(char *value)
if ((tmp_bere = der_alloc()) == NULL){
goto error;
}
- if (ber_printf(tmp_bere, "{s", value) == -1){
- goto error;
- }
- if (ber_printf(tmp_bere, "}") == -1){
+ if (ber_printf(tmp_bere, "{s}", value) == -1){
goto error;
}
if (ber_flatten(tmp_bere, &req_data) == -1){
@@ -1832,7 +2046,7 @@ done:
* the CLEANALLRUV task.
*/
static void
-replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
+replica_send_cleanruv_task(Repl_Agmt *agmt, cleanruv_data *clean_data)
{
Repl_Connection *conn;
ConnResult crc = 0;
@@ -1859,7 +2073,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
conn_delete_internal_ext(conn);
return;
}
- val.bv_len = PR_snprintf(data, sizeof(data), "CLEANRUV%d", rid);
+ val.bv_len = PR_snprintf(data, sizeof(data), "CLEANRUV%d", clean_data->rid);
sdn = agmt_get_replarea(agmt);
mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
mod.mod_type = "nsds5task";
@@ -1876,7 +2090,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
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 "
+ cleanruv_log(clean_data->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);
}
@@ -1906,6 +2120,23 @@ is_cleaned_rid(ReplicaId rid)
}
int
+is_pre_cleaned_rid(ReplicaId rid)
+{
+ int i;
+
+ slapi_rwlock_rdlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ && pre_cleaned_rids[i] != 0; i++){
+ if(rid == pre_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;
@@ -1924,6 +2155,22 @@ is_task_aborted(ReplicaId rid)
return 0;
}
+static void
+preset_cleaned_rid(ReplicaId rid)
+{
+ int i;
+
+ slapi_rwlock_wrlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ; i++){
+ if(pre_cleaned_rids[i] == 0){
+ pre_cleaned_rids[i] = rid;
+ pre_cleaned_rids[i + 1] = 0;
+ break;
+ }
+ }
+ slapi_rwlock_unlock(rid_lock);
+}
+
/*
* 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
@@ -1948,7 +2195,7 @@ set_cleaned_rid(ReplicaId rid)
* Add the rid and maxcsn to the repl config (so we can resume after a server restart)
*/
void
-add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
+add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn, char *forcing)
{
Slapi_PBlock *pb;
struct berval *vals[2];
@@ -1965,7 +2212,7 @@ add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
/*
* Write the rid & maxcsn to the config entry
*/
- val.bv_len = PR_snprintf(data, sizeof(data),"%d:%s", rid, maxcsn);
+ val.bv_len = PR_snprintf(data, sizeof(data),"%d:%s:%s", rid, maxcsn, forcing);
dn = replica_get_dn(r);
pb = slapi_pblock_new();
mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
@@ -1977,13 +2224,11 @@ add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
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 && rc != LDAP_TYPE_OR_VALUE_EXISTS){
+ if (rc != LDAP_SUCCESS && rc != LDAP_TYPE_OR_VALUE_EXISTS && rc != LDAP_NO_SUCH_OBJECT){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to update replica "
"config (%d), rid (%d)\n", rc, rid);
}
@@ -2036,7 +2281,7 @@ add_aborted_rid(ReplicaId rid, Replica *r, char *repl_root)
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 && rc != LDAP_NO_SUCH_OBJECT){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to update "
"replica config (%d), rid (%d)\n", rc, rid);
}
@@ -2047,7 +2292,7 @@ add_aborted_rid(ReplicaId rid, Replica *r, char *repl_root)
}
void
-delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root){
+delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root, int skip){
Slapi_PBlock *pb;
LDAPMod *mods[2];
LDAPMod mod;
@@ -2061,117 +2306,126 @@ delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root){
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];
+ if(skip){
+ /* skip the deleting of the config, and just remove the in memory rid */
+ 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);
+ } else {
+ /* only remove the config, leave the in-memory rid */
+ 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_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
+ if (rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_OBJECT){
+ 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);
}
- slapi_rwlock_unlock(abort_rid_lock);
+}
+
+/*
+ * Just remove the dse.ldif config, but we need to keep the cleaned rids in memory until we know we are done
+ */
+static void
+delete_cleaned_rid_config(cleanruv_data *clean_data)
+{
+ Slapi_PBlock *pb;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ struct berval *vals[2];
+ struct berval val;
+ char data[CSN_STRSIZE + 15];
+ char csnstr[CSN_STRSIZE];
+ char *dn;
+ int rc;
+
/*
* Prepare the mods for the config entry
*/
- dn = replica_get_dn(r);
+ csn_as_string(clean_data->maxcsn, PR_FALSE, csnstr);
+ val.bv_len = PR_snprintf(data, sizeof(data), "%d:%s:%s", (int)clean_data->rid, csnstr, clean_data->force);
+ dn = replica_get_dn(clean_data->replica);
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_type = (char *)type_replicaCleanRUV;
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 remove replica "
- "config (%d), rid (%d)\n", rc, rid);
- }
- slapi_pblock_destroy (pb);
- slapi_ch_free_string(&dn);
- slapi_ch_free_string(&data);
-}
+ /*
+ * When aborting a task, we don't know if the "force" option was used.
+ * So we assume it is set to "no", but if this op fails, we'll try "yes"
+ */
+ slapi_pblock_destroy (pb);
+ pb = slapi_pblock_new();
+ memset(data,'0',sizeof(data));
+ val.bv_len = PR_snprintf(data, sizeof(data), "%d:%s:yes", (int)clean_data->rid, csnstr);
+ 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 && rc != LDAP_NO_SUCH_OBJECT){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to remove replica config "
+ "(%d), rid (%d)\n", rc, clean_data->rid);
+ }
+ }
+ slapi_pblock_destroy (pb);
+ slapi_ch_free_string(&dn);
+ }
/*
* Remove the rid from our list, and the config
*/
void
-delete_cleaned_rid(Replica *r, ReplicaId rid, CSN *maxcsn)
+remove_cleaned_rid(ReplicaId rid)
{
- 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) || get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
- 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);
+ /* now do the preset cleaned rids */
+ for(i = 0; i < CLEANRIDSIZ && pre_cleaned_rids[i] != rid; i++); /* found rid, stop */
+ for(; i < CLEANRIDSIZ; i++){
+ /* rewrite entire array */
+ pre_cleaned_rids[i] = pre_cleaned_rids[i + 1];
}
+
+ slapi_rwlock_unlock(rid_lock);
}
/*
@@ -2181,18 +2435,17 @@ int
replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
int *returncode, char *returntext, void *arg)
{
- PRThread *thread = NULL;
struct berval *payload = NULL;
- Slapi_Task *task = NULL;
- Replica *replica;
- ReplicaId rid;
cleanruv_data *data = NULL;
+ PRThread *thread = NULL;
+ Slapi_Task *task = NULL;
Slapi_DN *sdn = NULL;
+ Replica *replica;
+ ReplicaId rid;;
Object *r;
- CSN *maxcsn = NULL;
+ const char *certify_all;
const char *base_dn;
const char *rid_str;
- const char *certify_all;
char *ridstr = NULL;
int rc = SLAPI_DSE_CALLBACK_OK;
@@ -2216,13 +2469,6 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
- if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
- PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Missing required attr \"replica-base-dn\"");
- cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
- *returncode = LDAP_OBJECT_CLASS_VIOLATION;
- rc = SLAPI_DSE_CALLBACK_ERROR;
- goto out;
- }
certify_all = fetch_attr(e, "replica-certify-all", 0);
/*
* Check the rid
@@ -2236,6 +2482,29 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
+ if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Missing required attr \"replica-base-dn\"");
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_OBJECT_CLASS_VIOLATION;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ if(!is_cleaned_rid(rid) && !is_pre_cleaned_rid(rid)){
+ /* we are not cleaning this rid */
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Replica id (%d) is not being cleaned, nothing to abort.", rid);
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ if(is_task_aborted(rid)){
+ /* we are already aborting this rid */
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Replica id (%d) is already being aborted", rid);
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
/*
* Get the replica object
*/
@@ -2248,7 +2517,7 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
goto out;
}
/*
- * Check verify value
+ * Check certify value
*/
if(certify_all){
if(strcasecmp(certify_all,"yes") && strcasecmp(certify_all,"no")){
@@ -2260,13 +2529,13 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
goto out;
}
} else {
- certify_all = "no";
+ certify_all = "yes";
}
/*
* Create payload
*/
ridstr = slapi_ch_smprintf("%d:%s:%s", rid, base_dn, certify_all);
- payload = create_ruv_payload(ridstr);
+ payload = create_cleanruv_payload(ridstr);
if(payload == NULL){
cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Failed to create extended op payload, aborting task");
@@ -2278,8 +2547,6 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
* 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();
/*
@@ -2308,11 +2575,11 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
object_release(r);
cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Unable to create abort thread. Aborting task.");
*returncode = LDAP_OPERATIONS_ERROR;
+ slapi_ch_free_string(&data->certify);
rc = SLAPI_DSE_CALLBACK_ERROR;
}
out:
- csn_free(&maxcsn);
slapi_ch_free_string(&ridstr);
slapi_sdn_free(&sdn);
@@ -2337,6 +2604,8 @@ replica_abort_task_thread(void *arg)
int interval = 10;
int release_it = 0;
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Aborting task for rid(%d)...",data->rid);
+
/*
* Need to build the replica from the dn
*/
@@ -2414,8 +2683,12 @@ done:
/*
* 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);
+ delete_aborted_rid(data->replica, data->rid, data->repl_root, 1); /* delete just the config, leave rid in memory */
+ if(strcasecmp(data->certify, "yes") == 0){
+ check_replicas_are_done_aborting(data);
+ }
+ delete_aborted_rid(data->replica, data->rid, data->repl_root, 0); /* remove the in-memory aborted rid */
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Successfully aborted task for rid(%d)", data->rid);
}
if(data->task){
slapi_task_finish(data->task, agmt_not_notified);
@@ -2437,10 +2710,10 @@ replica_cleanallruv_send_abort_extop(Repl_Agmt *ra, Slapi_Task *task, struct ber
Repl_Connection *conn = NULL;
ConnResult crc = 0;
int msgid = 0;
- int rc = 0;
+ int rc = -1;
if((conn = conn_new(ra)) == NULL){
- return -1;
+ return rc;
}
if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
crc = conn_send_extended_operation(conn, REPL_ABORT_CLEANRUV_OID, payload, NULL, &msgid);
@@ -2462,186 +2735,262 @@ replica_cleanallruv_send_abort_extop(Repl_Agmt *ra, Slapi_Task *task, struct ber
static int
-replica_cleanallruv_send_extop(Repl_Agmt *ra, ReplicaId rid, Slapi_Task *task, struct berval *payload, int check_result)
+replica_cleanallruv_send_extop(Repl_Agmt *ra, cleanruv_data *clean_data, int check_result)
{
Repl_Connection *conn = NULL;
ConnResult crc = 0;
int msgid = 0;
- int rc = 0;
+ int rc = -1;
if((conn = conn_new(ra)) == NULL){
- return -1;
+ return rc;
}
if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
- crc = conn_send_extended_operation(conn, REPL_CLEANRUV_OID, payload, NULL, &msgid);
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_OID, clean_data->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...",
+ char *response = NULL;
+
+ decode_cleanruv_payload(retsdata, &response);
+ if(response && strcmp(response,CLEANRUV_ACCEPTED) == 0){
+ /* extop was accepted */
+ rc = 0;
+ } else {
+ cleanruv_log(clean_data->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;
+ replica_send_cleanruv_task(ra, clean_data);
}
- if (NULL != retoid)
- ldap_memfree(retoid);
if (NULL != retsdata)
ber_bvfree(retsdata);
+ slapi_ch_free_string(&retoid);
+ slapi_ch_free_string(&response);
}
- 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 CSN*
+replica_cleanallruv_find_maxcsn(Replica *replica, ReplicaId rid, char *basedn)
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ char *rid_text;
+ CSN *maxcsn = NULL, *topcsn = NULL;
+ int done = 1, found = 0;
+ int interval = 10;
+
+ rid_text = slapi_ch_smprintf("%d", rid);
+
+ while(done && !is_task_aborted(rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (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) || get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ done = 0;
+ continue;
+ }
+ if(replica_cleanallruv_get_replica_maxcsn(agmt, rid_text, basedn, &maxcsn) == 0){
+ if(maxcsn == NULL){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ continue;
+ }
+ found = 1;
+ if(topcsn == NULL){
+ topcsn = maxcsn;
+ } else {
+ if(csn_compare(topcsn, maxcsn) < 0){
+ csn_free(&topcsn);
+ topcsn = maxcsn;
+ } else {
+ csn_free(&maxcsn);
+ }
+ }
+ done = 0;
+ } else {
+ done = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ } /* agmt while */
+ if(done == 0 || is_task_aborted(rid) ){
+ break;
+ }
+ if(!found){
+ /* we could not find any maxcsn's - already cleaned? */
+ return NULL;
+ }
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: replica_cleanallruv_find_maxcsn: Not all replicas online, retrying in %d seconds\n",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);
+
+ if(is_task_aborted(rid)){
+ return NULL;
+ }
+
+ return topcsn;
+}
+
static int
-replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn, Slapi_Task *task)
+replica_cleanallruv_get_replica_maxcsn(Repl_Agmt *agmt, char *rid_text, char *basedn, CSN **csn)
{
Repl_Connection *conn = NULL;
- LDAP *ld;
- Slapi_DN *sdn;
- 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;
+ ConnResult crc = -1;
+ struct berval *payload = NULL;
+ CSN *maxcsn = NULL;
+ char *data = NULL;
+ int msgid = 0;
if((conn = conn_new(agmt)) == NULL){
return -1;
}
+ data = slapi_ch_smprintf("%s:%s",rid_text, basedn);
+ payload = create_cleanruv_payload(data);
+
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;
- }
- 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(&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);
- 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;
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_GET_MAXCSN_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
+
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ char *remote_maxcsn = NULL;
+
+ decode_cleanruv_payload(retsdata, &remote_maxcsn);
+ if(remote_maxcsn && strcmp(remote_maxcsn, CLEANRUV_NO_MAXCSN)){
+ maxcsn = csn_new();
+ csn_init_by_string(maxcsn, remote_maxcsn);
+ *csn = maxcsn;
+ } else {
+ /* no csn */
+ *csn = NULL;
}
- 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 && ruv_part){
- /* 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 */
+ slapi_ch_free_string(&retoid);
+ slapi_ch_free_string(&remote_maxcsn);
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
+ }
+ }
+ }
+ conn_delete_internal_ext(conn);
+ slapi_ch_free_string(&data);
+ if(payload)
+ ber_bvfree(payload);
+
+ return (int)crc;
+}
+
+static int
+replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *basedn, char *rid_text, char *maxcsn, Slapi_Task *task)
+{
+ Repl_Connection *conn = NULL;
+ ConnResult crc = 0;
+ struct berval *payload = NULL;
+ char *data = NULL;
+ int msgid = 0;
+ int rc = -1;
+
+ if((conn = conn_new(agmt)) == NULL){
+ return -1;
+ }
+
+ data = slapi_ch_smprintf("%s:%s",rid_text, basedn);
+ payload = create_cleanruv_payload(data);
+
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_GET_MAXCSN_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
+
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ char *remote_maxcsn = NULL;
+
+ decode_cleanruv_payload(retsdata, &remote_maxcsn);
+ if(remote_maxcsn && strcmp(remote_maxcsn, CLEANRUV_NO_MAXCSN)){
+ CSN *max, *repl_max;
+
+ max = csn_new();
+ repl_max = csn_new();
+ csn_init_by_string(max, maxcsn);
+ csn_init_by_string(repl_max, remote_maxcsn);
+ if(csn_compare (repl_max, max) < 0){
+ /* we are not caught up yet, free, and return */
+ cleanruv_log(task, CLEANALLRUV_ID,"Replica maxcsn (%s) is not caught up with deleted replica's maxcsn(%s)",
+ remote_maxcsn, maxcsn);
+ rc = -1;
+ } else {
+ /* ok this replica is caught up */
rc = 0;
}
- ldap_value_free_len(vals);
+ csn_free(&max);
+ csn_free(&repl_max);
+ } else {
+ /* no remote_maxcsn - return success */
+ rc = 0;
}
- ldap_memfree( attr );
- }
- if ( ber != NULL ) {
- ber_free( ber, 0 );
- }
- }
- if(result)
- ldap_msgfree( result );
- } else {
- rc = -1;
+ slapi_ch_free_string(&retoid);
+ slapi_ch_free_string(&remote_maxcsn);
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
+ }
+ }
}
conn_delete_internal_ext(conn);
+ slapi_ch_free_string(&data);
+ if(payload)
+ ber_bvfree(payload);
- return rc;
+ return rc;
}
+
static int
replica_cleanallruv_replica_alive(Repl_Agmt *agmt)
{
Repl_Connection *conn = NULL;
LDAP *ld = NULL;
LDAPMessage *result = NULL;
- int rc = 0;
+ int rc = -1;
if((conn = conn_new(agmt)) == NULL){
- return -1;
+ return rc;
}
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 "
+ 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;
@@ -2655,8 +3004,6 @@ replica_cleanallruv_replica_alive(Repl_Agmt *agmt)
}
if(result)
ldap_msgfree( result );
- } else {
- rc = -1;
}
conn_delete_internal_ext(conn);
@@ -2664,83 +3011,51 @@ replica_cleanallruv_replica_alive(Repl_Agmt *agmt)
}
static int
-replica_cleanallruv_check_ruv(Repl_Agmt *ra, char *rid_text, Slapi_Task *task)
+replica_cleanallruv_check_ruv(char *repl_root, Repl_Agmt *agmt, 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 *sdn;
- char *attrs[2];
- char *attr = NULL;
- int rc = 0, i;
+ ConnResult crc = 0;
+ struct berval *payload = NULL;
+ char *data = NULL;
+ int msgid = 0;
+ int rc = -1;
- if((conn = conn_new(ra)) == NULL){
- return -1;
+ if((conn = conn_new(agmt)) == NULL){
+ return rc;
}
+
+ data = slapi_ch_smprintf("%s:%s",rid_text, repl_root);
+ payload = create_cleanruv_payload(data);
+
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;
- }
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_GET_MAXCSN_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
- 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(&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);
- 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);
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ char *remote_maxcsn = NULL;
+
+ decode_cleanruv_payload(retsdata, &remote_maxcsn);
+ if(remote_maxcsn && strcmp(remote_maxcsn, CLEANRUV_NO_MAXCSN)){
+ /* remote replica still has dirty RUV element */
+ rc = -1;
+ } else {
+ /* no maxcsn = we're clean */
+ rc = 0;
}
- ldap_memfree( attr );
- } /* for loop */
- if ( ber != NULL ) {
- ber_free( ber, 0 );
+ slapi_ch_free_string(&retoid);
+ slapi_ch_free_string(&remote_maxcsn);
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
}
}
-done:
- if(result)
- ldap_msgfree( result );
- } else {
- return -1;
}
conn_delete_internal_ext(conn);
+ slapi_ch_free_string(&data);
+ if(payload)
+ ber_bvfree(payload);
return rc;
}
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index 3a6f422..e842c62 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -1451,7 +1451,6 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
cleanruv_data *data;
Replica *r;
ReplicaId rid;
- CSN *maxcsn = NULL;
struct berval *extop_payload = NULL;
char *extop_oid;
char *repl_root;
@@ -1463,7 +1462,7 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
- if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_OID) != 0 ||
+ if (NULL == extop_oid || strcmp(extop_oid, REPL_ABORT_CLEANRUV_OID) != 0 ||
NULL == extop_payload || NULL == extop_payload->bv_val){
/* something is wrong, error out */
return LDAP_OPERATIONS_ERROR;
@@ -1472,24 +1471,24 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
* Decode the payload, and grab our settings
*/
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");
+ 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);
certify_all = ldap_utf8strtok_r(iter, ":", &iter);
- if(!is_cleaned_rid(rid) || is_task_aborted(rid)){
+ if(!is_cleaned_rid(rid) || !is_pre_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, "Abort cleanAllRUV task: aborting cleanallruv task for rid(%d)\n", 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, "Abort cleanAllRUV task: 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);
rc = LDAP_OPERATIONS_ERROR;
goto out;
@@ -1498,14 +1497,14 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
object_acquire (mtnode_ext->replica);
release_it = 1;
} else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: replica is missing from (%s), "
+ 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 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");
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: replica is NULL, aborting task\n");
rc = LDAP_OPERATIONS_ERROR;
goto out;
}
@@ -1514,7 +1513,7 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
*/
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 "
+ 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;
@@ -1528,11 +1527,8 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
data->repl_root = slapi_ch_strdup(repl_root);
data->certify = slapi_ch_strdup(certify_all);
/*
- * Stop the cleaning, and delete the rid
+ * Set the aborted rid and stop the cleaning
*/
- 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();
/*
@@ -1542,7 +1538,7 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
(void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
if (thread == NULL) {
- slapi_log_error( SLAPI_LOG_REPL, repl_plugin_name, "Abort cleanAllRUV task: unable to create abort "
+ slapi_log_error( SLAPI_LOG_REPL, repl_plugin_name, "Abort CleanAllRUV Task: unable to create abort "
"thread. Aborting task.\n");
release_it = 1; /* have to release mtnode_ext->replica now */
slapi_ch_free_string(&data->repl_root);
@@ -1583,10 +1579,11 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
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 *force = NULL;
+ char *extop_oid;
+ char *repl_root;
char *iter;
int release_it = 0;
int rid = 0;
@@ -1604,28 +1601,31 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
* 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");
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to decode payload. Aborting ext op\n");
goto free_and_return;
}
rid = atoi(ldap_utf8strtok_r(payload, ":", &iter));
repl_root = ldap_utf8strtok_r(iter, ":", &iter);
csnstr = ldap_utf8strtok_r(iter, ":", &iter);
+ force = ldap_utf8strtok_r(iter, ":", &iter);
+ if(force == NULL){
+ force = "no";
+ }
maxcsn = csn_new();
csn_init_by_string(maxcsn, csnstr);
/*
* If we already cleaned this server, just return success
*/
- if(is_cleaned_rid(rid)){
+ if(is_cleaned_rid(rid) || is_pre_cleaned_rid(rid) || is_task_aborted(rid)){
csn_free(&maxcsn);
rc = LDAP_SUCCESS;
goto free_and_return;
}
-
/*
* 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_task: failed to get replication node "
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to get replication node "
"from (%s), aborting operation\n", repl_root);
goto free_and_return;
}
@@ -1634,14 +1634,14 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
object_acquire (mtnode_ext->replica);
release_it = 1;
} else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica is missing from (%s), "
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: replica is missing from (%s), "
"aborting operation\n",repl_root);
goto free_and_return;
}
r = (Replica*)object_get_data (mtnode_ext->replica);
if(r == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica is NULL, aborting task\n");
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: replica is NULL, aborting task\n");
goto free_and_return;
}
@@ -1651,10 +1651,10 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
*
* This will also release mtnode_ext->replica
*/
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: launching cleanAllRUV thread...\n");
+ 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 "
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to allocate "
"cleanruv_Data\n");
goto free_and_return;
}
@@ -1664,15 +1664,19 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
data->task = NULL;
data->maxcsn = maxcsn;
data->payload = slapi_ch_bvdup(extop_payload);
+ data->force = slapi_ch_strdup(force);
+ data->repl_root = slapi_ch_strdup(repl_root);
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_task: unable to create cleanAllRUV "
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: unable to create cleanAllRUV "
"monitoring thread. Aborting task.\n");
ber_bvfree(data->payload);
data->payload = NULL;
+ slapi_ch_free_string(&data->force);
+ slapi_ch_free_string(&data->repl_root);
slapi_ch_free((void **)&data);
} else {
release_it = 0; /* thread will release data->repl_obj == mtnode_ext->replica */
@@ -1694,18 +1698,18 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
/* 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_cleanallruv(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: checking if we're caught up...\n");
+ if(ruv_covers_csn_cleanallruv(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0|| strcmp(force,"yes") == 0){
/* We are caught up */
break;
} else {
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);
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: not ruv caught up maxcsn(%s)\n", csnstr);
}
DS_Sleep(PR_SecondsToInterval(5));
}
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: we're caught up...\n");
+ 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
*/
@@ -1721,8 +1725,8 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
* 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);
+ 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);
rc = LDAP_SUCCESS;
}
@@ -1737,10 +1741,120 @@ free_and_return:
* Craft a message so we know this replica supports the task
*/
if ((resp_bere = der_alloc())){
+ ber_printf(resp_bere, "{s}", CLEANRUV_ACCEPTED);
+ 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);
+ }
+ /* tell extendop code that we have already sent the result */
+ rc = SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
+ } else {
+ rc = LDAP_OPERATIONS_ERROR;
+ }
- ber_int_t response = 1;
+ return rc;
+}
+
+/*
+ * Get the max csn for the designated repl area
+ */
+int
+multimaster_extop_cleanruv_get_maxcsn(Slapi_PBlock *pb)
+{
+ Slapi_PBlock *search_pb = NULL;
+ Slapi_Entry **entries = NULL;
+ struct berval *resp_bval = NULL;
+ struct berval *extop_payload;
+ BerElement *resp_bere = NULL;
+ char **ruv_elements = NULL;
+ char *extop_oid = NULL;
+ char *ruv_part = NULL;
+ char *base_dn = NULL;
+ char *payload = NULL;
+ char *maxcsn = NULL;
+ char *filter = NULL;
+ char *ridstr = NULL;
+ char *iter = NULL;
+ char *attrs[2];
+ int part_count = 0;
+ int rid = 0;
+ int res = 0;
+ int rc = LDAP_OPERATIONS_ERROR;
+ int i = 0;
+
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
- ber_printf(resp_bere, "{e}", response);
+ if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_GET_MAXCSN_OID) != 0 ||
+ NULL == extop_payload || NULL == extop_payload->bv_val){
+ /* something is wrong, error out */
+ goto free_and_return;
+ }
+ /*
+ * Decode the payload
+ */
+ if(decode_cleanruv_payload(extop_payload, &payload)){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Get MaxCSN Task: failed to decode payload. Aborting ext op\n");
+ goto free_and_return;
+ }
+ rid = atoi(ldap_utf8strtok_r(payload, ":", &iter));
+ base_dn = ldap_utf8strtok_r(iter, ":", &iter);
+ /*
+ * Get the maxruv from the database tombstone entry
+ */
+ filter = "(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))";
+ attrs[0] = "nsds50ruv";
+ attrs[1] = NULL;
+ ridstr = slapi_ch_smprintf("{replica %d ldap", rid);
+
+ search_pb = slapi_pblock_new();
+ slapi_search_internal_set_pb(search_pb, base_dn, LDAP_SCOPE_SUBTREE, filter, attrs, 0, NULL, NULL, repl_get_plugin_identity(PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_search_internal_pb (search_pb);
+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_RESULT, &res);
+
+ if ( LDAP_SUCCESS == res ) {
+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &entries);
+ if (NULL == entries || entries[0] == NULL) {
+ /* Hmmm, no tombstpne! Error out */
+ } else {
+ /* find the right ruv element, and find the maxcsn */
+ ruv_elements = slapi_entry_attr_get_charray(entries[0],attrs[0]);
+ for(i = 0; ruv_elements && ruv_elements[i] ; i++){
+ if(strstr(ruv_elements[i], ridstr)){
+ /* get the max csn */
+ ruv_part = ldap_utf8strtok_r(ruv_elements[i], " ", &iter);
+ for(part_count = 1; ruv_part && part_count < 5; part_count++){
+ ruv_part = ldap_utf8strtok_r(iter, " ", &iter);
+ }
+ if(part_count == 5 && ruv_part){/* we have the maxcsn */
+ maxcsn = slapi_ch_strdup(ruv_part);
+ break;
+ }
+ }
+ }
+ slapi_ch_array_free(ruv_elements);
+ }
+ } else {
+ /* internal search failed */
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Get MaxCSN Task: internal search failed (%d)\n", res);
+ }
+ if(maxcsn == NULL){
+ maxcsn = slapi_ch_strdup(CLEANRUV_NO_MAXCSN);
+ }
+ /*
+ * Send the extended op response
+ */
+ if ((resp_bere = der_alloc())){
+ ber_printf(resp_bere, "{s}", maxcsn);
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);
@@ -1760,10 +1874,96 @@ free_and_return:
rc = LDAP_OPERATIONS_ERROR;
}
+free_and_return:
+ slapi_free_search_results_internal(search_pb);
+ slapi_pblock_destroy(search_pb);
+ slapi_ch_free_string(&payload);
+ slapi_ch_free_string(&maxcsn);
+ slapi_ch_free_string(&ridstr);
+
return rc;
}
/*
+ * Search cn=config for the cleanallruv attributes (clean & abort)
+ */
+int
+multimaster_extop_cleanruv_check_status(Slapi_PBlock *pb)
+{
+ Slapi_PBlock *search_pb = NULL;
+ Slapi_Entry **entries = NULL;
+ struct berval *resp_bval = NULL;
+ struct berval *extop_payload;
+ BerElement *resp_bere = NULL;
+ char *response = NULL;
+ char *filter = NULL;
+ char *extop_oid;
+ int res = 0;
+ int rc = LDAP_OPERATIONS_ERROR;
+
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
+
+ if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_CHECK_STATUS_OID) != 0 ||
+ NULL == extop_payload || NULL == extop_payload->bv_val){
+ /* something is wrong, error out */
+ goto free_and_return;
+ }
+ /*
+ * Decode the payload - which should just be a filter
+ */
+ if(decode_cleanruv_payload(extop_payload, &filter)){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Check Status Task: failed to decode payload. Aborting ext op\n");
+ goto free_and_return;
+ }
+
+ search_pb = slapi_pblock_new();
+ slapi_search_internal_set_pb(search_pb, "cn=config", LDAP_SCOPE_SUBTREE,
+ filter, NULL, 0, NULL, NULL, repl_get_plugin_identity(PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_search_internal_pb (search_pb);
+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_RESULT, &res);
+ if ( LDAP_SUCCESS == res ) {
+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &entries);
+ if (NULL == entries || entries[0] == NULL) {
+ /* cleaning task has finished, send repsonse */
+ response = CLEANRUV_FINISHED;
+ } else {
+ response = CLEANRUV_CLEANING;
+ }
+ /*
+ * Send the extended op response
+ */
+ if ((resp_bere = der_alloc())){
+ ber_printf(resp_bere, "{s}", 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);
+ }
+ /* tell extendop code that we have already sent the result */
+ rc = SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
+ }
+ }
+
+free_and_return:
+
+ slapi_free_search_results_internal(search_pb);
+ slapi_pblock_destroy(search_pb);
+ slapi_ch_free_string(&filter);
+
+ return rc;
+}
+
+
+/*
* This plugin entry point is a noop entry
* point. It's used when registering extops that
* are only used as responses. We'll never receive
diff --git a/ldap/servers/plugins/replication/replutil.c b/ldap/servers/plugins/replication/replutil.c
index 5e8019c..d007f6c 100644
--- a/ldap/servers/plugins/replication/replutil.c
+++ b/ldap/servers/plugins/replication/replutil.c
@@ -765,33 +765,32 @@ repl_set_mtn_state_and_referrals(
ldap_free_urldesc(lud);
}
- if (!referrals_to_set) { /* deleting referrals */
- /* Set state before */
- if (!chain_on_update) {
- slapi_mtn_set_state(repl_root_sdn, (char *)mtn_state);
+ if (!referrals_to_set) { /* deleting referrals */
+ /* Set state before */
+ if (!chain_on_update) {
+ slapi_mtn_set_state(repl_root_sdn, (char *)mtn_state);
+ }
+ /* We should delete referral only if we want to set the
+ replica database in backend state mode */
+ /* if chain on update mode, go ahead and set the referrals anyway */
+ if (strcasecmp(mtn_state, STATE_BACKEND) == 0 || chain_on_update) {
+ rc = slapi_mtn_set_referral(repl_root_sdn, referrals_to_set);
+ if (rc == LDAP_NO_SUCH_ATTRIBUTE) {
+ /* we will get no such attribute (16) if we try to set the referrals to NULL if
+ there are no referrals - not an error */
+ rc = LDAP_SUCCESS;
}
- /* We should delete referral only if we want to set the
- replica database in backend state mode */
- /* if chain on update mode, go ahead and set the referrals anyway */
- if (strcasecmp(mtn_state, STATE_BACKEND) == 0 || chain_on_update) {
- rc = slapi_mtn_set_referral(repl_root_sdn, referrals_to_set);
- if (rc == LDAP_NO_SUCH_ATTRIBUTE) {
- /* we will get no such attribute (16) if we try to set the referrals to NULL if
- there are no referrals - not an error */
- rc = LDAP_SUCCESS;
- }
- }
- } else { /* Replacing */
- rc = slapi_mtn_set_referral(repl_root_sdn, referrals_to_set);
- if (rc == LDAP_SUCCESS && !chain_on_update){
- slapi_mtn_set_state(repl_root_sdn, (char *)mtn_state);
- }
- }
+ }
+ } else { /* Replacing */
+ rc = slapi_mtn_set_referral(repl_root_sdn, referrals_to_set);
+ if (rc == LDAP_SUCCESS && !chain_on_update){
+ slapi_mtn_set_state(repl_root_sdn, (char *)mtn_state);
+ }
+ }
- if (rc != LDAP_SUCCESS && rc != LDAP_TYPE_OR_VALUE_EXISTS) {
+ if (rc != LDAP_SUCCESS && rc != LDAP_TYPE_OR_VALUE_EXISTS) {
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "repl_set_mtn_referrals: could "
- "not set referrals for replica %s: %d\n",
- slapi_sdn_get_dn(repl_root_sdn), rc);
+ "not set referrals for replica %s: %d\n", slapi_sdn_get_dn(repl_root_sdn), rc);
}
charray_free(referrals_to_set);
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
index 6d2e6f6..5c9585f 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
@@ -71,6 +71,11 @@ void modify_init(modify_context *mc,struct backentry *old_entry)
int modify_apply_mods(modify_context *mc, Slapi_Mods *smods)
{
+ return modify_apply_mods_ignore_error(mc, smods, -1);
+}
+
+int modify_apply_mods_ignore_error(modify_context *mc, Slapi_Mods *smods, int error)
+{
int ret = 0;
/* Make a copy of the entry */
PR_ASSERT(mc->old_entry != NULL);
@@ -78,7 +83,7 @@ int modify_apply_mods(modify_context *mc, Slapi_Mods *smods)
mc->new_entry = backentry_dup(mc->old_entry);
PR_ASSERT(smods!=NULL);
if ( mods_have_effect (mc->new_entry->ep_entry, smods) ) {
- ret = entry_apply_mods( mc->new_entry->ep_entry, slapi_mods_get_ldapmods_byref(smods));
+ ret = entry_apply_mods_ignore_error( mc->new_entry->ep_entry, slapi_mods_get_ldapmods_byref(smods), error);
}
mc->smods= smods;
return ret;
diff --git a/ldap/servers/slapd/back-ldbm/misc.c b/ldap/servers/slapd/back-ldbm/misc.c
index a56069b..fd62df9 100644
--- a/ldap/servers/slapd/back-ldbm/misc.c
+++ b/ldap/servers/slapd/back-ldbm/misc.c
@@ -444,7 +444,7 @@ ldbm_txn_ruv_modify_context( Slapi_PBlock *pb, modify_context *mc )
modify_init( mc, bentry );
- if (modify_apply_mods( mc, smods )) {
+ if (modify_apply_mods_ignore_error( mc, smods, LDAP_TYPE_OR_VALUE_EXISTS )) {
LDAPDebug( LDAP_DEBUG_ANY, "Error: ldbm_txn_ruv_modify_context failed to apply updates to RUV entry\n",
0, 0, 0 );
rc = -1;
diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
index 48b3164..a7fb06d 100644
--- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -347,6 +347,7 @@ void modify_init(modify_context *mc,struct backentry *old_entry);
int modify_apply_mods(modify_context *mc, Slapi_Mods *smods);
int modify_term(modify_context *mc,backend *be);
int modify_switch_entries(modify_context *mc,backend *be);
+int modify_apply_mods_ignore_error(modify_context *mc, Slapi_Mods *smods, int error);
/*
* add.c
diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c
index 6339a6f..58a9d51 100644
--- a/ldap/servers/slapd/entry.c
+++ b/ldap/servers/slapd/entry.c
@@ -3259,6 +3259,12 @@ int slapi_entry_apply_mod( Slapi_Entry *e, LDAPMod *mod )
int
entry_apply_mods( Slapi_Entry *e, LDAPMod **mods )
{
+ return entry_apply_mods_ignore_error(e, mods, -1);
+}
+
+int
+entry_apply_mods_ignore_error( Slapi_Entry *e, LDAPMod **mods, int ignore_error )
+{
int err;
LDAPMod **mp = NULL;
@@ -3268,7 +3274,9 @@ entry_apply_mods( Slapi_Entry *e, LDAPMod **mods )
for ( mp = mods; mp && *mp; mp++ )
{
err = entry_apply_mod( e, *mp );
- if ( err != LDAP_SUCCESS ) {
+ if(err == ignore_error){
+ (*mp)->mod_op = LDAP_MOD_IGNORE;
+ } else if ( err != LDAP_SUCCESS ) {
break;
}
}
diff --git a/ldap/servers/slapd/slapi-private.h b/ldap/servers/slapd/slapi-private.h
index f7b4d04..ddeac62 100644
--- a/ldap/servers/slapd/slapi-private.h
+++ b/ldap/servers/slapd/slapi-private.h
@@ -331,7 +331,7 @@ int entry_next_deleted_attribute( const Slapi_Entry *e, Slapi_Attr **a);
/* entry.c */
int entry_apply_mods( Slapi_Entry *e, LDAPMod **mods );
int is_type_protected(const char *type);
-
+int entry_apply_mods_ignore_error( Slapi_Entry *e, LDAPMod **mods, int ignore_error );
int slapi_entries_diff(Slapi_Entry **old_entries, Slapi_Entry **new_entries, int testall, const char *logging_prestr, const int force_update, void *plg_id);
/* entrywsi.c */
1
0
ldap/servers/plugins/replication/cl5_api.c | 17
ldap/servers/plugins/replication/repl5.h | 29
ldap/servers/plugins/replication/repl5_agmt.c | 110 -
ldap/servers/plugins/replication/repl5_agmtlist.c | 12
ldap/servers/plugins/replication/repl5_connection.c | 7
ldap/servers/plugins/replication/repl5_init.c | 70 +
ldap/servers/plugins/replication/repl5_replica.c | 131 --
ldap/servers/plugins/replication/repl5_replica_config.c | 960 +++++++++-------
ldap/servers/plugins/replication/repl_extop.c | 265 +++-
ldap/servers/plugins/replication/replutil.c | 2
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 8
ldap/servers/slapd/back-ldbm/misc.c | 6
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 1
ldap/servers/slapd/entry.c | 13
ldap/servers/slapd/slapi-private.h | 1
15 files changed, 1002 insertions(+), 630 deletions(-)
New commits:
commit f9abb940b8c35162618dabde74a62dc37f90102b
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Fri Nov 16 10:59:57 2012 -0500
Ticket 332 - CLEANALLRUV 2.0 Testing
diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
index f7960db..6d65680 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.c
@@ -1466,13 +1466,13 @@ int cl5WriteOperation(const char *replName, const char *replGen,
}
/* Name: cl5CreateReplayIterator
- Description: creates an iterator that allows to retireve changes that should
- to be sent to the consumer identified by ruv. The iteration is peformed by
+ Description: creates an iterator that allows to retrieve changes that should
+ to be sent to the consumer identified by ruv. The iteration is performed by
repeated calls to cl5GetNextOperationToReplay.
Parameters: replica - replica whose data we wish to iterate;
ruv - consumer ruv;
iterator - iterator to be passed to cl5GetNextOperationToReplay call
- Return: CL5_SUCCESS, if function is successfull;
+ Return: CL5_SUCCESS, if function is successful;
CL5_MISSING_DATA, if data that should be in the changelog is missing
CL5_PURGED_DATA, if some data that consumer needs has been purged.
Note that the iterator can be non null if the supplier contains
@@ -1480,7 +1480,7 @@ int cl5WriteOperation(const char *replName, const char *replGen,
CL5_NOTFOUND if the consumer is up to data with respect to the supplier
CL5_BAD_DATA if invalid parameter is passed;
CL5_BAD_STATE if db has not been open;
- CL5_DB_ERROR if any other db error occured;
+ CL5_DB_ERROR if any other db error occurred;
CL5_MEMORY_ERROR if memory allocation fails.
Algorithm: Build a list of csns from consumer's and supplier's ruv. For each element
of the consumer's ruv put max csn into the csn list. For each element
@@ -1495,7 +1495,7 @@ int cl5WriteOperation(const char *replName, const char *replGen,
we can bring the consumer up to date.
Position the db cursor on the change entry that corresponds to this csn.
Hash entries are created for each replica traversed so far. sendChanges
- flag is set to FALSE for all repolicas except the last traversed.
+ flag is set to FALSE for all replicas except the last traversed.
*/
int cl5CreateReplayIteratorEx (Private_Repl_Protocol *prp, const RUV *consumerRuv,
@@ -6532,6 +6532,8 @@ cl5CleanRUV(ReplicaId rid){
CL5DBFile *file;
Object *obj;
+ slapi_rwlock_wrlock (s_cl5Desc.stLock);
+
obj = objset_first_obj(s_cl5Desc.dbFiles);
while (obj){
file = (CL5DBFile *)object_get_data(obj);
@@ -6539,6 +6541,11 @@ cl5CleanRUV(ReplicaId rid){
ruv_delete_replica(file->maxRUV, rid);
obj = objset_next_obj(s_cl5Desc.dbFiles, obj);
}
+ if (obj) {
+ object_release (obj);
+ }
+
+ slapi_rwlock_unlock (s_cl5Desc.stLock);
}
void trigger_cl_trimming(ReplicaId rid){
diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h
index 31231ac..dc03333 100644
--- a/ldap/servers/plugins/replication/repl5.h
+++ b/ldap/servers/plugins/replication/repl5.h
@@ -97,8 +97,14 @@
/* cleanallruv extended ops */
#define REPL_CLEANRUV_OID "2.16.840.1.113730.3.6.5"
#define REPL_ABORT_CLEANRUV_OID "2.16.840.1.113730.3.6.6"
-#define CLEANRUV_NOTIFIED 0
-#define CLEANRUV_RELEASED 1
+#define REPL_CLEANRUV_GET_MAXCSN_OID "2.16.840.1.113730.3.6.7"
+#define REPL_CLEANRUV_CHECK_STATUS_OID "2.16.840.1.113730.3.6.8"
+
+#define CLEANRUV_ACCEPTED "accepted"
+#define CLEANRUV_REJECTED "rejected"
+#define CLEANRUV_FINISHED "finished"
+#define CLEANRUV_CLEANING "cleaning"
+#define CLEANRUV_NO_MAXCSN "no maxcsn"
/* DS 5.0 replication protocol error codes */
#define NSDS50_REPL_REPLICA_READY 0x00 /* Replica ready, go ahead */
@@ -227,6 +233,9 @@ int multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb);
int multimaster_extop_EndNSDS50ReplicationRequest(Slapi_PBlock *pb);
int multimaster_extop_cleanruv(Slapi_PBlock *pb);
int multimaster_extop_abort_cleanruv(Slapi_PBlock *pb);
+int multimaster_extop_cleanruv_get_maxcsn(Slapi_PBlock *pb);
+int multimaster_extop_cleanruv_check_status(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);
@@ -309,6 +318,7 @@ char *agmt_get_binddn(const Repl_Agmt *ra);
struct berval *agmt_get_credentials(const Repl_Agmt *ra);
int agmt_get_bindmethod(const Repl_Agmt *ra);
Slapi_DN *agmt_get_replarea(const Repl_Agmt *ra);
+Slapi_DN *agmt_get_replarea_by_ref(const Repl_Agmt *ra);
int agmt_is_fractional(const Repl_Agmt *ra);
int agmt_is_fractional_attr(const Repl_Agmt *ra, const char *attrname);
int agmt_is_fractional_attr_total(const Repl_Agmt *ra, const char *attrname);
@@ -357,9 +367,6 @@ void agmt_set_priv (Repl_Agmt *agmt, void* priv);
int get_agmt_agreement_type ( Repl_Agmt *agmt);
void* agmt_get_connection( Repl_Agmt *ra);
int agmt_has_protocol(Repl_Agmt *agmt);
-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);
typedef struct replica Replica;
@@ -444,6 +451,7 @@ 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);
+const char* conn_get_bindmethod(Repl_Connection *conn);
/* In repl5_protocol.c */
typedef struct repl_protocol Repl_Protocol;
@@ -598,7 +606,7 @@ 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 add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn);
+void add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn, char *forcing);
int is_cleaned_rid(ReplicaId rid);
int replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
int *returncode, char *returntext, void *arg);
@@ -606,18 +614,15 @@ 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);
+void remove_cleaned_rid(ReplicaId rid);
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);
+struct berval *create_cleanruv_payload(char *value);
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);
int is_pre_cleaned_rid(ReplicaId rid);
-void delete_aborted_rid(Replica *replica, ReplicaId rid, char *repl_root);
+void delete_aborted_rid(Replica *replica, ReplicaId rid, char *repl_root, int skip);
void set_cleaned_rid(ReplicaId rid);
void set_aborted_rid(ReplicaId rid);
void cleanruv_log(Slapi_Task *task, char *task_type, char *fmt, ...);
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index c63524b..8f115d4 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -138,7 +138,6 @@ typedef struct repl5agmt {
for sync agreements or for replication session plug-in
private data for normal replication agreements */
int agreement_type;
- int cleanruv_notified[CLEANRIDSIZ + 1]; /* specifies if the replica has been notified of a CLEANALLRUV task */
} repl5agmt;
/* Forward declarations */
@@ -229,7 +228,6 @@ agmt_new_from_entry(Slapi_Entry *e)
Repl_Agmt *ra;
char *tmpstr;
Slapi_Attr *sattr;
- char **clean_vals = NULL;
char **denied_attrs = NULL;
char *auto_initialize = NULL;
@@ -388,20 +386,6 @@ agmt_new_from_entry(Slapi_Entry *e)
ra->last_init_end_time = 0UL;
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]);
- }
- if(i < CLEANRIDSIZ)
- 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);
@@ -801,6 +785,17 @@ agmt_get_replarea(const Repl_Agmt *ra)
return return_value;
}
+Slapi_DN *
+agmt_get_replarea_by_ref(const Repl_Agmt *ra)
+{
+ Slapi_DN *return_value;
+ PR_ASSERT(NULL != ra);
+ PR_Lock(ra->lock);
+ return_value = ra->replarea;
+ PR_Unlock(ra->lock);
+ return return_value;
+}
+
int
agmt_is_fractional(const Repl_Agmt *ra)
{
@@ -2458,86 +2453,3 @@ agmt_has_protocol(Repl_Agmt *agmt)
}
return 0;
}
-
-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]);
- }
- if( i < CLEANRIDSIZ )
- ra->cleanruv_notified[i + 1] = 0;
- slapi_ch_array_free(attr_vals);
- } 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 6b5dab4..7041bbc 100644
--- a/ldap/servers/plugins/replication/repl5_agmtlist.c
+++ b/ldap/servers/plugins/replication/repl5_agmtlist.c
@@ -246,7 +246,11 @@ agmtlist_modify_callback(Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry
/* we don't allow delete attribute operations unless it was issued by
the replication plugin - handled above */
if (mods[i]->mod_op & LDAP_MOD_DELETE)
- {
+ {
+ if(strcasecmp (mods[i]->mod_type, type_nsds5ReplicaCleanRUVnotified) == 0){
+ /* allow the deletion of cleanallruv agmt attr */
+ continue;
+ }
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: "
"deletion of %s attribute is not allowed\n", type_nsds5ReplicaInitialize);
*returncode = LDAP_UNWILLING_TO_PERFORM;
@@ -485,13 +489,9 @@ agmtlist_modify_callback(Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry
strcasecmp (mods[i]->mod_type, "modifiersname") == 0 ||
strcasecmp (mods[i]->mod_type, "description") == 0)
{
- /* ignore modifier's name and timestamp attributes and the description. */
+ /* ignore last mod attrs, and the description. */
continue;
}
- 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 51a2bc5..15a5f64 100644
--- a/ldap/servers/plugins/replication/repl5_connection.c
+++ b/ldap/servers/plugins/replication/repl5_connection.c
@@ -263,7 +263,6 @@ conn_delete(Repl_Connection *conn)
}
}
-
/*
* Return the last operation type processed by the connection
* object, and the LDAP error encountered.
@@ -1760,6 +1759,12 @@ bind_method_to_mech(int bindmethod)
return LDAP_SASL_SIMPLE;
}
+const char*
+conn_get_bindmethod(Repl_Connection *conn)
+{
+ return (bind_method_to_mech(conn->bindmethod));
+}
+
/*
* Check the result of an ldap BIND operation to see we it
* contains the expiration controls
diff --git a/ldap/servers/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c
index 7a80c6f..498f6c1 100644
--- a/ldap/servers/plugins/replication/repl5_init.c
+++ b/ldap/servers/plugins/replication/repl5_init.c
@@ -123,7 +123,7 @@ static char *cleanruv_oid_list[] = {
NULL
};
static char *cleanruv_name_list[] = {
- NSDS_REPL_NAME_PREFIX " Cleanruv",
+ NSDS_REPL_NAME_PREFIX " CleanAllRUV",
NULL
};
static char *cleanruv_abort_oid_list[] = {
@@ -131,9 +131,26 @@ static char *cleanruv_abort_oid_list[] = {
NULL
};
static char *cleanruv_abort_name_list[] = {
- NSDS_REPL_NAME_PREFIX " Cleanruv Abort",
+ NSDS_REPL_NAME_PREFIX " CleanAllRUV Abort",
NULL
};
+static char *cleanruv_maxcsn_oid_list[] = {
+ REPL_CLEANRUV_GET_MAXCSN_OID,
+ NULL
+};
+static char *cleanruv_maxcsn_name_list[] = {
+ NSDS_REPL_NAME_PREFIX " CleanAllRUV Retrieve MaxCSN",
+ NULL
+};
+static char *cleanruv_status_oid_list[] = {
+ REPL_CLEANRUV_CHECK_STATUS_OID,
+ NULL
+};
+static char *cleanruv_status_name_list[] = {
+ NSDS_REPL_NAME_PREFIX " CleanAllRUV Check Status",
+ NULL
+};
+
/* List of plugin identities for every plugin registered. Plugin identity
is passed by the server in the plugin init function and must be supplied
@@ -496,6 +513,53 @@ multimaster_cleanruv_abort_extop_init( Slapi_PBlock *pb )
return rc;
}
+int
+multimaster_cleanruv_maxcsn_extop_init( Slapi_PBlock *pb )
+{
+ int rc= 0; /* OK */
+ void *identity = NULL;
+
+ /* get plugin identity and store it to pass to internal operations */
+ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
+ PR_ASSERT (identity);
+
+ 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 *)cleanruv_maxcsn_oid_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, (void *)cleanruv_maxcsn_name_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_FN, (void *)multimaster_extop_cleanruv_get_maxcsn ))
+ {
+ slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, "multimaster_cleanruv_extop_init failed\n" );
+ rc= -1;
+ }
+
+ return rc;
+}
+
+int
+multimaster_cleanruv_status_extop_init( Slapi_PBlock *pb )
+{
+ int rc= 0; /* OK */
+ void *identity = NULL;
+
+ /* get plugin identity and store it to pass to internal operations */
+ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
+ PR_ASSERT (identity);
+
+ 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 *)cleanruv_status_oid_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, (void *)cleanruv_status_name_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_FN, (void *)multimaster_extop_cleanruv_check_status ))
+ {
+ slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, "multimaster_cleanruv_extop_init failed\n" );
+ rc= -1;
+ }
+
+ return rc;
+}
+
+
static PRBool
check_for_ldif_dump(Slapi_PBlock *pb)
{
@@ -679,6 +743,8 @@ int replication_multimaster_plugin_init(Slapi_PBlock *pb)
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_cleanruv_abort_extop_init", multimaster_cleanruv_abort_extop_init, "Multimaster replication cleanruv abort extended operation plugin", NULL, identity);
+ rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_maxcsn_extop_init", multimaster_cleanruv_maxcsn_extop_init, "Multimaster replication cleanruv maxcsn extended operation plugin", NULL, identity);
+ rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_status_extop_init", multimaster_cleanruv_status_extop_init, "Multimaster replication cleanruv status extended operation plugin", NULL, identity);
if (0 == rc)
{
multimaster_initialised = 1;
diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
index ec0b113..de0fa66 100644
--- a/ldap/servers/plugins/replication/repl5_replica.c
+++ b/ldap/servers/plugins/replication/repl5_replica.c
@@ -88,7 +88,6 @@ struct replica {
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];
};
@@ -313,7 +312,6 @@ replica_destroy(void **arg)
{
Replica *r;
void *repl_name;
- int i;
if (arg == NULL)
return;
@@ -400,10 +398,6 @@ 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);
}
@@ -1830,12 +1824,13 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
PRThread *thread = NULL;
struct berval *payload = NULL;
CSN *maxcsn = NULL;
- char *csnpart;
- char *iter;
+ ReplicaId rid;
char csnstr[CSN_STRSIZE];
- char *ridstr;
+ char *forcing = NULL;
char *token = NULL;
- ReplicaId rid;
+ char *csnpart;
+ char *ridstr;
+ char *iter;
int i;
for(i = 0; i < CLEANRIDSIZ && clean_vals[i]; i++){
@@ -1844,7 +1839,6 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
/*
* 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);
@@ -1862,16 +1856,18 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
maxcsn = csn_new();
csn_init_by_string(maxcsn, csnpart);
csn_as_string(maxcsn, PR_FALSE, csnstr);
- add_cleaned_rid(rid, r, csnstr);
- set_cleaned_rid(rid);
+ forcing = ldap_utf8strtok_r(iter, ":", &iter);
+ if(forcing == NULL){
+ forcing = "no";
+ }
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);
+ ridstr = slapi_ch_smprintf("%d:%s:%s:%s", rid, slapi_sdn_get_dn(replica_get_root(r)), csnstr, forcing);
+ payload = create_cleanruv_payload(ridstr);
slapi_ch_free_string(&ridstr);
if(payload == NULL){
@@ -1894,8 +1890,10 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
data->rid = rid;
data->task = NULL;
data->maxcsn = maxcsn;
- data->sdn = slapi_sdn_dup(r->repl_root);
data->payload = payload;
+ data->sdn = slapi_sdn_dup(r->repl_root);
+ data->force = slapi_ch_strdup(forcing);
+ data->repl_root = NULL;
thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_thread_ext,
(void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
@@ -1906,12 +1904,12 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
"thread for rid(%d)\n", (int)data->rid);
csn_free(&maxcsn);
slapi_sdn_free(&data->sdn);
+ slapi_ch_free_string(&data->force);
ber_bvfree(data->payload);
slapi_ch_free((void **)&data);
}
}
}
- r->repl_cleanruv_data[i] = NULL;
done:
slapi_ch_array_free(clean_vals);
@@ -1921,13 +1919,12 @@ done:
{
PRThread *thread = NULL;
struct berval *payload;
- CSN *maxcsn = NULL;
- char *iter;
+ ReplicaId rid;
+ char *certify = NULL;
char *ridstr = NULL;
- char *repl_root;
char *token = NULL;
- char *certify = NULL;
- ReplicaId rid;
+ char *repl_root;
+ char *iter;
int i;
for(i = 0; clean_vals[i]; i++){
@@ -1938,23 +1935,27 @@ done:
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);
+ "aborting abort task.\n", rid);
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]);
+ "data (%s), aborting abort task.\n",clean_vals[i]);
goto done2;
}
repl_root = ldap_utf8strtok_r(iter, ":", &iter);
certify = ldap_utf8strtok_r(iter, ":", &iter);
- stop_ruv_cleaning();
- maxcsn = replica_get_cleanruv_maxcsn(r, rid);
- delete_cleaned_rid(r, rid, maxcsn);
- set_aborted_rid(rid);
- csn_free(&maxcsn);
+ if(!is_cleaned_rid(rid)){
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: replica id(%d) is not "
+ "being cleaned, nothing to abort. Aborting abort task.\n", rid);
+ delete_aborted_rid(r, rid, repl_root, 0);
+ goto done2;
+ }
+
+ add_aborted_rid(rid, r, repl_root);
+ stop_ruv_cleaning();
slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: abort task found, "
"resuming abort of rid(%d).\n", rid);
/*
@@ -1964,8 +1965,8 @@ done:
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);
+ ridstr = slapi_ch_smprintf("%d:%s:%s", rid, repl_root, certify);
+ payload = create_cleanruv_payload(ridstr);
slapi_ch_free_string(&ridstr);
if(payload == NULL){
@@ -3463,7 +3464,7 @@ 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))
+ if ((rc != LDAP_NO_SUCH_OBJECT && rc != LDAP_TYPE_OR_VALUE_EXISTS) || !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 "
@@ -3827,69 +3828,3 @@ 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 */
- if( i < CLEANRIDSIZ){
- r->repl_cleanruv_data[i] = slapi_ch_strdup(val); /* append to list */
- r->repl_cleanruv_data[i + 1] = 0;
- }
-
- 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 fe34f4b..3b354f2 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -87,12 +87,12 @@ 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, Slapi_Task *task, const char *force_cleaning, char *returntext);
static void replica_cleanallruv_thread(void *arg);
-static void replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task);
+static void replica_send_cleanruv_task(Repl_Agmt *agmt, cleanruv_data *clean_data);
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 check_agmts_are_caught_up(Replica *replica, char *basedn, ReplicaId rid, char *maxcsn, Slapi_Task *task);
+static int replica_cleanallruv_send_extop(Repl_Agmt *ra, cleanruv_data *data, 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_check_maxcsn(Repl_Agmt *agmt, char *basedn, 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();
@@ -100,6 +100,12 @@ static int get_abort_cleanruv_task_count();
static void preset_cleaned_rid(ReplicaId rid);
static int replica_cleanup_task (Object *r, const char *task_name, char *returntext, int apply_mods);
static int replica_task_done(Replica *replica);
+static void delete_cleaned_rid_config(cleanruv_data *data);
+static int replica_cleanallruv_is_finished(Repl_Agmt *agmt, char *filter, Slapi_Task *task);
+static void check_replicas_are_done_cleaning(cleanruv_data *data);
+static void check_replicas_are_done_aborting(cleanruv_data *data );
+static CSN* replica_cleanallruv_find_maxcsn(Replica *replica, ReplicaId rid, char *basedn);
+static int replica_cleanallruv_get_replica_maxcsn(Repl_Agmt *agmt, char *rid_text, char *basedn, CSN **csn);
static multimaster_mtnode_extension * _replica_config_get_mtnode_ext (const Slapi_Entry *e);
/*
@@ -387,6 +393,12 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
if (apply_mods)
replica_set_legacy_consumer (r, PR_FALSE);
}
+ else if (strcasecmp (config_attr, type_replicaCleanRUV) == 0 ||
+ strcasecmp (config_attr, type_replicaAbortCleanRUV) == 0)
+ {
+ /* only allow the deletion of the cleanAllRUV config attributes */
+ continue;
+ }
else
{
*returncode = LDAP_UNWILLING_TO_PERFORM;
@@ -1230,11 +1242,11 @@ replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
Slapi_Task *task = NULL;
const Slapi_DN *task_dn;
Slapi_DN *dn = NULL;
+ ReplicaId rid;
Object *r;
+ const char *force_cleaning;
const char *base_dn;
const char *rid_str;
- const char *force_cleaning;
- ReplicaId rid;
int rc = SLAPI_DSE_CALLBACK_OK;
/* allocate new task now */
@@ -1245,16 +1257,19 @@ replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
-
/*
* Get our task settings
*/
if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Missing replica-base-dn attribute");
+ cleanruv_log(task, CLEANALLRUV_ID, "%s", returntext);
*returncode = LDAP_OBJECT_CLASS_VIOLATION;
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
if ((rid_str = fetch_attr(e, "replica-id", 0)) == NULL){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Missing replica-id attribute");
+ cleanruv_log(task, CLEANALLRUV_ID, "%s", returntext);
*returncode = LDAP_OBJECT_CLASS_VIOLATION;
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
@@ -1272,8 +1287,6 @@ replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
} else {
force_cleaning = "no";
}
-
-
/*
* Check the rid
*/
@@ -1332,32 +1345,32 @@ out:
static int
replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, const char* force_cleaning, char *returntext)
{
- PRThread *thread = NULL;
+ struct berval *payload = NULL;
Slapi_Task *pre_task = NULL; /* this is supposed to be null for logging */
- Replica *replica;
- Object *ruv_obj;
+ PRThread *thread = NULL;
cleanruv_data *data = NULL;
+ Replica *replica;
CSN *maxcsn = NULL;
- const RUV *ruv;
- struct berval *payload = NULL;
- char *ridstr = NULL;
char csnstr[CSN_STRSIZE];
+ char *ridstr = NULL;
+ char *basedn = NULL;
int rc = 0;
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Initiating CleanAllRUV Task...");
+
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);
return LDAP_UNWILLING_TO_PERFORM;
}
-
/*
* 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");
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Replica object is NULL, aborting task");
return -1;
}
/*
@@ -1365,7 +1378,7 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, c
*/
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);
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Failed to clean rid (%d), task can not be run on a read-only consumer",rid);
if(task){
rc = -1;
slapi_task_finish(task, rc);
@@ -1375,32 +1388,26 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, c
/*
* 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);
+ basedn = (char *)slapi_sdn_get_dn(replica_get_root(replica));
+ maxcsn = replica_cleanallruv_find_maxcsn(replica, rid, basedn);
+ 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:%s", rid, slapi_sdn_get_dn(replica_get_root(replica)), csnstr, force_cleaning);
- payload = create_ruv_payload(ridstr);
+
+ ridstr = slapi_ch_smprintf("%d:%s:%s:%s", rid, basedn, csnstr, force_cleaning);
+ payload = create_cleanruv_payload(ridstr);
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Creating payload for (%s)",ridstr); /* MARK */
slapi_ch_free_string(&ridstr);
if(payload == NULL){
@@ -1422,9 +1429,10 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, c
data->replica = replica;
data->rid = rid;
data->task = task;
- data->maxcsn = maxcsn;
data->payload = payload;
data->sdn = NULL;
+ data->maxcsn = maxcsn;
+ data->repl_root = slapi_ch_strdup(basedn);
data->force = slapi_ch_strdup(force_cleaning);
thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_thread,
@@ -1433,6 +1441,8 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, c
if (thread == NULL) {
rc = -1;
slapi_ch_free_string(&data->force);
+ slapi_ch_free_string(&data->repl_root);
+ csn_free(&maxcsn);
goto fail;
} else {
goto done;
@@ -1476,19 +1486,19 @@ replica_cleanallruv_thread_ext(void *arg)
static void
replica_cleanallruv_thread(void *arg)
{
- Object *ruv_obj = NULL;
+ cleanruv_data *data = arg;
Object *agmt_obj = NULL;
+ Object *ruv_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 found_dirty_rid = 1;
int interval = 10;
- int aborted = 0;
int free_obj = 0;
+ int aborted = 0;
int rc = 0;
/*
@@ -1501,7 +1511,7 @@ replica_cleanallruv_thread(void *arg)
* the backends might not be online yet.
*/
PR_Lock( notify_lock );
- PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(5) );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(10) );
PR_Unlock( notify_lock );
data->repl_obj = replica_get_replica_from_dn(data->sdn);
if(data->repl_obj == NULL){
@@ -1523,18 +1533,26 @@ replica_cleanallruv_thread(void *arg)
aborted = 1;
goto done;
}
+ if(data->repl_root == NULL){
+ /* we must have resumed from start up, fill in the repl root */
+ data->repl_root = slapi_ch_strdup(slapi_sdn_get_dn(replica_get_root(data->replica)));
+ }
if(data->task){
slapi_task_begin(data->task, 1);
}
- rid_text = slapi_ch_smprintf("{replica %d ldap", data->rid);
+ /*
+ * Presetting the rid prevents duplicate thread creation, but allows the db and changelog to still
+ * process updates from the rid. set_cleaned_rid() blocks updates, so we don't want to do that... yet.
+ */
+ preset_cleaned_rid(data->rid);
+ rid_text = slapi_ch_smprintf("%d", data->rid);
csn_as_string(data->maxcsn, PR_FALSE, csnstr);
- preset_cleaned_rid(data->rid); /* this prevents duplicate thread creation */
+ add_cleaned_rid(data->rid, data->replica, csnstr, data->force); /* marks config that we started cleaning a rid */
/*
* 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
*/
@@ -1566,7 +1584,8 @@ replica_cleanallruv_thread(void *arg)
* 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(strcasecmp(data->force,"no") == 0 && check_agmts_are_caught_up(data->replica, data->rid, csnstr, data->task)){
+
+ if(strcasecmp(data->force,"no") == 0 && check_agmts_are_caught_up(data->replica, data->repl_root, data->rid, csnstr, data->task)){
/* error, aborted or shutdown */
aborted = 1;
goto done;
@@ -1593,7 +1612,7 @@ replica_cleanallruv_thread(void *arg)
agmt_not_notified = 0;
continue;
}
- if(replica_cleanallruv_send_extop(agmt, data->rid, data->task, data->payload, 1) == 0){
+ if(replica_cleanallruv_send_extop(agmt, data, 1) == 0){
agmt_not_notified = 0;
} else {
agmt_not_notified = 1;
@@ -1663,7 +1682,7 @@ replica_cleanallruv_thread(void *arg)
goto done;
}
if(found_dirty_rid == 0){
- break;
+ break;
}
/*
* need to sleep between passes
@@ -1687,9 +1706,11 @@ done:
*/
if(!aborted){
trigger_cl_trimming(data->rid);
- delete_cleaned_rid(data->replica, data->rid, data->maxcsn);
+ delete_cleaned_rid_config(data);
+ /* make sure all the replicas have been "pre_cleaned" before finishing */
+ check_replicas_are_done_cleaning(data);
cleanruv_log(data->task, CLEANALLRUV_ID, "Successfully cleaned rid(%d).", data->rid);
- slapi_task_finish(data->task, rc);
+ remove_cleaned_rid(data->rid);
} else {
/*
* Shutdown or abort
@@ -1698,10 +1719,12 @@ done:
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);
+ delete_cleaned_rid_config(data);
+ remove_cleaned_rid(data->rid);
}
- if(data->task){
- slapi_task_finish(data->task, rc);
- }
+ }
+ if(data->task){
+ slapi_task_finish(data->task, rc);
}
if(data->payload){
@@ -1710,18 +1733,177 @@ done:
if(data->repl_obj && free_obj){
object_release(data->repl_obj);
}
- slapi_sdn_free(&data->sdn);
+
+ slapi_ch_free_string(&data->repl_root);
slapi_ch_free_string(&data->force);
slapi_ch_free_string(&rid_text);
+ slapi_sdn_free(&data->sdn);
csn_free(&data->maxcsn);
slapi_ch_free((void **)&data);
}
/*
- * Waits for all the repl agmts to be have have the maxcsn. Returns error only on abort or shutdown
+ * Loop over the agmts, and check if they are in the last phase of cleaning, meaning they have
+ * released cleanallruv data from the config
+ */
+static void
+check_replicas_are_done_cleaning(cleanruv_data *data )
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ char csnstr[CSN_STRSIZE];
+ char *filter = NULL;
+ int not_all_cleaned = 1;
+ int interval = 10;
+
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Waiting for all the replicas to finish cleaning...");
+
+ csn_as_string(data->maxcsn, PR_FALSE, csnstr);
+ filter = PR_smprintf("(%s=%d:%s:%s)", type_replicaCleanRUV,(int)data->rid, csnstr, data->force);
+
+ while(not_all_cleaned && !is_task_aborted(data->rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
+ if(agmt_obj == NULL){
+ not_all_cleaned = 0;
+ break;
+ }
+ while (agmt_obj && !slapi_is_shutting_down()){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ not_all_cleaned = 0;
+ continue;
+ }
+ if(replica_cleanallruv_is_finished(agmt, filter, data->task) == 0){
+ not_all_cleaned = 0;
+ } else {
+ not_all_cleaned = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ }
+ if(not_all_cleaned == 0 || is_task_aborted(data->rid) ){
+ break;
+ }
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Not all replicas finished cleaning, 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(&filter);
+}
+
+/*
+ * Search this replica for the nsds5ReplicaCleanruv attribute, we don't return
+ * an entry, we know it has finished cleaning.
+ */
+static int
+replica_cleanallruv_is_finished(Repl_Agmt *agmt, char *filter, Slapi_Task *task)
+{
+ Repl_Connection *conn = NULL;
+ ConnResult crc = 0;
+ struct berval *payload = NULL;
+ int msgid = 0;
+ int rc = -1;
+
+ if((conn = conn_new(agmt)) == NULL){
+ return -1;
+ }
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ payload = create_cleanruv_payload(filter);
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_CHECK_STATUS_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
+
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ char *response = NULL;
+
+ decode_cleanruv_payload(retsdata, &response);
+ if(response && strcmp(response,CLEANRUV_FINISHED) == 0){
+ /* finished cleaning */
+ rc = 0;
+ }
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
+ slapi_ch_free_string(&response);
+ slapi_ch_free_string(&retoid);
+ }
+ }
+ } else {
+ rc = -1;
+ }
+ conn_delete_internal_ext(conn);
+ if (NULL != payload)
+ ber_bvfree(payload);
+
+ return rc;
+}
+
+/*
+ * Loop over the agmts, and check if they are in the last phase of aborting, meaning they have
+ * released the abort cleanallruv data from the config
+ */
+static void
+check_replicas_are_done_aborting(cleanruv_data *data )
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ char *filter = NULL;
+ int not_all_aborted = 1;
+ int interval = 10;
+
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID,"Waiting for all the replicas to finish aborting...");
+
+ filter = PR_smprintf("(%s=%d:%s)", type_replicaAbortCleanRUV, data->rid, data->repl_root);
+ while(not_all_aborted && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
+ if(agmt_obj == NULL){
+ not_all_aborted = 0;
+ break;
+ }
+ while (agmt_obj && !slapi_is_shutting_down()){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ not_all_aborted = 0;
+ continue;
+ }
+ if(replica_cleanallruv_is_finished(agmt, filter, data->task) == 0){
+ not_all_aborted = 0;
+ } else {
+ not_all_aborted = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ }
+ if(not_all_aborted == 0){
+ break;
+ }
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Not all replicas finished aborting, 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(&filter);
+}
+
+/*
+ * Waits for all the repl agmts to be have received 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)
+check_agmts_are_caught_up(Replica *replica, char *basedn, ReplicaId rid, char *maxcsn, Slapi_Task *task)
{
Object *agmt_obj;
Repl_Agmt *agmt;
@@ -1729,7 +1911,7 @@ check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_T
int not_all_caughtup = 1;
int interval = 10;
- rid_text = slapi_ch_smprintf("{replica %d ldap", rid);
+ rid_text = slapi_ch_smprintf("%d", rid);
while(not_all_caughtup && !is_task_aborted(rid) && !slapi_is_shutting_down()){
agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
@@ -1744,7 +1926,7 @@ check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_T
not_all_caughtup = 0;
continue;
}
- if(replica_cleanallruv_check_maxcsn(agmt, rid_text, maxcsn, task) == 0){
+ if(replica_cleanallruv_check_maxcsn(agmt, basedn, rid_text, maxcsn, task) == 0){
not_all_caughtup = 0;
} else {
not_all_caughtup = 1;
@@ -1752,8 +1934,7 @@ check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_T
break;
}
agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- } /* agmt while */
-
+ }
if(not_all_caughtup == 0 || is_task_aborted(rid) ){
break;
}
@@ -1836,7 +2017,7 @@ check_agmts_are_alive(Replica *replica, ReplicaId rid, Slapi_Task *task)
* Create the CLEANALLRUV extended op payload
*/
struct berval *
-create_ruv_payload(char *value)
+create_cleanruv_payload(char *value)
{
struct berval *req_data = NULL;
BerElement *tmp_bere = NULL;
@@ -1844,10 +2025,7 @@ create_ruv_payload(char *value)
if ((tmp_bere = der_alloc()) == NULL){
goto error;
}
- if (ber_printf(tmp_bere, "{s", value) == -1){
- goto error;
- }
- if (ber_printf(tmp_bere, "}") == -1){
+ if (ber_printf(tmp_bere, "{s}", value) == -1){
goto error;
}
if (ber_flatten(tmp_bere, &req_data) == -1){
@@ -1875,12 +2053,12 @@ done:
* the CLEANALLRUV task.
*/
static void
-replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
+replica_send_cleanruv_task(Repl_Agmt *agmt, cleanruv_data *clean_data)
{
Repl_Connection *conn;
ConnResult crc = 0;
- LDAP *ld;
Slapi_DN *sdn;
+ LDAP *ld;
struct berval *vals[2];
struct berval val;
LDAPMod *mods[2];
@@ -1902,7 +2080,8 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
conn_delete_internal_ext(conn);
return;
}
- val.bv_len = PR_snprintf(data, sizeof(data), "CLEANRUV%d", rid);
+
+ val.bv_len = PR_snprintf(data, sizeof(data), "CLEANRUV%d", clean_data->rid);
sdn = agmt_get_replarea(agmt);
mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
mod.mod_type = "nsds5task";
@@ -1919,7 +2098,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
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 "
+ cleanruv_log(clean_data->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);
}
@@ -2041,7 +2220,7 @@ set_aborted_rid(ReplicaId rid)
* Add the rid and maxcsn to the repl config (so we can resume after a server restart)
*/
void
-add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
+add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn, char *forcing)
{
Slapi_PBlock *pb;
struct berval *vals[2];
@@ -2058,7 +2237,7 @@ add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
/*
* Write the rid & maxcsn to the config entry
*/
- val.bv_len = PR_snprintf(data, sizeof(data),"%d:%s", rid, maxcsn);
+ val.bv_len = PR_snprintf(data, sizeof(data),"%d:%s:%s", rid, maxcsn, forcing);
dn = replica_get_dn(r);
pb = slapi_pblock_new();
mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
@@ -2070,13 +2249,11 @@ add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
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 && rc != LDAP_TYPE_OR_VALUE_EXISTS){
+ if (rc != LDAP_SUCCESS && rc != LDAP_TYPE_OR_VALUE_EXISTS && rc != LDAP_NO_SUCH_OBJECT){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to update replica "
"config (%d), rid (%d)\n", rc, rid);
}
@@ -2109,6 +2286,7 @@ add_aborted_rid(ReplicaId rid, Replica *r, char *repl_root)
}
}
slapi_rwlock_unlock(abort_rid_lock);
+
/*
* Write the rid to the config entry
*/
@@ -2129,7 +2307,7 @@ add_aborted_rid(ReplicaId rid, Replica *r, char *repl_root)
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 && rc != LDAP_NO_SUCH_OBJECT){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to update "
"replica config (%d), rid (%d)\n", rc, rid);
}
@@ -2140,7 +2318,7 @@ add_aborted_rid(ReplicaId rid, Replica *r, char *repl_root)
}
void
-delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root){
+delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root, int skip){
Slapi_PBlock *pb;
LDAPMod *mods[2];
LDAPMod mod;
@@ -2154,70 +2332,108 @@ delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root){
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];
+ if(skip){
+ /* skip the deleting of the config, and just remove the in memory rid */
+ 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);
+ } else {
+ /* only remove the config, leave the in-memory rid */
+ 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_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
+ if (rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_OBJECT){
+ 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);
}
- slapi_rwlock_unlock(abort_rid_lock);
+}
+
+/*
+ * Just remove the dse.ldif config, but we need to keep the cleaned rids in memory until we know we are done
+ */
+static void
+delete_cleaned_rid_config(cleanruv_data *clean_data)
+{
+ Slapi_PBlock *pb;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ struct berval *vals[2];
+ struct berval val;
+ char data[CSN_STRSIZE + 15];
+ char csnstr[CSN_STRSIZE];
+ char *dn;
+ int rc;
+
/*
* Prepare the mods for the config entry
*/
- dn = replica_get_dn(r);
+ csn_as_string(clean_data->maxcsn, PR_FALSE, csnstr);
+ val.bv_len = PR_snprintf(data, sizeof(data), "%d:%s:%s", (int)clean_data->rid, csnstr, clean_data->force);
+ dn = replica_get_dn(clean_data->replica);
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_type = (char *)type_replicaCleanRUV;
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 remove replica "
- "config (%d), rid (%d)\n", rc, rid);
+ /*
+ * When aborting a task, we don't know if the "force" option was used.
+ * So we assume it is set to "no", but if this op fails, we'll try "yes"
+ */
+ slapi_pblock_destroy (pb);
+ pb = slapi_pblock_new();
+ memset(data,'0',sizeof(data));
+ val.bv_len = PR_snprintf(data, sizeof(data), "%d:%s:yes", (int)clean_data->rid, csnstr);
+ 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 && rc != LDAP_NO_SUCH_OBJECT){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to remove replica config "
+ "(%d), rid (%d)\n", rc, clean_data->rid);
+ }
}
slapi_pblock_destroy (pb);
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)
+remove_cleaned_rid(ReplicaId rid)
{
- 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);
/* do the cleaned rids */
for(i = 0; i < CLEANRIDSIZ && cleaned_rids[i] != rid; i++); /* found rid, stop */
@@ -2232,46 +2448,6 @@ delete_cleaned_rid(Replica *r, ReplicaId rid, CSN *maxcsn)
pre_cleaned_rids[i] = pre_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(get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
- 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);
- }
}
/*
@@ -2281,18 +2457,17 @@ int
replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
int *returncode, char *returntext, void *arg)
{
- PRThread *thread = NULL;
struct berval *payload = NULL;
+ cleanruv_data *data = NULL;
+ PRThread *thread = NULL;
Slapi_Task *task = NULL;
+ Slapi_DN *sdn = NULL;
Replica *replica;
ReplicaId rid;
- cleanruv_data *data = NULL;
- Slapi_DN *sdn = NULL;
Object *r;
- CSN *maxcsn = NULL;
+ const char *certify_all;
const char *base_dn;
const char *rid_str;
- const char *certify_all;
char *ridstr = NULL;
int rc = SLAPI_DSE_CALLBACK_OK;
@@ -2316,13 +2491,6 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
- if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
- PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Missing required attr \"replica-base-dn\"");
- cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
- *returncode = LDAP_OBJECT_CLASS_VIOLATION;
- rc = SLAPI_DSE_CALLBACK_ERROR;
- goto out;
- }
certify_all = fetch_attr(e, "replica-certify-all", 0);
/*
* Check the rid
@@ -2336,9 +2504,33 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
- if(is_aborted_rid(rid)){
+ if(is_task_aborted(rid)){
/* we are already cleaning this rid */
- PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Replica id (%d) is already being aborted", rid);
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Replica id (%d) is already being aborted", rid);
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+
+ if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Missing required attr \"replica-base-dn\"");
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_OBJECT_CLASS_VIOLATION;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ if(!is_cleaned_rid(rid) && !is_pre_cleaned_rid(rid)){
+ /* we are already aborting this rid */
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Replica id (%d) is not being cleaned, nothing to abort.", rid);
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ if(is_task_aborted(rid)){
+ /* we are already aborting this rid */
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Replica id (%d) is already being aborted", rid);
cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
*returncode = LDAP_UNWILLING_TO_PERFORM;
rc = SLAPI_DSE_CALLBACK_ERROR;
@@ -2368,13 +2560,13 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
goto out;
}
} else {
- certify_all = "no";
+ certify_all = "yes";
}
/*
* Create payload
*/
ridstr = slapi_ch_smprintf("%d:%s:%s", rid, base_dn, certify_all);
- payload = create_ruv_payload(ridstr);
+ payload = create_cleanruv_payload(ridstr);
if(payload == NULL){
cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Failed to create extended op payload, aborting task");
@@ -2386,8 +2578,6 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
* 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();
/*
@@ -2415,12 +2605,12 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
if (thread == NULL) {
object_release(r);
cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Unable to create abort thread. Aborting task.");
+ slapi_ch_free_string(&data->certify);
*returncode = LDAP_OPERATIONS_ERROR;
rc = SLAPI_DSE_CALLBACK_ERROR;
}
out:
- csn_free(&maxcsn);
slapi_ch_free_string(&ridstr);
slapi_sdn_free(&sdn);
@@ -2463,6 +2653,8 @@ replica_abort_task_thread(void *arg)
release_it = 1;
}
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Aborting task for rid(%d)...",data->rid);
+
/*
* Now send the cleanruv extended op to all the agreements
*/
@@ -2522,8 +2714,12 @@ done:
/*
* 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);
+ delete_aborted_rid(data->replica, data->rid, data->repl_root, 1); /* delete just the config, leave rid in memory */
+ if(strcasecmp(data->certify, "yes") == 0){
+ check_replicas_are_done_aborting(data);
+ }
+ delete_aborted_rid(data->replica, data->rid, data->repl_root, 0); /* remove the in-memory aborted rid */
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Successfully aborted task for rid(%d)", data->rid);
}
if(data->task){
slapi_task_finish(data->task, agmt_not_notified);
@@ -2545,7 +2741,7 @@ replica_cleanallruv_send_abort_extop(Repl_Agmt *ra, Slapi_Task *task, struct ber
Repl_Connection *conn = NULL;
ConnResult crc = 0;
int msgid = 0;
- int rc = 0;
+ int rc = -1;
if((conn = conn_new(ra)) == NULL){
return -1;
@@ -2570,178 +2766,243 @@ replica_cleanallruv_send_abort_extop(Repl_Agmt *ra, Slapi_Task *task, struct ber
static int
-replica_cleanallruv_send_extop(Repl_Agmt *ra, ReplicaId rid, Slapi_Task *task, struct berval *payload, int check_result)
+replica_cleanallruv_send_extop(Repl_Agmt *ra, cleanruv_data *clean_data, int check_result)
{
Repl_Connection *conn = NULL;
ConnResult crc = 0;
int msgid = 0;
- int rc = 0;
+ int rc = -1;
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);
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_OID, clean_data->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...",
+ char *response = NULL;
+
+ decode_cleanruv_payload(retsdata, &response);
+ if(response && strcmp(response,CLEANRUV_ACCEPTED) == 0){
+ /* extop was accepted */
+ rc = 0;
+ } else {
+ cleanruv_log(clean_data->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;
+ replica_send_cleanruv_task(ra, clean_data);
}
- if (NULL != retoid)
- ldap_memfree(retoid);
+ slapi_ch_free_string(&retoid);
+ slapi_ch_free_string(&response);
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 CSN*
+replica_cleanallruv_find_maxcsn(Replica *replica, ReplicaId rid, char *basedn)
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ char *rid_text;
+ CSN *maxcsn = NULL, *topcsn = NULL;
+ int done = 1, found = 0;
+ int interval = 10;
+
+ rid_text = slapi_ch_smprintf("%d", rid);
+
+ while(done && !is_task_aborted(rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
+ if(agmt_obj == NULL){
+ break;
+ }
+ while (agmt_obj && !slapi_is_shutting_down()){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ continue;
+ }
+ if(replica_cleanallruv_get_replica_maxcsn(agmt, rid_text, basedn, &maxcsn) == 0){
+ if(maxcsn == NULL){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ continue;
+ }
+ found = 1;
+ if(topcsn == NULL){
+ topcsn = maxcsn;
+ } else {
+ if(csn_compare(topcsn, maxcsn) < 0){
+ csn_free(&topcsn);
+ topcsn = maxcsn;
+ } else {
+ csn_free(&maxcsn);
+ }
+ }
+ done = 0;
+ } else {
+ done = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ } /* agmt while */
+
+ if(done == 0 || is_task_aborted(rid) ){
+ break;
+ }
+ if(!found){
+ /* we could not find any maxcsn's - already cleaned? */
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: could not find a maxcsn\n");
+ return NULL;
+ }
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: replica_cleanallruv_find_maxcsn: Not all replicas online, retrying in %d seconds\n",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);
+
+ if(is_task_aborted(rid)){
+ return NULL;
+ }
+
+ return topcsn;
+}
+
static int
-replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn, Slapi_Task *task)
+replica_cleanallruv_get_replica_maxcsn(Repl_Agmt *agmt, char *rid_text, char *basedn, CSN **csn)
{
Repl_Connection *conn = NULL;
- LDAP *ld;
- Slapi_DN *sdn;
- 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;
+ ConnResult crc = 0;
+ struct berval *payload = NULL;
+ CSN *maxcsn = NULL;
+ char *data = NULL;
+ int msgid = 0;
if((conn = conn_new(agmt)) == NULL){
return -1;
}
+ data = slapi_ch_smprintf("%s:%s",rid_text, basedn);
+ payload = create_cleanruv_payload(data);
+
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;
- }
- 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(&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);
- 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;
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_GET_MAXCSN_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
+
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ char *remote_maxcsn = NULL;
+
+ decode_cleanruv_payload(retsdata, &remote_maxcsn);
+ if(remote_maxcsn && strcmp(remote_maxcsn, CLEANRUV_NO_MAXCSN)){
+ maxcsn = csn_new();
+ csn_init_by_string(maxcsn, remote_maxcsn);
+ *csn = maxcsn;
+ } else {
+ /* no csn */
+ *csn = NULL;
}
- 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 && ruv_part){/* we have the maxcsn */
- CSN *max, *repl_max;
-
- max = csn_new();
- repl_max = csn_new();
- csn_init_by_string(max, maxcsn);
- csn_init_by_string(repl_max, ruv_part);
- if(csn_compare (repl_max, max) < 0){
- /* we are not caught up yet, free, and return */
- cleanruv_log(task, CLEANALLRUV_ID,"Replica maxcsn (%s) not caught up deleted replica's maxcsn(%s)",
- ruv_part, maxcsn);
- ldap_value_free_len(vals);
- ldap_memfree( attr );
- ldap_msgfree( result );
- if(ber){
- ber_free( ber, 0 );
- }
- conn_delete_internal_ext(conn);
- csn_free(&max);
- csn_free(&repl_max);
- return -1;
- } else {
- /* ok this replica has all the updates from the deleted replica */
- csn_free(&max);
- csn_free(&repl_max);
- 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 */
+ slapi_ch_free_string(&retoid);
+ slapi_ch_free_string(&remote_maxcsn);
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
+ }
+ }
+ }
+ conn_delete_internal_ext(conn);
+ slapi_ch_free_string(&data);
+ if(payload)
+ ber_bvfree(payload);
+
+ return (int)crc;
+}
+
+static int
+replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *basedn, char *rid_text, char *maxcsn, Slapi_Task *task)
+{
+ Repl_Connection *conn = NULL;
+ ConnResult crc = 0;
+ struct berval *payload = NULL;
+ char *data = NULL;
+ int msgid = 0;
+ int rc = -1;
+
+ if((conn = conn_new(agmt)) == NULL){
+ return -1;
+ }
+
+ data = slapi_ch_smprintf("%s:%s",rid_text, basedn);
+ payload = create_cleanruv_payload(data);
+
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_GET_MAXCSN_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
+
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ char *remote_maxcsn = NULL;
+
+ decode_cleanruv_payload(retsdata, &remote_maxcsn);
+ if(remote_maxcsn && strcmp(remote_maxcsn, CLEANRUV_NO_MAXCSN)){
+ CSN *max, *repl_max;
+
+ max = csn_new();
+ repl_max = csn_new();
+ csn_init_by_string(max, maxcsn);
+ csn_init_by_string(repl_max, remote_maxcsn);
+ if(csn_compare (repl_max, max) < 0){
+ /* we are not caught up yet, free, and return */
+ cleanruv_log(task, CLEANALLRUV_ID,"Replica maxcsn (%s) is not caught up with deleted replica's maxcsn(%s)",
+ remote_maxcsn, maxcsn);
+ rc = -1;
+ } else {
+ /* ok this replica is caught up */
rc = 0;
}
- ldap_value_free_len(vals);
+ csn_free(&max);
+ csn_free(&repl_max);
+ } else {
+ /* no remote_maxcsn - return success */
+ rc = 0;
}
- ldap_memfree( attr );
- }
- if ( ber != NULL ) {
- ber_free( ber, 0 );
+ slapi_ch_free_string(&retoid);
+ slapi_ch_free_string(&remote_maxcsn);
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
}
}
- if(result)
- ldap_msgfree( result );
- } else {
- rc = -1;
}
conn_delete_internal_ext(conn);
+ slapi_ch_free_string(&data);
+ if(payload)
+ ber_bvfree(payload);
return rc;
}
@@ -2752,7 +3013,7 @@ replica_cleanallruv_replica_alive(Repl_Agmt *agmt)
Repl_Connection *conn = NULL;
LDAP *ld = NULL;
LDAPMessage *result = NULL;
- int rc = 0;
+ int rc = -1;
if((conn = conn_new(agmt)) == NULL){
return -1;
@@ -2760,7 +3021,7 @@ replica_cleanallruv_replica_alive(Repl_Agmt *agmt)
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 "
+ 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;
@@ -2774,8 +3035,6 @@ replica_cleanallruv_replica_alive(Repl_Agmt *agmt)
}
if(result)
ldap_msgfree( result );
- } else {
- rc = -1;
}
conn_delete_internal_ext(conn);
@@ -2783,83 +3042,52 @@ replica_cleanallruv_replica_alive(Repl_Agmt *agmt)
}
static int
-replica_cleanallruv_check_ruv(Repl_Agmt *ra, char *rid_text, Slapi_Task *task)
+replica_cleanallruv_check_ruv(Repl_Agmt *agmt, 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 *sdn;
- char *attrs[2];
- char *attr = NULL;
- int rc = 0, i;
+ ConnResult crc = 0;
+ struct berval *payload = NULL;
+ char *data = NULL;
+ int msgid = 0;
+ int rc = -1;
- if((conn = conn_new(ra)) == NULL){
+ if((conn = conn_new(agmt)) == NULL){
return -1;
}
+
+ data = slapi_ch_smprintf("%s:%s",rid_text, slapi_sdn_get_dn(agmt_get_replarea_by_ref(agmt)));
+
+ payload = create_cleanruv_payload(data);
+
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;
- }
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_GET_MAXCSN_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
- 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(&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);
- 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);
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ char *remote_maxcsn = NULL;
+
+ decode_cleanruv_payload(retsdata, &remote_maxcsn);
+ if(remote_maxcsn && strcmp(remote_maxcsn, CLEANRUV_NO_MAXCSN)){
+ /* remote replica still has dirty RUV element */
+ rc = -1;
+ } else {
+ /* no maxcsn = we're clean */
+ rc = 0;
}
- ldap_memfree( attr );
- } /* for loop */
- if ( ber != NULL ) {
- ber_free( ber, 0 );
+ slapi_ch_free_string(&retoid);
+ slapi_ch_free_string(&remote_maxcsn);
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
}
}
-done:
- if(result)
- ldap_msgfree( result );
- } else {
- return -1;
}
conn_delete_internal_ext(conn);
+ slapi_ch_free_string(&data);
+ if(payload)
+ ber_bvfree(payload);
return rc;
}
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index 8026ff4..1e6f29a 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -1382,7 +1382,6 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
cleanruv_data *data;
Replica *r;
ReplicaId rid;
- CSN *maxcsn = NULL;
struct berval *extop_payload = NULL;
char *extop_oid;
char *repl_root;
@@ -1394,7 +1393,7 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
- if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_OID) != 0 ||
+ if (NULL == extop_oid || strcmp(extop_oid, REPL_ABORT_CLEANRUV_OID) != 0 ||
NULL == extop_payload || NULL == extop_payload->bv_val){
/* something is wrong, error out */
return LDAP_OPERATIONS_ERROR;
@@ -1403,24 +1402,25 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
* Decode the payload, and grab our settings
*/
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");
+ 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);
certify_all = ldap_utf8strtok_r(iter, ":", &iter);
- if(!is_cleaned_rid(rid) || is_task_aborted(rid)){
+ if(!is_cleaned_rid(rid) || !is_pre_cleaned_rid(rid) || is_task_aborted(rid)){
/* This replica has already been aborted, or was never cleaned, or already finished cleaning */
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: rid is not being cleaned. Aborting abort task.\n");
goto out;
} else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: aborting cleanallruv task for rid(%d)\n", 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, "Abort cleanAllRUV task: 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);
rc = LDAP_OPERATIONS_ERROR;
goto out;
@@ -1429,14 +1429,14 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
object_acquire (mtnode_ext->replica);
release_it = 1;
} else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: replica is missing from (%s), "
+ 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 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");
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: replica is NULL, aborting task\n");
rc = LDAP_OPERATIONS_ERROR;
goto out;
}
@@ -1445,7 +1445,7 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
*/
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 "
+ 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;
@@ -1459,11 +1459,8 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
data->repl_root = slapi_ch_strdup(repl_root);
data->certify = slapi_ch_strdup(certify_all);
/*
- * Stop the cleaning, and delete the rid
+ * Set the aborted rid and stop the cleaning
*/
- 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();
/*
@@ -1473,7 +1470,7 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
(void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
if (thread == NULL) {
- slapi_log_error( SLAPI_LOG_REPL, repl_plugin_name, "Abort cleanAllRUV task: unable to create abort "
+ slapi_log_error( SLAPI_LOG_REPL, repl_plugin_name, "Abort CleanAllRUV Task: unable to create abort "
"thread. Aborting task.\n");
release_it = 1; /* have to release mtnode_ext->replica now */
slapi_ch_free_string(&data->repl_root);
@@ -1514,10 +1511,10 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
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 *extop_oid;
+ char *repl_root;
char *iter;
char *force = NULL;
int release_it = 0;
@@ -1536,7 +1533,7 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
* 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");
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to decode payload. Aborting ext op\n");
goto free_and_return;
}
rid = atoi(ldap_utf8strtok_r(payload, ":", &iter));
@@ -1551,33 +1548,30 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
/*
* If we already cleaned this server, just return success
*/
- if(is_cleaned_rid(rid) || is_pre_cleaned_rid(rid)){
+ if(is_cleaned_rid(rid) || is_pre_cleaned_rid(rid) || is_task_aborted(rid)){
csn_free(&maxcsn);
rc = LDAP_SUCCESS;
goto free_and_return;
}
-
/*
* 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 Task: failed to get replication node "
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to get replication node "
"from (%s), aborting operation\n", repl_root);
goto free_and_return;
}
-
if (mtnode_ext->replica){
object_acquire (mtnode_ext->replica);
release_it = 1;
} else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV Task: replica is missing from (%s), "
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: replica is missing from (%s), "
"aborting operation\n",repl_root);
goto free_and_return;
}
-
r = (Replica*)object_get_data (mtnode_ext->replica);
if(r == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV Task: replica is NULL, aborting task\n");
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: replica is NULL, aborting task\n");
goto free_and_return;
}
@@ -1587,10 +1581,10 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
*
* This will also release mtnode_ext->replica
*/
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV Task: launching cleanAllRUV thread...\n");
+ 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 "
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to allocate "
"cleanruv_Data\n");
goto free_and_return;
}
@@ -1601,16 +1595,18 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
data->maxcsn = maxcsn;
data->payload = slapi_ch_bvdup(extop_payload);
data->force = slapi_ch_strdup(force);
+ data->repl_root = slapi_ch_strdup(repl_root);
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 Task: unable to create cleanAllRUV "
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: unable to create cleanAllRUV "
"monitoring thread. Aborting task.\n");
ber_bvfree(data->payload);
data->payload = NULL;
slapi_ch_free_string(&data->force);
+ slapi_ch_free_string(&data->repl_root);
slapi_ch_free((void **)&data);
} else {
release_it = 0; /* thread will release data->repl_obj == mtnode_ext->replica */
@@ -1632,18 +1628,18 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
/* 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_cleanallruv(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: checking if we're caught up...\n");
+ if(ruv_covers_csn_cleanallruv(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0 || strcmp(force,"yes") == 0){
/* We are caught up */
break;
} else {
char csnstr[CSN_STRSIZE];
csn_as_string(maxcsn, PR_FALSE, csnstr);
- slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV Task: ruv not caught up to maxcsn(%s)\n", csnstr);
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: ruv not caught up to maxcsn(%s)\n", csnstr);
}
DS_Sleep(PR_SecondsToInterval(5));
}
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV Task: we're caught up...\n");
+ 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
*/
@@ -1659,8 +1655,8 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
* 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);
+ 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);
rc = LDAP_SUCCESS;
}
@@ -1675,10 +1671,123 @@ free_and_return:
* Craft a message so we know this replica supports the task
*/
if ((resp_bere = der_alloc())){
+ ber_printf(resp_bere, "{s}", CLEANRUV_ACCEPTED);
+ 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);
+ }
+ /* tell extendop code that we have already sent the result */
+ rc = SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
+ } else {
+ rc = LDAP_OPERATIONS_ERROR;
+ }
+
+ return rc;
+}
+
+/*
+ * Get the max csn for the designated repl area
+ */
+int
+multimaster_extop_cleanruv_get_maxcsn(Slapi_PBlock *pb)
+{
+ Slapi_PBlock *search_pb = NULL;
+ Slapi_Entry **entries = NULL;
+ struct berval *resp_bval = NULL;
+ struct berval *extop_payload;
+ BerElement *resp_bere = NULL;
+ char **ruv_elements = NULL;
+ char *extop_oid = NULL;
+ char *ruv_part = NULL;
+ char *base_dn = NULL;
+ char *payload = NULL;
+ char *maxcsn = NULL;
+ char *filter = NULL;
+ char *ridstr = NULL;
+ char *iter = NULL;
+ char *attrs[2];
+ int part_count = 0;
+ int rid = 0;
+ int res = 0;
+ int rc = LDAP_OPERATIONS_ERROR;
+ int i = 0;
+
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
+
+ if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_GET_MAXCSN_OID) != 0 ||
+ NULL == extop_payload || NULL == extop_payload->bv_val){
+ /* something is wrong, error out */
+ goto free_and_return;
+ }
+ /*
+ * Decode the payload
+ */
+ if(decode_cleanruv_payload(extop_payload, &payload)){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Get MaxCSN Task: failed to decode payload. Aborting ext op\n");
+ goto free_and_return;
+ }
+ rid = atoi(ldap_utf8strtok_r(payload, ":", &iter));
+ base_dn = ldap_utf8strtok_r(iter, ":", &iter);
- ber_int_t response = 1;
+ /*
+ * Get the maxruv from the database tombstone entry
+ */
+ filter = "(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))";
+ attrs[0] = "nsds50ruv";
+ attrs[1] = NULL;
+ ridstr = slapi_ch_smprintf("{replica %d ldap", rid);
+
+ search_pb = slapi_pblock_new();
+ slapi_search_internal_set_pb(search_pb, base_dn, LDAP_SCOPE_SUBTREE, filter, attrs, 0, NULL, NULL, repl_get_plugin_identity(PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_search_internal_pb (search_pb);
+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_RESULT, &res);
+
+ if ( LDAP_SUCCESS == res ) {
+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &entries);
+ if (NULL == entries || entries[0] == NULL) {
+ /* Hmmm, no tombstpne! Error out */
+ } else {
+ /* find the right ruv element, and find the maxcsn */
+ ruv_elements = slapi_entry_attr_get_charray(entries[0],attrs[0]);
+ for(i = 0; ruv_elements && ruv_elements[i] ; i++){
+ if(strstr(ruv_elements[i], ridstr)){
+ /* get the max csn */
+ ruv_part = ldap_utf8strtok_r(ruv_elements[i], " ", &iter);
+ for(part_count = 1; ruv_part && part_count < 5; part_count++){
+ ruv_part = ldap_utf8strtok_r(iter, " ", &iter);
+ }
+ if(part_count == 5 && ruv_part){/* we have the maxcsn */
+ maxcsn = slapi_ch_strdup(ruv_part);
+ break;
+ }
+ }
+ }
+ slapi_ch_array_free(ruv_elements);
+ }
+ } else {
+ /* internal search failed */
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Get MaxCSN Task: internal search failed (%d)\n", res);
+ }
+ if(maxcsn == NULL){
+ maxcsn = slapi_ch_strdup(CLEANRUV_NO_MAXCSN);
+ }
- ber_printf(resp_bere, "{e}", response);
+ /*
+ * Send the extended op response
+ */
+ if ((resp_bere = der_alloc())){
+
+ ber_printf(resp_bere, "{s}", maxcsn);
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);
@@ -1698,10 +1807,96 @@ free_and_return:
rc = LDAP_OPERATIONS_ERROR;
}
+free_and_return:
+ slapi_free_search_results_internal(search_pb);
+ slapi_pblock_destroy(search_pb);
+ slapi_ch_free_string(&payload);
+ slapi_ch_free_string(&maxcsn);
+ slapi_ch_free_string(&ridstr);
+
return rc;
}
/*
+ * Search cn=config for the cleanallruv attributes (clean & abort)
+ */
+int
+multimaster_extop_cleanruv_check_status(Slapi_PBlock *pb)
+{
+ Slapi_PBlock *search_pb = NULL;
+ Slapi_Entry **entries = NULL;
+ struct berval *resp_bval = NULL;
+ struct berval *extop_payload;
+ BerElement *resp_bere = NULL;
+ char *response = NULL;
+ char *filter = NULL;
+ char *extop_oid;
+ int res = 0;
+ int rc = LDAP_OPERATIONS_ERROR;
+
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
+
+ if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_CHECK_STATUS_OID) != 0 ||
+ NULL == extop_payload || NULL == extop_payload->bv_val){
+ /* something is wrong, error out */
+ goto free_and_return;
+ }
+ /*
+ * Decode the payload - which should just be a filter
+ */
+ if(decode_cleanruv_payload(extop_payload, &filter)){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Check Status Task: failed to decode payload. Aborting ext op\n");
+ goto free_and_return;
+ }
+
+ search_pb = slapi_pblock_new();
+ slapi_search_internal_set_pb(search_pb, "cn=config", LDAP_SCOPE_SUBTREE,
+ filter, NULL, 0, NULL, NULL, repl_get_plugin_identity(PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_search_internal_pb (search_pb);
+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_RESULT, &res);
+
+ if ( LDAP_SUCCESS == res ) {
+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &entries);
+ if (NULL == entries || entries[0] == NULL) {
+ /* cleaning task has finished, send repsonse */
+ response = CLEANRUV_FINISHED;
+ } else {
+ response = CLEANRUV_CLEANING;
+ }
+
+ /*
+ * Send the extended op response
+ */
+ if ((resp_bere = der_alloc())){
+ ber_printf(resp_bere, "{s}", 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);
+ }
+ /* tell extendop code that we have already sent the result */
+ rc = SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
+ }
+ }
+
+free_and_return:
+
+ slapi_free_search_results_internal(search_pb);
+ slapi_pblock_destroy(search_pb);
+ slapi_ch_free_string(&filter);
+
+ return rc;
+}
+/*
* This plugin entry point is a noop entry
* point. It's used when registering extops that
* are only used as responses. We'll never receive
diff --git a/ldap/servers/plugins/replication/replutil.c b/ldap/servers/plugins/replication/replutil.c
index 3eec20a..7150d33 100644
--- a/ldap/servers/plugins/replication/replutil.c
+++ b/ldap/servers/plugins/replication/replutil.c
@@ -788,7 +788,7 @@ repl_set_mtn_state_and_referrals(
}
}
- if (rc != LDAP_SUCCESS) {
+ if (rc != LDAP_SUCCESS && rc != LDAP_TYPE_OR_VALUE_EXISTS) {
char ebuf[BUFSIZ];
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "repl_set_mtn_referrals: could "
"not set referrals for replica %s: %d\n",
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
index ca8216f..0f1db5e 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
@@ -71,6 +71,11 @@ void modify_init(modify_context *mc,struct backentry *old_entry)
int modify_apply_mods(modify_context *mc, Slapi_Mods *smods)
{
+ return modify_apply_mods_ignore_error(mc, smods, -1);
+}
+
+int modify_apply_mods_ignore_error(modify_context *mc, Slapi_Mods *smods, int error)
+{
int ret = 0;
/* Make a copy of the entry */
PR_ASSERT(mc->old_entry != NULL);
@@ -78,9 +83,10 @@ int modify_apply_mods(modify_context *mc, Slapi_Mods *smods)
mc->new_entry = backentry_dup(mc->old_entry);
PR_ASSERT(smods!=NULL);
if ( mods_have_effect (mc->new_entry->ep_entry, smods) ) {
- ret = entry_apply_mods( mc->new_entry->ep_entry, slapi_mods_get_ldapmods_byref(smods));
+ ret = entry_apply_mods_ignore_error( mc->new_entry->ep_entry, slapi_mods_get_ldapmods_byref(smods), error);
}
mc->smods= smods;
+
return ret;
}
diff --git a/ldap/servers/slapd/back-ldbm/misc.c b/ldap/servers/slapd/back-ldbm/misc.c
index 8140818..3ef3ab7 100644
--- a/ldap/servers/slapd/back-ldbm/misc.c
+++ b/ldap/servers/slapd/back-ldbm/misc.c
@@ -444,9 +444,9 @@ ldbm_txn_ruv_modify_context( Slapi_PBlock *pb, modify_context *mc )
modify_init( mc, bentry );
- if (modify_apply_mods( mc, smods )) {
- LDAPDebug( LDAP_DEBUG_ANY, "Error: ldbm_txn_ruv_modify_context failed to apply updates to RUV entry\n",
- 0, 0, 0 );
+ if (modify_apply_mods_ignore_error( mc, smods, LDAP_TYPE_OR_VALUE_EXISTS )) {
+ LDAPDebug( LDAP_DEBUG_ANY, "Error: ldbm_txn_ruv_modify_context failed to apply updates to RUV entry(%s)\n",
+ backentry_get_ndn(mc->old_entry), 0 , 0 );
rc = -1;
modify_term( mc, be );
}
diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
index 0734162..e07ab6e 100644
--- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -343,6 +343,7 @@ int get_parent_rdn(DB *db, ID parentid, Slapi_RDN *srdn);
int modify_update_all(backend *be, Slapi_PBlock *pb,modify_context *mc,back_txn *txn);
void modify_init(modify_context *mc,struct backentry *old_entry);
int modify_apply_mods(modify_context *mc, Slapi_Mods *smods);
+int modify_apply_mods_ignore_error(modify_context *mc, Slapi_Mods *smods, int error);
int modify_term(modify_context *mc,backend *be);
int modify_switch_entries(modify_context *mc,backend *be);
diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c
index 08b9066..1f40072 100644
--- a/ldap/servers/slapd/entry.c
+++ b/ldap/servers/slapd/entry.c
@@ -3261,6 +3261,15 @@ int slapi_entry_apply_mod( Slapi_Entry *e, LDAPMod *mod )
int
entry_apply_mods( Slapi_Entry *e, LDAPMod **mods )
{
+ return entry_apply_mods_ignore_error(e, mods, -1);
+}
+
+/*
+ * If one of the mods fails due to the specified error, ignore it.
+ */
+int
+entry_apply_mods_ignore_error( Slapi_Entry *e, LDAPMod **mods, int ignore_error )
+{
int err;
LDAPMod **mp = NULL;
@@ -3270,7 +3279,9 @@ entry_apply_mods( Slapi_Entry *e, LDAPMod **mods )
for ( mp = mods; mp && *mp; mp++ )
{
err = entry_apply_mod( e, *mp );
- if ( err != LDAP_SUCCESS ) {
+ if(err == ignore_error){
+ (*mp)->mod_op = LDAP_MOD_IGNORE;
+ } else if ( err != LDAP_SUCCESS ) {
break;
}
}
diff --git a/ldap/servers/slapd/slapi-private.h b/ldap/servers/slapd/slapi-private.h
index db4a317..504425d 100644
--- a/ldap/servers/slapd/slapi-private.h
+++ b/ldap/servers/slapd/slapi-private.h
@@ -330,6 +330,7 @@ int entry_next_deleted_attribute( const Slapi_Entry *e, Slapi_Attr **a);
/* entry.c */
int entry_apply_mods( Slapi_Entry *e, LDAPMod **mods );
+int entry_apply_mods_ignore_error( Slapi_Entry *e, LDAPMod **mods, int ignore_error );
int is_type_protected(const char *type);
int slapi_entries_diff(Slapi_Entry **old_entries, Slapi_Entry **new_entries, int testall, const char *logging_prestr, const int force_update, void *plg_id);
1
0
ldap/servers/plugins/replication/cl5_api.c | 21
ldap/servers/plugins/replication/repl5.h | 29
ldap/servers/plugins/replication/repl5_agmt.c | 99 -
ldap/servers/plugins/replication/repl5_agmtlist.c | 11
ldap/servers/plugins/replication/repl5_connection.c | 6
ldap/servers/plugins/replication/repl5_init.c | 69 +
ldap/servers/plugins/replication/repl5_replica.c | 132 --
ldap/servers/plugins/replication/repl5_replica_config.c | 1055 ++++++++++------
ldap/servers/plugins/replication/repl_extop.c | 266 +++-
ldap/servers/plugins/replication/replutil.c | 47
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 7
ldap/servers/slapd/back-ldbm/misc.c | 2
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 1
ldap/servers/slapd/entry.c | 10
ldap/servers/slapd/slapi-private.h | 2
15 files changed, 1104 insertions(+), 653 deletions(-)
New commits:
commit ecbd8b7513d05dab5876a88ca56b102c08a7a67c
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Nov 20 16:14:42 2012 -0500
Ticket 337 - improve CLEANRUV functionality
Bug Description: Without anonymous access allowed, then task could not
contact other servers and retrieve data(ruv, maxcsns, etc).
Fix Description: Changed all communication to use extended operations, and improved
sychronization between the replicas.
https://fedorahosted.org/389/ticket/337
Reviewed by: richm(Thanks Rich!)
diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
index a347c57..6c94b3d 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.c
@@ -1474,13 +1474,13 @@ int cl5WriteOperation(const char *replName, const char *replGen,
}
/* Name: cl5CreateReplayIterator
- Description: creates an iterator that allows to retireve changes that should
- to be sent to the consumer identified by ruv. The iteration is peformed by
+ Description: creates an iterator that allows to retrieve changes that should
+ to be sent to the consumer identified by ruv. The iteration is performed by
repeated calls to cl5GetNextOperationToReplay.
Parameters: replica - replica whose data we wish to iterate;
ruv - consumer ruv;
iterator - iterator to be passed to cl5GetNextOperationToReplay call
- Return: CL5_SUCCESS, if function is successfull;
+ Return: CL5_SUCCESS, if function is successful;
CL5_MISSING_DATA, if data that should be in the changelog is missing
CL5_PURGED_DATA, if some data that consumer needs has been purged.
Note that the iterator can be non null if the supplier contains
@@ -1488,14 +1488,14 @@ int cl5WriteOperation(const char *replName, const char *replGen,
CL5_NOTFOUND if the consumer is up to data with respect to the supplier
CL5_BAD_DATA if invalid parameter is passed;
CL5_BAD_STATE if db has not been open;
- CL5_DB_ERROR if any other db error occured;
+ CL5_DB_ERROR if any other db error occurred;
CL5_MEMORY_ERROR if memory allocation fails.
Algorithm: Build a list of csns from consumer's and supplier's ruv. For each element
of the consumer's ruv put max csn into the csn list. For each element
of the supplier's ruv not in the consumer's ruv put min csn from the
supplier's ruv into the list. The list contains, for each known replica,
the starting point for changes to be sent to the consumer.
- Sort the list in accending order.
+ Sort the list in ascending order.
Build a hash which contains, for each known replica, whether the
supplier can bring the consumer up to data with respect to that replica.
The hash is used to decide whether a change can be sent to the consumer
@@ -1503,7 +1503,7 @@ int cl5WriteOperation(const char *replName, const char *replGen,
we can bring the consumer up to date.
Position the db cursor on the change entry that corresponds to this csn.
Hash entries are created for each replica traversed so far. sendChanges
- flag is set to FALSE for all repolicas except the last traversed.
+ flag is set to FALSE for all replicas except the last traversed.
*/
int cl5CreateReplayIteratorEx (Private_Repl_Protocol *prp, const RUV *consumerRuv,
@@ -6543,7 +6543,9 @@ bail:
void
cl5CleanRUV(ReplicaId rid){
CL5DBFile *file;
- Object *obj;
+ Object *obj = NULL;
+
+ slapi_rwlock_wrlock (s_cl5Desc.stLock);
obj = objset_first_obj(s_cl5Desc.dbFiles);
while (obj){
@@ -6552,6 +6554,11 @@ cl5CleanRUV(ReplicaId rid){
ruv_delete_replica(file->maxRUV, rid);
obj = objset_next_obj(s_cl5Desc.dbFiles, obj);
}
+ if(obj){
+ object_release (obj);
+ }
+
+ slapi_rwlock_unlock (s_cl5Desc.stLock);
}
void trigger_cl_trimming(ReplicaId rid){
diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h
index aa7684c..4c57ee5 100644
--- a/ldap/servers/plugins/replication/repl5.h
+++ b/ldap/servers/plugins/replication/repl5.h
@@ -97,8 +97,14 @@
/* cleanallruv extended ops */
#define REPL_CLEANRUV_OID "2.16.840.1.113730.3.6.5"
#define REPL_ABORT_CLEANRUV_OID "2.16.840.1.113730.3.6.6"
-#define CLEANRUV_NOTIFIED 0
-#define CLEANRUV_RELEASED 1
+#define REPL_CLEANRUV_GET_MAXCSN_OID "2.16.840.1.113730.3.6.7"
+#define REPL_CLEANRUV_CHECK_STATUS_OID "2.16.840.1.113730.3.6.8"
+
+#define CLEANRUV_ACCEPTED "accepted"
+#define CLEANRUV_REJECTED "rejected"
+#define CLEANRUV_FINISHED "finished"
+#define CLEANRUV_CLEANING "cleaning"
+#define CLEANRUV_NO_MAXCSN "no maxcsn"
/* DS 5.0 replication protocol error codes */
#define NSDS50_REPL_REPLICA_READY 0x00 /* Replica ready, go ahead */
@@ -239,6 +245,8 @@ int multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb);
int multimaster_extop_EndNSDS50ReplicationRequest(Slapi_PBlock *pb);
int multimaster_extop_cleanruv(Slapi_PBlock *pb);
int multimaster_extop_abort_cleanruv(Slapi_PBlock *pb);
+int multimaster_extop_cleanruv_get_maxcsn(Slapi_PBlock *pb);
+int multimaster_extop_cleanruv_check_status(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);
@@ -374,9 +382,6 @@ PRBool agmt_is_enabled(Repl_Agmt *ra);
int agmt_set_enabled_from_entry(Repl_Agmt *ra, Slapi_Entry *e, char *returntext);
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);
void agmt_update_done(Repl_Agmt *ra, int is_total);
@@ -463,6 +468,7 @@ 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);
+const char* conn_get_bindmethod(Repl_Connection *conn);
/* In repl5_protocol.c */
typedef struct repl_protocol Repl_Protocol;
@@ -617,7 +623,7 @@ 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 add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn);
+void add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn, char *forcing);
int is_cleaned_rid(ReplicaId rid);
int replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
int *returncode, char *returntext, void *arg);
@@ -625,17 +631,15 @@ 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);
+void remove_cleaned_rid(ReplicaId rid);
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);
+struct berval *create_cleanruv_payload(char *value);
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 delete_aborted_rid(Replica *replica, ReplicaId rid, char *repl_root, int skip);
+int is_pre_cleaned_rid(ReplicaId rid);
void set_cleaned_rid(ReplicaId rid);
void cleanruv_log(Slapi_Task *task, char *task_type, char *fmt, ...);
@@ -652,6 +656,7 @@ typedef struct _cleanruv_data
char *repl_root;
Slapi_DN *sdn;
char *certify;
+ char *force;
} cleanruv_data;
/* replutil.c */
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index d25f54b..935fb37 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -141,7 +141,6 @@ 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 */
@@ -252,7 +251,6 @@ 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";
@@ -431,20 +429,6 @@ 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]);
- }
- if(i < CLEANRIDSIZ)
- 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);
@@ -2623,89 +2607,6 @@ 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]);
- }
- if( i < CLEANRIDSIZ )
- ra->cleanruv_notified[i + 1] = 0;
- slapi_ch_array_free(attr_vals);
- } else {
- ra->cleanruv_notified[0] = 0;
- }
- PR_Unlock(ra->lock);
-}
-
/* this is called whenever an update (total/incremental)
is completed */
void
diff --git a/ldap/servers/plugins/replication/repl5_agmtlist.c b/ldap/servers/plugins/replication/repl5_agmtlist.c
index 537cfd8..70f71a8 100644
--- a/ldap/servers/plugins/replication/repl5_agmtlist.c
+++ b/ldap/servers/plugins/replication/repl5_agmtlist.c
@@ -248,7 +248,12 @@ agmtlist_modify_callback(Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry
/* we don't allow delete attribute operations unless it was issued by
the replication plugin - handled above */
if (mods[i]->mod_op & LDAP_MOD_DELETE)
- {
+ {
+ if(strcasecmp (mods[i]->mod_type, type_nsds5ReplicaCleanRUVnotified) == 0){
+ /* allow the deletion of cleanallruv agmt attr */
+ continue;
+ }
+
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "agmtlist_modify_callback: "
"deletion of %s attribute is not allowed\n", type_nsds5ReplicaInitialize);
*returncode = LDAP_UNWILLING_TO_PERFORM;
@@ -508,10 +513,6 @@ 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 51a2bc5..5efd0e6 100644
--- a/ldap/servers/plugins/replication/repl5_connection.c
+++ b/ldap/servers/plugins/replication/repl5_connection.c
@@ -1760,6 +1760,12 @@ bind_method_to_mech(int bindmethod)
return LDAP_SASL_SIMPLE;
}
+const char*
+conn_get_bindmethod(Repl_Connection *conn)
+{
+ return (bind_method_to_mech(conn->bindmethod));
+}
+
/*
* Check the result of an ldap BIND operation to see we it
* contains the expiration controls
diff --git a/ldap/servers/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c
index 59caf4a..cc73f5d 100644
--- a/ldap/servers/plugins/replication/repl5_init.c
+++ b/ldap/servers/plugins/replication/repl5_init.c
@@ -123,7 +123,7 @@ static char *cleanruv_oid_list[] = {
NULL
};
static char *cleanruv_name_list[] = {
- NSDS_REPL_NAME_PREFIX " Cleanruv",
+ NSDS_REPL_NAME_PREFIX " CleanAllRUV",
NULL
};
static char *cleanruv_abort_oid_list[] = {
@@ -131,9 +131,26 @@ static char *cleanruv_abort_oid_list[] = {
NULL
};
static char *cleanruv_abort_name_list[] = {
- NSDS_REPL_NAME_PREFIX " Cleanruv Abort",
+ NSDS_REPL_NAME_PREFIX " CleanAllRUV Abort",
NULL
};
+static char *cleanruv_maxcsn_oid_list[] = {
+ REPL_CLEANRUV_GET_MAXCSN_OID,
+ NULL
+};
+static char *cleanruv_maxcsn_name_list[] = {
+ NSDS_REPL_NAME_PREFIX " CleanAllRUV Retrieve MaxCSN",
+ NULL
+};
+static char *cleanruv_status_oid_list[] = {
+ REPL_CLEANRUV_CHECK_STATUS_OID,
+ NULL
+};
+static char *cleanruv_status_name_list[] = {
+ NSDS_REPL_NAME_PREFIX " CleanAllRUV Check Status",
+ NULL
+};
+
/* List of plugin identities for every plugin registered. Plugin identity
is passed by the server in the plugin init function and must be supplied
@@ -477,6 +494,52 @@ multimaster_end_extop_init( Slapi_PBlock *pb )
return rc;
}
+int
+multimaster_cleanruv_maxcsn_extop_init( Slapi_PBlock *pb )
+{
+ int rc= 0; /* OK */
+ void *identity = NULL;
+
+ /* get plugin identity and store it to pass to internal operations */
+ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
+ PR_ASSERT (identity);
+
+ 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 *)cleanruv_maxcsn_oid_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, (void *)cleanruv_maxcsn_name_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_FN, (void *)multimaster_extop_cleanruv_get_maxcsn ))
+ {
+ slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, "multimaster_cleanruv_extop_init failed\n" );
+ rc= -1;
+ }
+
+ return rc;
+}
+
+int
+multimaster_cleanruv_status_extop_init( Slapi_PBlock *pb )
+{
+ int rc= 0; /* OK */
+ void *identity = NULL;
+
+ /* get plugin identity and store it to pass to internal operations */
+ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &identity);
+ PR_ASSERT (identity);
+
+ 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 *)cleanruv_status_oid_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, (void *)cleanruv_status_name_list ) != 0 ||
+ slapi_pblock_set( pb, SLAPI_PLUGIN_EXT_OP_FN, (void *)multimaster_extop_cleanruv_check_status ))
+ {
+ slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name, "multimaster_cleanruv_extop_init failed\n" );
+ rc= -1;
+ }
+
+ return rc;
+}
+
int
multimaster_total_extop_init( Slapi_PBlock *pb )
@@ -813,6 +876,8 @@ int replication_multimaster_plugin_init(Slapi_PBlock *pb)
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_cleanruv_abort_extop_init", multimaster_cleanruv_abort_extop_init, "Multimaster replication cleanruv abort extended operation plugin", NULL, identity);
+ rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_maxcsn_extop_init", multimaster_cleanruv_maxcsn_extop_init, "Multimaster replication cleanruv maxcsn extended operation plugin", NULL, identity);
+ rc= slapi_register_plugin("extendedop", 1 /* Enabled */, "multimaster_cleanruv_status_extop_init", multimaster_cleanruv_status_extop_init, "Multimaster replication cleanruv status extended operation plugin", NULL, identity);
if (0 == rc)
{
multimaster_initialised = 1;
diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
index 846881d..3d7677b 100644
--- a/ldap/servers/plugins/replication/repl5_replica.c
+++ b/ldap/servers/plugins/replication/repl5_replica.c
@@ -88,7 +88,6 @@ struct replica {
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];
};
@@ -310,7 +309,6 @@ replica_destroy(void **arg)
{
Replica *r;
void *repl_name;
- int i;
if (arg == NULL)
return;
@@ -397,10 +395,6 @@ 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);
}
@@ -1502,7 +1496,7 @@ int replica_check_for_data_reload (Replica *r, void *arg)
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_check_for_data_reload: "
"Warning: for replica %s there were some differences between the changelog max RUV and the "
"database RUV. If there are obsolete elements in the database RUV, you "
- "should remove them using CLEANRUV task. If they are not obsolete, "
+ "should remove them using the CLEANALLRUV task. If they are not obsolete, "
"you should check their status to see why there are no changes from those "
"servers in the changelog.\n",
slapi_sdn_get_dn(r->repl_root));
@@ -1819,12 +1813,13 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
PRThread *thread = NULL;
struct berval *payload = NULL;
CSN *maxcsn = NULL;
- char *csnpart;
- char *iter;
+ ReplicaId rid;
char csnstr[CSN_STRSIZE];
- char *ridstr;
char *token = NULL;
- ReplicaId rid;
+ char *forcing;
+ char *csnpart;
+ char *ridstr;
+ char *iter;
int i;
for(i = 0; i < CLEANRIDSIZ && clean_vals[i]; i++){
@@ -1833,7 +1828,6 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
/*
* 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);
@@ -1851,15 +1845,18 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
maxcsn = csn_new();
csn_init_by_string(maxcsn, csnpart);
csn_as_string(maxcsn, PR_FALSE, csnstr);
- add_cleaned_rid(rid, r, csnstr);
+ forcing = ldap_utf8strtok_r(iter, ":", &iter);
+ if(forcing == NULL){
+ forcing = "no";
+ }
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);
+ ridstr = slapi_ch_smprintf("%d:%s:%s:%s", rid, slapi_sdn_get_dn(replica_get_root(r)), csnstr, forcing);
+ payload = create_cleanruv_payload(ridstr);
slapi_ch_free_string(&ridstr);
if(payload == NULL){
@@ -1882,8 +1879,10 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
data->rid = rid;
data->task = NULL;
data->maxcsn = maxcsn;
- data->sdn = slapi_sdn_dup(r->repl_root);
data->payload = payload;
+ data->sdn = slapi_sdn_dup(r->repl_root);
+ data->force = slapi_ch_strdup(forcing);
+ data->repl_root = NULL;
thread = PR_CreateThread(PR_USER_THREAD, replica_cleanallruv_thread_ext,
(void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
@@ -1895,11 +1894,11 @@ replica_check_for_tasks(Replica *r, Slapi_Entry *e)
csn_free(&maxcsn);
slapi_sdn_free(&data->sdn);
ber_bvfree(data->payload);
+ slapi_ch_free_string(&data->force);
slapi_ch_free((void **)&data);
}
}
}
- r->repl_cleanruv_data[i] = NULL;
done:
slapi_ch_array_free(clean_vals);
@@ -1909,13 +1908,12 @@ done:
{
PRThread *thread = NULL;
struct berval *payload;
- CSN *maxcsn = NULL;
- char *iter;
+ ReplicaId rid;
+ char *certify = NULL;
char *ridstr = NULL;
- char *repl_root;
char *token = NULL;
- char *certify = NULL;
- ReplicaId rid;
+ char *repl_root;
+ char *iter;
int i;
for(i = 0; clean_vals[i]; i++){
@@ -1926,21 +1924,27 @@ done:
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);
+ "aborting abort task.\n", rid);
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]);
+ "data (%s), aborting abort task.\n",clean_vals[i]);
goto done2;
}
repl_root = ldap_utf8strtok_r(iter, ":", &iter);
certify = ldap_utf8strtok_r(iter, ":", &iter);
+
+ if(!is_cleaned_rid(rid)){
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: replica id(%d) is not "
+ "being cleaned, nothing to abort. Aborting abort task.\n", rid);
+ delete_aborted_rid(r, rid, repl_root, 0);
+ goto done2;
+ }
+
+ add_aborted_rid(rid, r, repl_root);
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);
@@ -1951,8 +1955,8 @@ done:
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);
+ ridstr = slapi_ch_smprintf("%d:%s:%s", rid, repl_root, certify);
+ payload = create_cleanruv_payload(ridstr);
slapi_ch_free_string(&ridstr);
if(payload == NULL){
@@ -2583,7 +2587,7 @@ replica_ruv_smods_for_op( Slapi_PBlock *pb, char **uniqueid, Slapi_Mods **smods
must use the CLEANRUV task instead */
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"replica_ruv_smods_for_op: attempted to directly modify the tombstone RUV "
- "entry [%s] - use the CLEANRUV task instead\n",
+ "entry [%s] - use the CLEANALLRUV task instead\n",
slapi_entry_get_dn_const(target_entry));
return (-1);
}
@@ -3430,7 +3434,7 @@ 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))
+ if ((rc != LDAP_NO_SUCH_OBJECT && rc != LDAP_TYPE_OR_VALUE_EXISTS) || !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 "
@@ -3794,69 +3798,3 @@ 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 */
- if( i < CLEANRIDSIZ){
- r->repl_cleanruv_data[i] = slapi_ch_strdup(val); /* append to list */
- r->repl_cleanruv_data[i + 1] = 0;
- }
-
- 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 51ab2e3..f1baef2 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -64,6 +64,7 @@
int slapi_log_urp = SLAPI_LOG_REPL;
static ReplicaId cleaned_rids[CLEANRIDSIZ + 1] = {0};
+static ReplicaId pre_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;
@@ -84,20 +85,27 @@ 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, Slapi_Task *task, char *returntext);
+static int replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, const char *force_cleaning, char *returntext);
static void replica_cleanallruv_thread(void *arg);
-static void replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task);
+static void replica_send_cleanruv_task(Repl_Agmt *agmt, cleanruv_data *clean_data);
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 check_agmts_are_caught_up(cleanruv_data *data, char *maxcsn);
+static int replica_cleanallruv_send_extop(Repl_Agmt *ra, cleanruv_data *data, 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_check_maxcsn(Repl_Agmt *agmt, char *basedn, 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 replica_cleanallruv_check_ruv(char *repl_root, 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 void delete_cleaned_rid_config(cleanruv_data *data);
+static int replica_cleanallruv_is_finished(Repl_Agmt *agmt, char *filter, Slapi_Task *task);
+static void check_replicas_are_done_cleaning(cleanruv_data *data);
+static void check_replicas_are_done_aborting(cleanruv_data *data );
+static CSN* replica_cleanallruv_find_maxcsn(Replica *replica, ReplicaId rid, char *basedn);
+static int replica_cleanallruv_get_replica_maxcsn(Repl_Agmt *agmt, char *rid_text, char *basedn, CSN **csn);
+static void preset_cleaned_rid(ReplicaId rid);
static multimaster_mtnode_extension * _replica_config_get_mtnode_ext (const Slapi_Entry *e);
/*
@@ -385,6 +393,12 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
if (apply_mods)
replica_set_legacy_consumer (r, PR_FALSE);
}
+ else if (strcasecmp (config_attr, type_replicaCleanRUV) == 0 ||
+ strcasecmp (config_attr, type_replicaAbortCleanRUV) == 0)
+ {
+ /* only allow the deletion of the cleanAllRUV config attributes */
+ continue;
+ }
else
{
*returncode = LDAP_UNWILLING_TO_PERFORM;
@@ -891,7 +905,7 @@ static int replica_execute_task (Object *r, const char *task_name, char *returnt
if (apply_mods)
{
Slapi_Task *empty_task = NULL;
- return replica_execute_cleanall_ruv_task(r, (ReplicaId)temprid, empty_task, returntext);
+ return replica_execute_cleanall_ruv_task(r, (ReplicaId)temprid, empty_task, returntext, "no");
}
else
return LDAP_SUCCESS;
@@ -1225,35 +1239,52 @@ replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
Slapi_Task *task = NULL;
const Slapi_DN *task_dn;
Slapi_DN *dn = NULL;
+ ReplicaId rid;
Object *r;
+ const char *force_cleaning;
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));
+ task_dn = slapi_entry_get_sdn(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;
}
-
/*
* Get our task settings
*/
if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Missing replica-base-dn attribute");
+ cleanruv_log(task, CLEANALLRUV_ID, "%s", returntext);
*returncode = LDAP_OBJECT_CLASS_VIOLATION;
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
if ((rid_str = fetch_attr(e, "replica-id", 0)) == NULL){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Missing replica-id attribute");
+ cleanruv_log(task, CLEANALLRUV_ID, "%s", returntext);
*returncode = LDAP_OBJECT_CLASS_VIOLATION;
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
- task_dn = slapi_entry_get_sdn(e);
+ if ((force_cleaning = fetch_attr(e, "replica-force-cleaning", 0)) != NULL){
+ if(strcasecmp(force_cleaning,"yes") != 0 && strcasecmp(force_cleaning,"no") != 0){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Invalid value for replica-force-cleaning "
+ "(%s). Value must be \"yes\" or \"no\" for task - (%s)",
+ force_cleaning, slapi_sdn_get_dn(task_dn));
+ cleanruv_log(task, CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_OPERATIONS_ERROR;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ } else {
+ force_cleaning = "no";
+ }
/*
* Check the rid
*/
@@ -1266,6 +1297,14 @@ replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
+ if(is_cleaned_rid(rid)){
+ /* we are already cleaning this rid */
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Replica id (%d) is already being cleaned", rid);
+ cleanruv_log(task, CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
/*
* Get the replica object
*/
@@ -1279,7 +1318,7 @@ replica_cleanall_ruv_task(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
}
/* clean the RUV's */
- rc = replica_execute_cleanall_ruv_task (r, rid, task, returntext);
+ rc = replica_execute_cleanall_ruv_task (r, rid, task, force_cleaning, returntext);
out:
if(rc){
@@ -1302,31 +1341,36 @@ out:
*
*/
static int
-replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, char *returntext)
+replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, const char* force_cleaning, char *returntext)
{
- PRThread *thread = NULL;
+ struct berval *payload = NULL;
Slapi_Task *pre_task = NULL; /* this is supposed to be null for logging */
- Replica *replica;
- Object *ruv_obj;
cleanruv_data *data = NULL;
+ PRThread *thread = NULL;
CSN *maxcsn = NULL;
- const RUV *ruv;
- struct berval *payload = NULL;
- char *ridstr = NULL;
+ Replica *replica;
char csnstr[CSN_STRSIZE];
+ char *ridstr = NULL;
+ char *basedn = NULL;
int rc = 0;
+ cleanruv_log(pre_task, CLEANALLRUV_ID,"Initiating CleanAllRUV Task...");
+
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);
return LDAP_UNWILLING_TO_PERFORM;
}
-
/*
* Grab the replica
*/
- replica = (Replica*)object_get_data (r);
+ if(r){
+ replica = (Replica*)object_get_data (r);
+ } else {
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Replica object is NULL, aborting task");
+ return -1;
+ }
/*
* Check if this is a consumer
*/
@@ -1342,32 +1386,25 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, c
/*
* 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);
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Retrieving maxcsn...");
+ basedn = (char *)slapi_sdn_get_dn(replica_get_root(replica));
+ maxcsn = replica_cleanallruv_find_maxcsn(replica, rid, basedn);
+ 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);
+ cleanruv_log(pre_task, CLEANALLRUV_ID, "Found maxcsn (%s)",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);
+ ridstr = slapi_ch_smprintf("%d:%s:%s:%s", rid, basedn, csnstr, force_cleaning);
+ payload = create_cleanruv_payload(ridstr);
slapi_ch_free_string(&ridstr);
if(payload == NULL){
@@ -1389,15 +1426,19 @@ replica_execute_cleanall_ruv_task (Object *r, ReplicaId rid, Slapi_Task *task, c
data->replica = replica;
data->rid = rid;
data->task = task;
- data->maxcsn = maxcsn;
data->payload = payload;
data->sdn = NULL;
+ data->maxcsn = maxcsn;
+ data->repl_root = slapi_ch_strdup(basedn);
+ data->force = slapi_ch_strdup(force_cleaning);
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;
+ slapi_ch_free_string(&data->force);
+ slapi_ch_free_string(&data->repl_root);
goto fail;
} else {
goto done;
@@ -1441,11 +1482,11 @@ replica_cleanallruv_thread_ext(void *arg)
static void
replica_cleanallruv_thread(void *arg)
{
- Object *ruv_obj = NULL;
+ cleanruv_data *data = arg;
Object *agmt_obj = NULL;
+ Object *ruv_obj = NULL;
Repl_Agmt *agmt = NULL;
RUV *ruv = NULL;
- cleanruv_data *data = arg;
char csnstr[CSN_STRSIZE];
char *returntext = NULL;
char *rid_text = NULL;
@@ -1466,7 +1507,7 @@ replica_cleanallruv_thread(void *arg)
* the backends might not be online yet.
*/
PR_Lock( notify_lock );
- PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(5) );
+ PR_WaitCondVar( notify_cvar, PR_SecondsToInterval(10) );
PR_Unlock( notify_lock );
data->repl_obj = replica_get_replica_from_dn(data->sdn);
if(data->repl_obj == NULL){
@@ -1488,17 +1529,25 @@ replica_cleanallruv_thread(void *arg)
aborted = 1;
goto done;
}
+ if(data->repl_root == NULL){
+ /* we must have resumed from start up, fill in the repl root */
+ data->repl_root = slapi_ch_strdup(slapi_sdn_get_dn(replica_get_root(data->replica)));
+ }
if(data->task){
slapi_task_begin(data->task, 1);
}
- rid_text = slapi_ch_smprintf("{replica %d ldap", data->rid);
+ /*
+ * Presetting the rid prevents duplicate thread creation, but allows the db and changelog to still
+ * process updates from the rid. set_cleaned_rid() blocks updates, so we don't want to do that... yet.
+ */
+ preset_cleaned_rid(data->rid);
+ rid_text = slapi_ch_smprintf("%d", data->rid);
csn_as_string(data->maxcsn, PR_FALSE, csnstr);
-
/*
* Add the cleanallruv task to the repl config - so we can handle restarts
*/
+ add_cleaned_rid(data->rid, data->replica, csnstr, data->force); /* marks config that we started cleaning a rid */
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
*/
@@ -1506,7 +1555,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_cleanallruv(ruv,data->maxcsn)){
+ if(csn_get_replicaid(data->maxcsn) == 0 || ruv_covers_csn_cleanallruv(ruv,data->maxcsn) || strcasecmp(data->force,"yes") == 0){
/* We are caught up, now we can clean the ruv's */
break;
}
@@ -1517,6 +1566,8 @@ replica_cleanallruv_thread(void *arg)
object_release(ruv_obj);
/*
* Next, make sure all the replicas are up and running before sending off the clean ruv tasks
+ *
+ * Even if we are forcing the cleaning, the replicas still need to be up
*/
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)){
@@ -1528,7 +1579,7 @@ replica_cleanallruv_thread(void *arg)
* 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)){
+ if(strcasecmp(data->force,"no") == 0 && check_agmts_are_caught_up(data, csnstr)){
/* error, aborted or shutdown */
aborted = 1;
goto done;
@@ -1555,10 +1606,11 @@ replica_cleanallruv_thread(void *arg)
agmt_not_notified = 0;
continue;
}
- if(replica_cleanallruv_send_extop(agmt, data->rid, data->task, data->payload, 1) == 0){
+ if(replica_cleanallruv_send_extop(agmt, data, 1) == 0){
agmt_not_notified = 0;
} else {
agmt_not_notified = 1;
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Failed to send task to replica (%s)",agmt_get_long_name(agmt));
break;
}
agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
@@ -1609,10 +1661,11 @@ replica_cleanallruv_thread(void *arg)
found_dirty_rid = 0;
continue;
}
- if(replica_cleanallruv_check_ruv(agmt, rid_text, data->task) == 0){
+ if(replica_cleanallruv_check_ruv(data->repl_root, agmt, rid_text, data->task) == 0){
found_dirty_rid = 0;
} else {
found_dirty_rid = 1;
+ cleanruv_log(data->task, CLEANALLRUV_ID,"Replica is not cleaned yet (%s)",agmt_get_long_name(agmt));
break;
}
agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
@@ -1623,7 +1676,7 @@ replica_cleanallruv_thread(void *arg)
goto done;
}
if(found_dirty_rid == 0){
- break;
+ break;
}
/*
* need to sleep between passes
@@ -1647,9 +1700,11 @@ done:
*/
if(!aborted){
trigger_cl_trimming(data->rid);
- delete_cleaned_rid(data->replica, data->rid, data->maxcsn);
+ delete_cleaned_rid_config(data);
+ /* make sure all the replicas have been "pre_cleaned" before finishing */
+ check_replicas_are_done_cleaning(data);
cleanruv_log(data->task, CLEANALLRUV_ID, "Successfully cleaned rid(%d).", data->rid);
- slapi_task_finish(data->task, rc);
+ remove_cleaned_rid(data->rid);
} else {
/*
* Shutdown or abort
@@ -1658,29 +1713,189 @@ done:
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);
+ delete_cleaned_rid_config(data);
+ remove_cleaned_rid(data->rid);
}
}
-
+ if(data->task){
+ slapi_task_finish(data->task, rc);
+ }
if(data->payload){
ber_bvfree(data->payload);
}
if(data->repl_obj && free_obj){
object_release(data->repl_obj);
}
+ csn_free(&data->maxcsn);
slapi_sdn_free(&data->sdn);
+ slapi_ch_free_string(&data->repl_root);
+ slapi_ch_free_string(&data->force);
slapi_ch_free_string(&rid_text);
- csn_free(&data->maxcsn);
slapi_ch_free((void **)&data);
}
/*
+ * Loop over the agmts, and check if they are in the last phase of cleaning, meaning they have
+ * released cleanallruv data from the config
+ */
+static void
+check_replicas_are_done_cleaning(cleanruv_data *data )
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ char csnstr[CSN_STRSIZE];
+ char *filter = NULL;
+ int not_all_cleaned = 1;
+ int interval = 10;
+
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Waiting for all the replicas to finish cleaning...");
+
+ csn_as_string(data->maxcsn, PR_FALSE, csnstr);
+ filter = PR_smprintf("(%s=%d:%s:%s)", type_replicaCleanRUV,(int)data->rid, csnstr, data->force);
+ while(not_all_cleaned && !is_task_aborted(data->rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
+ if(agmt_obj == NULL){
+ not_all_cleaned = 0;
+ break;
+ }
+ while (agmt_obj && !slapi_is_shutting_down()){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(!agmt_is_enabled(agmt) || get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ not_all_cleaned = 0;
+ continue;
+ }
+ if(replica_cleanallruv_is_finished(agmt, filter, data->task) == 0){
+ not_all_cleaned = 0;
+ } else {
+ not_all_cleaned = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ }
+ if(not_all_cleaned == 0 || is_task_aborted(data->rid) ){
+ break;
+ }
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Not all replicas finished cleaning, 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(&filter);
+}
+
+/*
+ * Search this replica for the nsds5ReplicaCleanruv attribute, we don't return
+ * an entry, we know it has finished cleaning.
+ */
+static int
+replica_cleanallruv_is_finished(Repl_Agmt *agmt, char *filter, Slapi_Task *task)
+{
+ Repl_Connection *conn = NULL;
+ ConnResult crc = 0;
+ struct berval *payload = NULL;
+ int msgid = 0;
+ int rc = -1;
+
+ if((conn = conn_new(agmt)) == NULL){
+ return -1;
+ }
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ payload = create_cleanruv_payload(filter);
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_CHECK_STATUS_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
+
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ char *response = NULL;
+
+ decode_cleanruv_payload(retsdata, &response);
+ if(response && strcmp(response,CLEANRUV_FINISHED) == 0){
+ /* finished cleaning */
+ rc = 0;
+ }
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
+ slapi_ch_free_string(&response);
+ slapi_ch_free_string(&retoid);
+ }
+ }
+ } else {
+ rc = -1;
+ }
+ conn_delete_internal_ext(conn);
+ if(payload)
+ ber_bvfree(payload);
+
+ return rc;
+}
+
+/*
+ * Loop over the agmts, and check if they are in the last phase of aborting, meaning they have
+ * released the abort cleanallruv data from the config
+ */
+static void
+check_replicas_are_done_aborting(cleanruv_data *data )
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ char *filter = NULL;
+ int not_all_aborted = 1;
+ int interval = 10;
+
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID,"Waiting for all the replicas to finish aborting...");
+
+ filter = PR_smprintf("(%s=%d:%s)", type_replicaAbortCleanRUV, data->rid, data->repl_root);
+
+ while(not_all_aborted && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
+ if(agmt_obj == NULL){
+ not_all_aborted = 0;
+ break;
+ }
+ while (agmt_obj && !slapi_is_shutting_down()){
+ agmt = (Repl_Agmt*)object_get_data (agmt_obj);
+ if(get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ not_all_aborted = 0;
+ continue;
+ }
+ if(replica_cleanallruv_is_finished(agmt, filter, data->task) == 0){
+ not_all_aborted = 0;
+ } else {
+ not_all_aborted = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ }
+ if(not_all_aborted == 0){
+ break;
+ }
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Not all replicas finished aborting, 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(&filter);
+}
+
+/*
* 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)
+check_agmts_are_caught_up(cleanruv_data *data, char *maxcsn)
{
Object *agmt_obj;
Repl_Agmt *agmt;
@@ -1688,10 +1903,10 @@ check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_T
int not_all_caughtup = 1;
int interval = 10;
- rid_text = slapi_ch_smprintf("{replica %d ldap", rid);
+ rid_text = slapi_ch_smprintf("%d", data->rid);
- while(not_all_caughtup && !is_task_aborted(rid) && !slapi_is_shutting_down()){
- agmt_obj = agmtlist_get_first_agreement_for_replica (replica);
+ while(not_all_caughtup && !is_task_aborted(data->rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (data->replica);
if(agmt_obj == NULL){
not_all_caughtup = 0;
break;
@@ -1699,23 +1914,24 @@ check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_T
while (agmt_obj){
agmt = (Repl_Agmt*)object_get_data (agmt_obj);
if(!agmt_is_enabled(agmt) || get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
not_all_caughtup = 0;
continue;
}
- if(replica_cleanallruv_check_maxcsn(agmt, rid_text, maxcsn, task) == 0){
+ if(replica_cleanallruv_check_maxcsn(agmt, data->repl_root, rid_text, maxcsn, data->task) == 0){
not_all_caughtup = 0;
} else {
not_all_caughtup = 1;
+ cleanruv_log(data->task, CLEANALLRUV_ID, "Replica not caught up (%s)",agmt_get_long_name(agmt));
break;
}
- agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
- } /* agmt while */
+ agmt_obj = agmtlist_get_next_agreement_for_replica (data->replica, agmt_obj);
+ }
- if(not_all_caughtup == 0 || is_task_aborted(rid) ){
+ if(not_all_caughtup == 0 || is_task_aborted(data->rid) ){
break;
}
- cleanruv_log(task, CLEANALLRUV_ID, "Not all replicas caught up, retrying in %d seconds",interval);
+ cleanruv_log(data->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 );
@@ -1728,7 +1944,7 @@ check_agmts_are_caught_up(Replica *replica, ReplicaId rid, char *maxcsn, Slapi_T
}
slapi_ch_free_string(&rid_text);
- if(is_task_aborted(rid)){
+ if(is_task_aborted(data->rid)){
return -1;
}
@@ -1763,6 +1979,7 @@ check_agmts_are_alive(Replica *replica, ReplicaId rid, Slapi_Task *task)
not_all_alive = 0;
} else {
not_all_alive = 1;
+ cleanruv_log(task, CLEANALLRUV_ID, "Replica not online (%s)",agmt_get_long_name(agmt));
break;
}
agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
@@ -1793,7 +2010,7 @@ check_agmts_are_alive(Replica *replica, ReplicaId rid, Slapi_Task *task)
* Create the CLEANALLRUV extended op payload
*/
struct berval *
-create_ruv_payload(char *value)
+create_cleanruv_payload(char *value)
{
struct berval *req_data = NULL;
BerElement *tmp_bere = NULL;
@@ -1801,10 +2018,7 @@ create_ruv_payload(char *value)
if ((tmp_bere = der_alloc()) == NULL){
goto error;
}
- if (ber_printf(tmp_bere, "{s", value) == -1){
- goto error;
- }
- if (ber_printf(tmp_bere, "}") == -1){
+ if (ber_printf(tmp_bere, "{s}", value) == -1){
goto error;
}
if (ber_flatten(tmp_bere, &req_data) == -1){
@@ -1832,7 +2046,7 @@ done:
* the CLEANALLRUV task.
*/
static void
-replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
+replica_send_cleanruv_task(Repl_Agmt *agmt, cleanruv_data *clean_data)
{
Repl_Connection *conn;
ConnResult crc = 0;
@@ -1859,7 +2073,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
conn_delete_internal_ext(conn);
return;
}
- val.bv_len = PR_snprintf(data, sizeof(data), "CLEANRUV%d", rid);
+ val.bv_len = PR_snprintf(data, sizeof(data), "CLEANRUV%d", clean_data->rid);
sdn = agmt_get_replarea(agmt);
mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
mod.mod_type = "nsds5task";
@@ -1876,7 +2090,7 @@ replica_send_cleanruv_task(Repl_Agmt *agmt, ReplicaId rid, Slapi_Task *task)
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 "
+ cleanruv_log(clean_data->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);
}
@@ -1906,6 +2120,23 @@ is_cleaned_rid(ReplicaId rid)
}
int
+is_pre_cleaned_rid(ReplicaId rid)
+{
+ int i;
+
+ slapi_rwlock_rdlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ && pre_cleaned_rids[i] != 0; i++){
+ if(rid == pre_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;
@@ -1924,6 +2155,22 @@ is_task_aborted(ReplicaId rid)
return 0;
}
+static void
+preset_cleaned_rid(ReplicaId rid)
+{
+ int i;
+
+ slapi_rwlock_wrlock(rid_lock);
+ for(i = 0; i < CLEANRIDSIZ; i++){
+ if(pre_cleaned_rids[i] == 0){
+ pre_cleaned_rids[i] = rid;
+ pre_cleaned_rids[i + 1] = 0;
+ break;
+ }
+ }
+ slapi_rwlock_unlock(rid_lock);
+}
+
/*
* 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
@@ -1948,7 +2195,7 @@ set_cleaned_rid(ReplicaId rid)
* Add the rid and maxcsn to the repl config (so we can resume after a server restart)
*/
void
-add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
+add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn, char *forcing)
{
Slapi_PBlock *pb;
struct berval *vals[2];
@@ -1965,7 +2212,7 @@ add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
/*
* Write the rid & maxcsn to the config entry
*/
- val.bv_len = PR_snprintf(data, sizeof(data),"%d:%s", rid, maxcsn);
+ val.bv_len = PR_snprintf(data, sizeof(data),"%d:%s:%s", rid, maxcsn, forcing);
dn = replica_get_dn(r);
pb = slapi_pblock_new();
mod.mod_op = LDAP_MOD_ADD|LDAP_MOD_BVALUES;
@@ -1977,13 +2224,11 @@ add_cleaned_rid(ReplicaId rid, Replica *r, char *maxcsn)
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 && rc != LDAP_TYPE_OR_VALUE_EXISTS){
+ if (rc != LDAP_SUCCESS && rc != LDAP_TYPE_OR_VALUE_EXISTS && rc != LDAP_NO_SUCH_OBJECT){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to update replica "
"config (%d), rid (%d)\n", rc, rid);
}
@@ -2036,7 +2281,7 @@ add_aborted_rid(ReplicaId rid, Replica *r, char *repl_root)
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 && rc != LDAP_NO_SUCH_OBJECT){
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: failed to update "
"replica config (%d), rid (%d)\n", rc, rid);
}
@@ -2047,7 +2292,7 @@ add_aborted_rid(ReplicaId rid, Replica *r, char *repl_root)
}
void
-delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root){
+delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root, int skip){
Slapi_PBlock *pb;
LDAPMod *mods[2];
LDAPMod mod;
@@ -2061,117 +2306,126 @@ delete_aborted_rid(Replica *r, ReplicaId rid, char *repl_root){
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];
+ if(skip){
+ /* skip the deleting of the config, and just remove the in memory rid */
+ 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);
+ } else {
+ /* only remove the config, leave the in-memory rid */
+ 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_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
+ if (rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_OBJECT){
+ 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);
}
- slapi_rwlock_unlock(abort_rid_lock);
+}
+
+/*
+ * Just remove the dse.ldif config, but we need to keep the cleaned rids in memory until we know we are done
+ */
+static void
+delete_cleaned_rid_config(cleanruv_data *clean_data)
+{
+ Slapi_PBlock *pb;
+ LDAPMod *mods[2];
+ LDAPMod mod;
+ struct berval *vals[2];
+ struct berval val;
+ char data[CSN_STRSIZE + 15];
+ char csnstr[CSN_STRSIZE];
+ char *dn;
+ int rc;
+
/*
* Prepare the mods for the config entry
*/
- dn = replica_get_dn(r);
+ csn_as_string(clean_data->maxcsn, PR_FALSE, csnstr);
+ val.bv_len = PR_snprintf(data, sizeof(data), "%d:%s:%s", (int)clean_data->rid, csnstr, clean_data->force);
+ dn = replica_get_dn(clean_data->replica);
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_type = (char *)type_replicaCleanRUV;
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 remove replica "
- "config (%d), rid (%d)\n", rc, rid);
- }
- slapi_pblock_destroy (pb);
- slapi_ch_free_string(&dn);
- slapi_ch_free_string(&data);
-}
+ /*
+ * When aborting a task, we don't know if the "force" option was used.
+ * So we assume it is set to "no", but if this op fails, we'll try "yes"
+ */
+ slapi_pblock_destroy (pb);
+ pb = slapi_pblock_new();
+ memset(data,'0',sizeof(data));
+ val.bv_len = PR_snprintf(data, sizeof(data), "%d:%s:yes", (int)clean_data->rid, csnstr);
+ 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 && rc != LDAP_NO_SUCH_OBJECT){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to remove replica config "
+ "(%d), rid (%d)\n", rc, clean_data->rid);
+ }
+ }
+ slapi_pblock_destroy (pb);
+ slapi_ch_free_string(&dn);
+ }
/*
* Remove the rid from our list, and the config
*/
void
-delete_cleaned_rid(Replica *r, ReplicaId rid, CSN *maxcsn)
+remove_cleaned_rid(ReplicaId rid)
{
- 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) || get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
- 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);
+ /* now do the preset cleaned rids */
+ for(i = 0; i < CLEANRIDSIZ && pre_cleaned_rids[i] != rid; i++); /* found rid, stop */
+ for(; i < CLEANRIDSIZ; i++){
+ /* rewrite entire array */
+ pre_cleaned_rids[i] = pre_cleaned_rids[i + 1];
}
+
+ slapi_rwlock_unlock(rid_lock);
}
/*
@@ -2181,18 +2435,17 @@ int
replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter,
int *returncode, char *returntext, void *arg)
{
- PRThread *thread = NULL;
struct berval *payload = NULL;
- Slapi_Task *task = NULL;
- Replica *replica;
- ReplicaId rid;
cleanruv_data *data = NULL;
+ PRThread *thread = NULL;
+ Slapi_Task *task = NULL;
Slapi_DN *sdn = NULL;
+ Replica *replica;
+ ReplicaId rid;;
Object *r;
- CSN *maxcsn = NULL;
+ const char *certify_all;
const char *base_dn;
const char *rid_str;
- const char *certify_all;
char *ridstr = NULL;
int rc = SLAPI_DSE_CALLBACK_OK;
@@ -2216,13 +2469,6 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
- if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
- PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Missing required attr \"replica-base-dn\"");
- cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
- *returncode = LDAP_OBJECT_CLASS_VIOLATION;
- rc = SLAPI_DSE_CALLBACK_ERROR;
- goto out;
- }
certify_all = fetch_attr(e, "replica-certify-all", 0);
/*
* Check the rid
@@ -2236,6 +2482,29 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
rc = SLAPI_DSE_CALLBACK_ERROR;
goto out;
}
+ if ((base_dn = fetch_attr(e, "replica-base-dn", 0)) == NULL){
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Missing required attr \"replica-base-dn\"");
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_OBJECT_CLASS_VIOLATION;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ if(!is_cleaned_rid(rid) && !is_pre_cleaned_rid(rid)){
+ /* we are not cleaning this rid */
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Replica id (%d) is not being cleaned, nothing to abort.", rid);
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
+ if(is_task_aborted(rid)){
+ /* we are already aborting this rid */
+ PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE, "Replica id (%d) is already being aborted", rid);
+ cleanruv_log(task, ABORT_CLEANALLRUV_ID, "%s", returntext);
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ goto out;
+ }
/*
* Get the replica object
*/
@@ -2248,7 +2517,7 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
goto out;
}
/*
- * Check verify value
+ * Check certify value
*/
if(certify_all){
if(strcasecmp(certify_all,"yes") && strcasecmp(certify_all,"no")){
@@ -2260,13 +2529,13 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
goto out;
}
} else {
- certify_all = "no";
+ certify_all = "yes";
}
/*
* Create payload
*/
ridstr = slapi_ch_smprintf("%d:%s:%s", rid, base_dn, certify_all);
- payload = create_ruv_payload(ridstr);
+ payload = create_cleanruv_payload(ridstr);
if(payload == NULL){
cleanruv_log(task, ABORT_CLEANALLRUV_ID, "Failed to create extended op payload, aborting task");
@@ -2278,8 +2547,6 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
* 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();
/*
@@ -2308,11 +2575,11 @@ replica_cleanall_ruv_abort(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter
object_release(r);
cleanruv_log(task, ABORT_CLEANALLRUV_ID,"Unable to create abort thread. Aborting task.");
*returncode = LDAP_OPERATIONS_ERROR;
+ slapi_ch_free_string(&data->certify);
rc = SLAPI_DSE_CALLBACK_ERROR;
}
out:
- csn_free(&maxcsn);
slapi_ch_free_string(&ridstr);
slapi_sdn_free(&sdn);
@@ -2337,6 +2604,8 @@ replica_abort_task_thread(void *arg)
int interval = 10;
int release_it = 0;
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Aborting task for rid(%d)...",data->rid);
+
/*
* Need to build the replica from the dn
*/
@@ -2414,8 +2683,12 @@ done:
/*
* 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);
+ delete_aborted_rid(data->replica, data->rid, data->repl_root, 1); /* delete just the config, leave rid in memory */
+ if(strcasecmp(data->certify, "yes") == 0){
+ check_replicas_are_done_aborting(data);
+ }
+ delete_aborted_rid(data->replica, data->rid, data->repl_root, 0); /* remove the in-memory aborted rid */
+ cleanruv_log(data->task, ABORT_CLEANALLRUV_ID, "Successfully aborted task for rid(%d)", data->rid);
}
if(data->task){
slapi_task_finish(data->task, agmt_not_notified);
@@ -2437,10 +2710,10 @@ replica_cleanallruv_send_abort_extop(Repl_Agmt *ra, Slapi_Task *task, struct ber
Repl_Connection *conn = NULL;
ConnResult crc = 0;
int msgid = 0;
- int rc = 0;
+ int rc = -1;
if((conn = conn_new(ra)) == NULL){
- return -1;
+ return rc;
}
if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
crc = conn_send_extended_operation(conn, REPL_ABORT_CLEANRUV_OID, payload, NULL, &msgid);
@@ -2462,186 +2735,262 @@ replica_cleanallruv_send_abort_extop(Repl_Agmt *ra, Slapi_Task *task, struct ber
static int
-replica_cleanallruv_send_extop(Repl_Agmt *ra, ReplicaId rid, Slapi_Task *task, struct berval *payload, int check_result)
+replica_cleanallruv_send_extop(Repl_Agmt *ra, cleanruv_data *clean_data, int check_result)
{
Repl_Connection *conn = NULL;
ConnResult crc = 0;
int msgid = 0;
- int rc = 0;
+ int rc = -1;
if((conn = conn_new(ra)) == NULL){
- return -1;
+ return rc;
}
if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
- crc = conn_send_extended_operation(conn, REPL_CLEANRUV_OID, payload, NULL, &msgid);
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_OID, clean_data->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...",
+ char *response = NULL;
+
+ decode_cleanruv_payload(retsdata, &response);
+ if(response && strcmp(response,CLEANRUV_ACCEPTED) == 0){
+ /* extop was accepted */
+ rc = 0;
+ } else {
+ cleanruv_log(clean_data->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;
+ replica_send_cleanruv_task(ra, clean_data);
}
- if (NULL != retoid)
- ldap_memfree(retoid);
if (NULL != retsdata)
ber_bvfree(retsdata);
+ slapi_ch_free_string(&retoid);
+ slapi_ch_free_string(&response);
}
- 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 CSN*
+replica_cleanallruv_find_maxcsn(Replica *replica, ReplicaId rid, char *basedn)
+{
+ Object *agmt_obj;
+ Repl_Agmt *agmt;
+ char *rid_text;
+ CSN *maxcsn = NULL, *topcsn = NULL;
+ int done = 1, found = 0;
+ int interval = 10;
+
+ rid_text = slapi_ch_smprintf("%d", rid);
+
+ while(done && !is_task_aborted(rid) && !slapi_is_shutting_down()){
+ agmt_obj = agmtlist_get_first_agreement_for_replica (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) || get_agmt_agreement_type(agmt) == REPLICA_TYPE_WINDOWS){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ done = 0;
+ continue;
+ }
+ if(replica_cleanallruv_get_replica_maxcsn(agmt, rid_text, basedn, &maxcsn) == 0){
+ if(maxcsn == NULL){
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ continue;
+ }
+ found = 1;
+ if(topcsn == NULL){
+ topcsn = maxcsn;
+ } else {
+ if(csn_compare(topcsn, maxcsn) < 0){
+ csn_free(&topcsn);
+ topcsn = maxcsn;
+ } else {
+ csn_free(&maxcsn);
+ }
+ }
+ done = 0;
+ } else {
+ done = 1;
+ break;
+ }
+ agmt_obj = agmtlist_get_next_agreement_for_replica (replica, agmt_obj);
+ } /* agmt while */
+ if(done == 0 || is_task_aborted(rid) ){
+ break;
+ }
+ if(!found){
+ /* we could not find any maxcsn's - already cleaned? */
+ return NULL;
+ }
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: replica_cleanallruv_find_maxcsn: Not all replicas online, retrying in %d seconds\n",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);
+
+ if(is_task_aborted(rid)){
+ return NULL;
+ }
+
+ return topcsn;
+}
+
static int
-replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *rid_text, char *maxcsn, Slapi_Task *task)
+replica_cleanallruv_get_replica_maxcsn(Repl_Agmt *agmt, char *rid_text, char *basedn, CSN **csn)
{
Repl_Connection *conn = NULL;
- LDAP *ld;
- Slapi_DN *sdn;
- 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;
+ ConnResult crc = -1;
+ struct berval *payload = NULL;
+ CSN *maxcsn = NULL;
+ char *data = NULL;
+ int msgid = 0;
if((conn = conn_new(agmt)) == NULL){
return -1;
}
+ data = slapi_ch_smprintf("%s:%s",rid_text, basedn);
+ payload = create_cleanruv_payload(data);
+
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;
- }
- 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(&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);
- 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;
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_GET_MAXCSN_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
+
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ char *remote_maxcsn = NULL;
+
+ decode_cleanruv_payload(retsdata, &remote_maxcsn);
+ if(remote_maxcsn && strcmp(remote_maxcsn, CLEANRUV_NO_MAXCSN)){
+ maxcsn = csn_new();
+ csn_init_by_string(maxcsn, remote_maxcsn);
+ *csn = maxcsn;
+ } else {
+ /* no csn */
+ *csn = NULL;
}
- 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 && ruv_part){
- /* 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 */
+ slapi_ch_free_string(&retoid);
+ slapi_ch_free_string(&remote_maxcsn);
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
+ }
+ }
+ }
+ conn_delete_internal_ext(conn);
+ slapi_ch_free_string(&data);
+ if(payload)
+ ber_bvfree(payload);
+
+ return (int)crc;
+}
+
+static int
+replica_cleanallruv_check_maxcsn(Repl_Agmt *agmt, char *basedn, char *rid_text, char *maxcsn, Slapi_Task *task)
+{
+ Repl_Connection *conn = NULL;
+ ConnResult crc = 0;
+ struct berval *payload = NULL;
+ char *data = NULL;
+ int msgid = 0;
+ int rc = -1;
+
+ if((conn = conn_new(agmt)) == NULL){
+ return -1;
+ }
+
+ data = slapi_ch_smprintf("%s:%s",rid_text, basedn);
+ payload = create_cleanruv_payload(data);
+
+ if(conn_connect(conn) == CONN_OPERATION_SUCCESS){
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_GET_MAXCSN_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
+
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ char *remote_maxcsn = NULL;
+
+ decode_cleanruv_payload(retsdata, &remote_maxcsn);
+ if(remote_maxcsn && strcmp(remote_maxcsn, CLEANRUV_NO_MAXCSN)){
+ CSN *max, *repl_max;
+
+ max = csn_new();
+ repl_max = csn_new();
+ csn_init_by_string(max, maxcsn);
+ csn_init_by_string(repl_max, remote_maxcsn);
+ if(csn_compare (repl_max, max) < 0){
+ /* we are not caught up yet, free, and return */
+ cleanruv_log(task, CLEANALLRUV_ID,"Replica maxcsn (%s) is not caught up with deleted replica's maxcsn(%s)",
+ remote_maxcsn, maxcsn);
+ rc = -1;
+ } else {
+ /* ok this replica is caught up */
rc = 0;
}
- ldap_value_free_len(vals);
+ csn_free(&max);
+ csn_free(&repl_max);
+ } else {
+ /* no remote_maxcsn - return success */
+ rc = 0;
}
- ldap_memfree( attr );
- }
- if ( ber != NULL ) {
- ber_free( ber, 0 );
- }
- }
- if(result)
- ldap_msgfree( result );
- } else {
- rc = -1;
+ slapi_ch_free_string(&retoid);
+ slapi_ch_free_string(&remote_maxcsn);
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
+ }
+ }
}
conn_delete_internal_ext(conn);
+ slapi_ch_free_string(&data);
+ if(payload)
+ ber_bvfree(payload);
- return rc;
+ return rc;
}
+
static int
replica_cleanallruv_replica_alive(Repl_Agmt *agmt)
{
Repl_Connection *conn = NULL;
LDAP *ld = NULL;
LDAPMessage *result = NULL;
- int rc = 0;
+ int rc = -1;
if((conn = conn_new(agmt)) == NULL){
- return -1;
+ return rc;
}
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 "
+ 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;
@@ -2655,8 +3004,6 @@ replica_cleanallruv_replica_alive(Repl_Agmt *agmt)
}
if(result)
ldap_msgfree( result );
- } else {
- rc = -1;
}
conn_delete_internal_ext(conn);
@@ -2664,83 +3011,51 @@ replica_cleanallruv_replica_alive(Repl_Agmt *agmt)
}
static int
-replica_cleanallruv_check_ruv(Repl_Agmt *ra, char *rid_text, Slapi_Task *task)
+replica_cleanallruv_check_ruv(char *repl_root, Repl_Agmt *agmt, 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 *sdn;
- char *attrs[2];
- char *attr = NULL;
- int rc = 0, i;
+ ConnResult crc = 0;
+ struct berval *payload = NULL;
+ char *data = NULL;
+ int msgid = 0;
+ int rc = -1;
- if((conn = conn_new(ra)) == NULL){
- return -1;
+ if((conn = conn_new(agmt)) == NULL){
+ return rc;
}
+
+ data = slapi_ch_smprintf("%s:%s",rid_text, repl_root);
+ payload = create_cleanruv_payload(data);
+
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;
- }
+ crc = conn_send_extended_operation(conn, REPL_CLEANRUV_GET_MAXCSN_OID, payload, NULL, &msgid);
+ if(crc == CONN_OPERATION_SUCCESS){
+ struct berval *retsdata = NULL;
+ char *retoid = NULL;
- 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(&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);
- 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);
+ crc = conn_read_result_ex(conn, &retoid, &retsdata, NULL, msgid, NULL, 1);
+ if (CONN_OPERATION_SUCCESS == crc ){
+ char *remote_maxcsn = NULL;
+
+ decode_cleanruv_payload(retsdata, &remote_maxcsn);
+ if(remote_maxcsn && strcmp(remote_maxcsn, CLEANRUV_NO_MAXCSN)){
+ /* remote replica still has dirty RUV element */
+ rc = -1;
+ } else {
+ /* no maxcsn = we're clean */
+ rc = 0;
}
- ldap_memfree( attr );
- } /* for loop */
- if ( ber != NULL ) {
- ber_free( ber, 0 );
+ slapi_ch_free_string(&retoid);
+ slapi_ch_free_string(&remote_maxcsn);
+ if (NULL != retsdata)
+ ber_bvfree(retsdata);
}
}
-done:
- if(result)
- ldap_msgfree( result );
- } else {
- return -1;
}
conn_delete_internal_ext(conn);
+ slapi_ch_free_string(&data);
+ if(payload)
+ ber_bvfree(payload);
return rc;
}
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index 5aac699..c7c8ab0 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -1452,7 +1452,6 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
cleanruv_data *data;
Replica *r;
ReplicaId rid;
- CSN *maxcsn = NULL;
struct berval *extop_payload = NULL;
char *extop_oid;
char *repl_root;
@@ -1464,7 +1463,7 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
- if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_OID) != 0 ||
+ if (NULL == extop_oid || strcmp(extop_oid, REPL_ABORT_CLEANRUV_OID) != 0 ||
NULL == extop_payload || NULL == extop_payload->bv_val){
/* something is wrong, error out */
return LDAP_OPERATIONS_ERROR;
@@ -1473,24 +1472,24 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
* Decode the payload, and grab our settings
*/
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");
+ 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);
certify_all = ldap_utf8strtok_r(iter, ":", &iter);
- if(!is_cleaned_rid(rid) || is_task_aborted(rid)){
+ if(!is_cleaned_rid(rid) || !is_pre_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, "Abort cleanAllRUV task: aborting cleanallruv task for rid(%d)\n", 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, "Abort cleanAllRUV task: 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);
rc = LDAP_OPERATIONS_ERROR;
goto out;
@@ -1499,14 +1498,14 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
object_acquire (mtnode_ext->replica);
release_it = 1;
} else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort cleanAllRUV task: replica is missing from (%s), "
+ 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 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");
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Abort CleanAllRUV Task: replica is NULL, aborting task\n");
rc = LDAP_OPERATIONS_ERROR;
goto out;
}
@@ -1515,7 +1514,7 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
*/
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 "
+ 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;
@@ -1529,11 +1528,8 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
data->repl_root = slapi_ch_strdup(repl_root);
data->certify = slapi_ch_strdup(certify_all);
/*
- * Stop the cleaning, and delete the rid
+ * Set the aborted rid and stop the cleaning
*/
- 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();
/*
@@ -1543,7 +1539,7 @@ multimaster_extop_abort_cleanruv(Slapi_PBlock *pb)
(void *)data, PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
PR_UNJOINABLE_THREAD, SLAPD_DEFAULT_THREAD_STACKSIZE);
if (thread == NULL) {
- slapi_log_error( SLAPI_LOG_REPL, repl_plugin_name, "Abort cleanAllRUV task: unable to create abort "
+ slapi_log_error( SLAPI_LOG_REPL, repl_plugin_name, "Abort CleanAllRUV Task: unable to create abort "
"thread. Aborting task.\n");
release_it = 1; /* have to release mtnode_ext->replica now */
slapi_ch_free_string(&data->repl_root);
@@ -1584,10 +1580,11 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
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 *force = NULL;
+ char *extop_oid;
+ char *repl_root;
char *iter;
int release_it = 0;
int rid = 0;
@@ -1605,28 +1602,31 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
* 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");
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to decode payload. Aborting ext op\n");
goto free_and_return;
}
rid = atoi(ldap_utf8strtok_r(payload, ":", &iter));
repl_root = ldap_utf8strtok_r(iter, ":", &iter);
csnstr = ldap_utf8strtok_r(iter, ":", &iter);
+ force = ldap_utf8strtok_r(iter, ":", &iter);
+ if(force == NULL){
+ force = "no";
+ }
maxcsn = csn_new();
csn_init_by_string(maxcsn, csnstr);
/*
* If we already cleaned this server, just return success
*/
- if(is_cleaned_rid(rid)){
+ if(is_cleaned_rid(rid) || is_pre_cleaned_rid(rid) || is_task_aborted(rid)){
csn_free(&maxcsn);
rc = LDAP_SUCCESS;
goto free_and_return;
}
-
/*
* 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_task: failed to get replication node "
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to get replication node "
"from (%s), aborting operation\n", repl_root);
goto free_and_return;
}
@@ -1635,14 +1635,14 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
object_acquire (mtnode_ext->replica);
release_it = 1;
} else {
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica is missing from (%s), "
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: replica is missing from (%s), "
"aborting operation\n",repl_root);
goto free_and_return;
}
r = (Replica*)object_get_data (mtnode_ext->replica);
if(r == NULL){
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: replica is NULL, aborting task\n");
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: replica is NULL, aborting task\n");
goto free_and_return;
}
@@ -1652,10 +1652,10 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
*
* This will also release mtnode_ext->replica
*/
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: launching cleanAllRUV thread...\n");
+ 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 "
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: failed to allocate "
"cleanruv_Data\n");
goto free_and_return;
}
@@ -1665,15 +1665,19 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
data->task = NULL;
data->maxcsn = maxcsn;
data->payload = slapi_ch_bvdup(extop_payload);
+ data->force = slapi_ch_strdup(force);
+ data->repl_root = slapi_ch_strdup(repl_root);
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_task: unable to create cleanAllRUV "
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: unable to create cleanAllRUV "
"monitoring thread. Aborting task.\n");
ber_bvfree(data->payload);
data->payload = NULL;
+ slapi_ch_free_string(&data->force);
+ slapi_ch_free_string(&data->repl_root);
slapi_ch_free((void **)&data);
} else {
release_it = 0; /* thread will release data->repl_obj == mtnode_ext->replica */
@@ -1695,18 +1699,18 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
/* 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_cleanallruv(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: checking if we're caught up...\n");
+ if(ruv_covers_csn_cleanallruv(ruv,maxcsn) || csn_get_replicaid(maxcsn) == 0|| strcmp(force,"yes") == 0){
/* We are caught up */
break;
} else {
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);
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Task: not ruv caught up maxcsn(%s)\n", csnstr);
}
DS_Sleep(PR_SecondsToInterval(5));
}
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "cleanAllRUV_task: we're caught up...\n");
+ 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
*/
@@ -1722,8 +1726,8 @@ multimaster_extop_cleanruv(Slapi_PBlock *pb)
* 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);
+ 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);
rc = LDAP_SUCCESS;
}
@@ -1738,10 +1742,120 @@ free_and_return:
* Craft a message so we know this replica supports the task
*/
if ((resp_bere = der_alloc())){
+ ber_printf(resp_bere, "{s}", CLEANRUV_ACCEPTED);
+ 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);
+ }
+ /* tell extendop code that we have already sent the result */
+ rc = SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
+ } else {
+ rc = LDAP_OPERATIONS_ERROR;
+ }
- ber_int_t response = 1;
+ return rc;
+}
+
+/*
+ * Get the max csn for the designated repl area
+ */
+int
+multimaster_extop_cleanruv_get_maxcsn(Slapi_PBlock *pb)
+{
+ Slapi_PBlock *search_pb = NULL;
+ Slapi_Entry **entries = NULL;
+ struct berval *resp_bval = NULL;
+ struct berval *extop_payload;
+ BerElement *resp_bere = NULL;
+ char **ruv_elements = NULL;
+ char *extop_oid = NULL;
+ char *ruv_part = NULL;
+ char *base_dn = NULL;
+ char *payload = NULL;
+ char *maxcsn = NULL;
+ char *filter = NULL;
+ char *ridstr = NULL;
+ char *iter = NULL;
+ char *attrs[2];
+ int part_count = 0;
+ int rid = 0;
+ int res = 0;
+ int rc = LDAP_OPERATIONS_ERROR;
+ int i = 0;
+
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
- ber_printf(resp_bere, "{e}", response);
+ if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_GET_MAXCSN_OID) != 0 ||
+ NULL == extop_payload || NULL == extop_payload->bv_val){
+ /* something is wrong, error out */
+ goto free_and_return;
+ }
+ /*
+ * Decode the payload
+ */
+ if(decode_cleanruv_payload(extop_payload, &payload)){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Get MaxCSN Task: failed to decode payload. Aborting ext op\n");
+ goto free_and_return;
+ }
+ rid = atoi(ldap_utf8strtok_r(payload, ":", &iter));
+ base_dn = ldap_utf8strtok_r(iter, ":", &iter);
+ /*
+ * Get the maxruv from the database tombstone entry
+ */
+ filter = "(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))";
+ attrs[0] = "nsds50ruv";
+ attrs[1] = NULL;
+ ridstr = slapi_ch_smprintf("{replica %d ldap", rid);
+
+ search_pb = slapi_pblock_new();
+ slapi_search_internal_set_pb(search_pb, base_dn, LDAP_SCOPE_SUBTREE, filter, attrs, 0, NULL, NULL, repl_get_plugin_identity(PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_search_internal_pb (search_pb);
+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_RESULT, &res);
+
+ if ( LDAP_SUCCESS == res ) {
+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &entries);
+ if (NULL == entries || entries[0] == NULL) {
+ /* Hmmm, no tombstpne! Error out */
+ } else {
+ /* find the right ruv element, and find the maxcsn */
+ ruv_elements = slapi_entry_attr_get_charray(entries[0],attrs[0]);
+ for(i = 0; ruv_elements && ruv_elements[i] ; i++){
+ if(strstr(ruv_elements[i], ridstr)){
+ /* get the max csn */
+ ruv_part = ldap_utf8strtok_r(ruv_elements[i], " ", &iter);
+ for(part_count = 1; ruv_part && part_count < 5; part_count++){
+ ruv_part = ldap_utf8strtok_r(iter, " ", &iter);
+ }
+ if(part_count == 5 && ruv_part){/* we have the maxcsn */
+ maxcsn = slapi_ch_strdup(ruv_part);
+ break;
+ }
+ }
+ }
+ slapi_ch_array_free(ruv_elements);
+ }
+ } else {
+ /* internal search failed */
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Get MaxCSN Task: internal search failed (%d)\n", res);
+ }
+ if(maxcsn == NULL){
+ maxcsn = slapi_ch_strdup(CLEANRUV_NO_MAXCSN);
+ }
+ /*
+ * Send the extended op response
+ */
+ if ((resp_bere = der_alloc())){
+ ber_printf(resp_bere, "{s}", maxcsn);
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);
@@ -1761,10 +1875,96 @@ free_and_return:
rc = LDAP_OPERATIONS_ERROR;
}
+free_and_return:
+ slapi_free_search_results_internal(search_pb);
+ slapi_pblock_destroy(search_pb);
+ slapi_ch_free_string(&payload);
+ slapi_ch_free_string(&maxcsn);
+ slapi_ch_free_string(&ridstr);
+
return rc;
}
/*
+ * Search cn=config for the cleanallruv attributes (clean & abort)
+ */
+int
+multimaster_extop_cleanruv_check_status(Slapi_PBlock *pb)
+{
+ Slapi_PBlock *search_pb = NULL;
+ Slapi_Entry **entries = NULL;
+ struct berval *resp_bval = NULL;
+ struct berval *extop_payload;
+ BerElement *resp_bere = NULL;
+ char *response = NULL;
+ char *filter = NULL;
+ char *extop_oid;
+ int res = 0;
+ int rc = LDAP_OPERATIONS_ERROR;
+
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
+ slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_payload);
+
+ if (NULL == extop_oid || strcmp(extop_oid, REPL_CLEANRUV_CHECK_STATUS_OID) != 0 ||
+ NULL == extop_payload || NULL == extop_payload->bv_val){
+ /* something is wrong, error out */
+ goto free_and_return;
+ }
+ /*
+ * Decode the payload - which should just be a filter
+ */
+ if(decode_cleanruv_payload(extop_payload, &filter)){
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "CleanAllRUV Check Status Task: failed to decode payload. Aborting ext op\n");
+ goto free_and_return;
+ }
+
+ search_pb = slapi_pblock_new();
+ slapi_search_internal_set_pb(search_pb, "cn=config", LDAP_SCOPE_SUBTREE,
+ filter, NULL, 0, NULL, NULL, repl_get_plugin_identity(PLUGIN_MULTIMASTER_REPLICATION), 0);
+ slapi_search_internal_pb (search_pb);
+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_RESULT, &res);
+ if ( LDAP_SUCCESS == res ) {
+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &entries);
+ if (NULL == entries || entries[0] == NULL) {
+ /* cleaning task has finished, send repsonse */
+ response = CLEANRUV_FINISHED;
+ } else {
+ response = CLEANRUV_CLEANING;
+ }
+ /*
+ * Send the extended op response
+ */
+ if ((resp_bere = der_alloc())){
+ ber_printf(resp_bere, "{s}", 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);
+ }
+ /* tell extendop code that we have already sent the result */
+ rc = SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
+ }
+ }
+
+free_and_return:
+
+ slapi_free_search_results_internal(search_pb);
+ slapi_pblock_destroy(search_pb);
+ slapi_ch_free_string(&filter);
+
+ return rc;
+}
+
+
+/*
* This plugin entry point is a noop entry
* point. It's used when registering extops that
* are only used as responses. We'll never receive
diff --git a/ldap/servers/plugins/replication/replutil.c b/ldap/servers/plugins/replication/replutil.c
index 5e8019c..d007f6c 100644
--- a/ldap/servers/plugins/replication/replutil.c
+++ b/ldap/servers/plugins/replication/replutil.c
@@ -765,33 +765,32 @@ repl_set_mtn_state_and_referrals(
ldap_free_urldesc(lud);
}
- if (!referrals_to_set) { /* deleting referrals */
- /* Set state before */
- if (!chain_on_update) {
- slapi_mtn_set_state(repl_root_sdn, (char *)mtn_state);
+ if (!referrals_to_set) { /* deleting referrals */
+ /* Set state before */
+ if (!chain_on_update) {
+ slapi_mtn_set_state(repl_root_sdn, (char *)mtn_state);
+ }
+ /* We should delete referral only if we want to set the
+ replica database in backend state mode */
+ /* if chain on update mode, go ahead and set the referrals anyway */
+ if (strcasecmp(mtn_state, STATE_BACKEND) == 0 || chain_on_update) {
+ rc = slapi_mtn_set_referral(repl_root_sdn, referrals_to_set);
+ if (rc == LDAP_NO_SUCH_ATTRIBUTE) {
+ /* we will get no such attribute (16) if we try to set the referrals to NULL if
+ there are no referrals - not an error */
+ rc = LDAP_SUCCESS;
}
- /* We should delete referral only if we want to set the
- replica database in backend state mode */
- /* if chain on update mode, go ahead and set the referrals anyway */
- if (strcasecmp(mtn_state, STATE_BACKEND) == 0 || chain_on_update) {
- rc = slapi_mtn_set_referral(repl_root_sdn, referrals_to_set);
- if (rc == LDAP_NO_SUCH_ATTRIBUTE) {
- /* we will get no such attribute (16) if we try to set the referrals to NULL if
- there are no referrals - not an error */
- rc = LDAP_SUCCESS;
- }
- }
- } else { /* Replacing */
- rc = slapi_mtn_set_referral(repl_root_sdn, referrals_to_set);
- if (rc == LDAP_SUCCESS && !chain_on_update){
- slapi_mtn_set_state(repl_root_sdn, (char *)mtn_state);
- }
- }
+ }
+ } else { /* Replacing */
+ rc = slapi_mtn_set_referral(repl_root_sdn, referrals_to_set);
+ if (rc == LDAP_SUCCESS && !chain_on_update){
+ slapi_mtn_set_state(repl_root_sdn, (char *)mtn_state);
+ }
+ }
- if (rc != LDAP_SUCCESS && rc != LDAP_TYPE_OR_VALUE_EXISTS) {
+ if (rc != LDAP_SUCCESS && rc != LDAP_TYPE_OR_VALUE_EXISTS) {
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "repl_set_mtn_referrals: could "
- "not set referrals for replica %s: %d\n",
- slapi_sdn_get_dn(repl_root_sdn), rc);
+ "not set referrals for replica %s: %d\n", slapi_sdn_get_dn(repl_root_sdn), rc);
}
charray_free(referrals_to_set);
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
index 0db1f87..19f53e5 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
@@ -71,6 +71,11 @@ void modify_init(modify_context *mc,struct backentry *old_entry)
int modify_apply_mods(modify_context *mc, Slapi_Mods *smods)
{
+ return modify_apply_mods_ignore_error(mc, smods, -1);
+}
+
+int modify_apply_mods_ignore_error(modify_context *mc, Slapi_Mods *smods, int error)
+{
int ret = 0;
/* Make a copy of the entry */
PR_ASSERT(mc->old_entry != NULL);
@@ -78,7 +83,7 @@ int modify_apply_mods(modify_context *mc, Slapi_Mods *smods)
mc->new_entry = backentry_dup(mc->old_entry);
PR_ASSERT(smods!=NULL);
if ( mods_have_effect (mc->new_entry->ep_entry, smods) ) {
- ret = entry_apply_mods( mc->new_entry->ep_entry, slapi_mods_get_ldapmods_byref(smods));
+ ret = entry_apply_mods_ignore_error( mc->new_entry->ep_entry, slapi_mods_get_ldapmods_byref(smods), error);
}
mc->smods= smods;
return ret;
diff --git a/ldap/servers/slapd/back-ldbm/misc.c b/ldap/servers/slapd/back-ldbm/misc.c
index cfc5e5c..56a8298 100644
--- a/ldap/servers/slapd/back-ldbm/misc.c
+++ b/ldap/servers/slapd/back-ldbm/misc.c
@@ -450,7 +450,7 @@ ldbm_txn_ruv_modify_context( Slapi_PBlock *pb, modify_context *mc )
modify_init( mc, bentry );
- if (modify_apply_mods( mc, smods )) {
+ if (modify_apply_mods_ignore_error( mc, smods, LDAP_TYPE_OR_VALUE_EXISTS )) {
LDAPDebug( LDAP_DEBUG_ANY, "Error: ldbm_txn_ruv_modify_context failed to apply updates to RUV entry\n",
0, 0, 0 );
rc = -1;
diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
index 40fa325..7cbaff7 100644
--- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -353,6 +353,7 @@ void modify_init(modify_context *mc,struct backentry *old_entry);
int modify_apply_mods(modify_context *mc, Slapi_Mods *smods);
int modify_term(modify_context *mc,backend *be);
int modify_switch_entries(modify_context *mc,backend *be);
+int modify_apply_mods_ignore_error(modify_context *mc, Slapi_Mods *smods, int error);
/*
* add.c
diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c
index 85b47a6..5d3e44d 100644
--- a/ldap/servers/slapd/entry.c
+++ b/ldap/servers/slapd/entry.c
@@ -3286,6 +3286,12 @@ int slapi_entry_apply_mod( Slapi_Entry *e, LDAPMod *mod )
int
entry_apply_mods( Slapi_Entry *e, LDAPMod **mods )
{
+ return entry_apply_mods_ignore_error(e, mods, -1);
+}
+
+int
+entry_apply_mods_ignore_error( Slapi_Entry *e, LDAPMod **mods, int ignore_error )
+{
int err;
LDAPMod **mp = NULL;
@@ -3295,7 +3301,9 @@ entry_apply_mods( Slapi_Entry *e, LDAPMod **mods )
for ( mp = mods; mp && *mp; mp++ )
{
err = entry_apply_mod( e, *mp );
- if ( err != LDAP_SUCCESS ) {
+ if(err == ignore_error){
+ (*mp)->mod_op = LDAP_MOD_IGNORE;
+ } else if ( err != LDAP_SUCCESS ) {
break;
}
}
diff --git a/ldap/servers/slapd/slapi-private.h b/ldap/servers/slapd/slapi-private.h
index 3ee1755..7bd7f3e 100644
--- a/ldap/servers/slapd/slapi-private.h
+++ b/ldap/servers/slapd/slapi-private.h
@@ -331,7 +331,7 @@ int entry_next_deleted_attribute( const Slapi_Entry *e, Slapi_Attr **a);
/* entry.c */
int entry_apply_mods( Slapi_Entry *e, LDAPMod **mods );
int is_type_protected(const char *type);
-
+int entry_apply_mods_ignore_error( Slapi_Entry *e, LDAPMod **mods, int ignore_error );
int slapi_entries_diff(Slapi_Entry **old_entries, Slapi_Entry **new_entries, int testall, const char *logging_prestr, const int force_update, void *plg_id);
/* entrywsi.c */
1
0
ldap/servers/slapd/attrsyntax.c | 16 ++++++++++------
ldap/servers/slapd/libglobs.c | 32 ++++++++++++++++++++++++++++++++
ldap/servers/slapd/proto-slap.h | 1 +
ldap/servers/slapd/schema.c | 9 +++++++++
ldap/servers/slapd/slap.h | 2 ++
5 files changed, 54 insertions(+), 6 deletions(-)
New commits:
commit f102eb72cf8928a585a33423124c2c98a2048bce
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Mon Nov 19 13:48:23 2012 +0100
Fix for ticket 504
diff --git a/ldap/servers/slapd/attrsyntax.c b/ldap/servers/slapd/attrsyntax.c
index 59506a0..3c062f1 100644
--- a/ldap/servers/slapd/attrsyntax.c
+++ b/ldap/servers/slapd/attrsyntax.c
@@ -67,11 +67,12 @@ static PLHashTable *internalasi = NULL;
static PLHashTable *name2asi = NULL;
/* read/write lock to protect table */
static Slapi_RWLock *name2asi_lock = NULL;
+static int asi_locking = 1;
-#define AS_LOCK_READ(l) slapi_rwlock_rdlock(l)
-#define AS_LOCK_WRITE(l) slapi_rwlock_wrlock(l)
-#define AS_UNLOCK_READ(l) slapi_rwlock_unlock(l)
-#define AS_UNLOCK_WRITE(l) slapi_rwlock_unlock(l)
+#define AS_LOCK_READ(l) if (asi_locking) { slapi_rwlock_rdlock(l); }
+#define AS_LOCK_WRITE(l) if (asi_locking) { slapi_rwlock_wrlock(l); }
+#define AS_UNLOCK_READ(l) if (asi_locking) { slapi_rwlock_unlock(l); }
+#define AS_UNLOCK_WRITE(l) if (asi_locking) { slapi_rwlock_unlock(l); }
@@ -1043,12 +1044,15 @@ attr_syntax_delete_all()
static int
attr_syntax_init(void)
{
+ int schema_modify_enabled = config_get_schemamod();
+ if (!schema_modify_enabled) asi_locking = 0;
+
if (!oid2asi)
{
oid2asi = PL_NewHashTable(2047, hashNocaseString,
hashNocaseCompare,
PL_CompareValues, 0, 0);
- if ( NULL == ( oid2asi_lock = slapi_new_rwlock())) {
+ if ( asi_locking && NULL == ( oid2asi_lock = slapi_new_rwlock())) {
if(oid2asi) PL_HashTableDestroy(oid2asi);
oid2asi = NULL;
@@ -1063,7 +1067,7 @@ attr_syntax_init(void)
name2asi = PL_NewHashTable(2047, hashNocaseString,
hashNocaseCompare,
PL_CompareValues, 0, 0);
- if ( NULL == ( name2asi_lock = slapi_new_rwlock())) {
+ if ( asi_locking && NULL == ( name2asi_lock = slapi_new_rwlock())) {
if(name2asi) PL_HashTableDestroy(name2asi);
name2asi = NULL;
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index caae9ee..dee7812 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -220,6 +220,7 @@ int init_pw_change;
int init_pw_exp;
int init_pw_syntax;
int init_schemacheck;
+int init_schemamod;
int init_ds4_compatible_schema;
int init_schema_ignore_trailing_spaces;
int init_enquote_sup_oc;
@@ -506,6 +507,10 @@ static struct config_get_and_set {
NULL, 0,
(void**)&global_slapdFrontendConfig.schemacheck,
CONFIG_ON_OFF, NULL, &init_schemacheck},
+ {CONFIG_SCHEMAMOD_ATTRIBUTE, config_set_schemamod,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.schemamod,
+ CONFIG_ON_OFF, NULL, &init_schemamod},
{CONFIG_SYNTAXCHECK_ATTRIBUTE, config_set_syntaxcheck,
NULL, 0,
(void**)&global_slapdFrontendConfig.syntaxcheck,
@@ -1315,6 +1320,7 @@ FrontendConfig_init () {
cfg->timelimit = SLAPD_DEFAULT_TIMELIMIT;
cfg->anon_limits_dn = slapi_ch_strdup("");
init_schemacheck = cfg->schemacheck = LDAP_ON;
+ init_schemamod = cfg->schemamod = LDAP_ON;
init_syntaxcheck = cfg->syntaxcheck = LDAP_OFF;
init_plugin_track = cfg->plugin_track = LDAP_OFF;
init_syntaxlogging = cfg->syntaxlogging = LDAP_OFF;
@@ -3115,6 +3121,20 @@ config_set_schemacheck( const char *attrname, char *value, char *errorbuf, int a
}
int
+config_set_schemamod( const char *attrname, char *value, char *errorbuf, int apply ) {
+ int retVal = LDAP_SUCCESS;
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+
+ retVal = config_set_onoff ( attrname,
+ value,
+ &(slapdFrontendConfig->schemamod),
+ errorbuf,
+ apply);
+
+ return retVal;
+}
+
+int
config_set_syntaxcheck( const char *attrname, char *value, char *errorbuf, int apply ) {
int retVal = LDAP_SUCCESS;
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
@@ -4835,6 +4855,18 @@ config_get_schemacheck() {
}
int
+config_get_schemamod() {
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+ int retVal;
+
+ CFG_LOCK_READ(slapdFrontendConfig);
+ retVal = slapdFrontendConfig->schemamod;
+ CFG_UNLOCK_READ(slapdFrontendConfig);
+
+ return retVal;
+}
+
+int
config_get_syntaxcheck() {
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
int retVal;
diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
index 19c06a2..d206c6d 100644
--- a/ldap/servers/slapd/proto-slap.h
+++ b/ldap/servers/slapd/proto-slap.h
@@ -287,6 +287,7 @@ int config_set_accesscontrol( const char *attrname, char *value, char *errorbuf,
int config_set_security( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_readonly( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_schemacheck( const char *attrname, char *value, char *errorbuf, int apply );
+int config_set_schemamod( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_syntaxcheck( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_syntaxlogging( const char *attrname, char *value, char *errorbuf, int apply );
int config_set_plugin_tracking( const char *attrname, char *value, char *errorbuf, int apply );
diff --git a/ldap/servers/slapd/schema.c b/ldap/servers/slapd/schema.c
index c66c320..5eb6520 100644
--- a/ldap/servers/slapd/schema.c
+++ b/ldap/servers/slapd/schema.c
@@ -1648,9 +1648,18 @@ modify_schema_dse (Slapi_PBlock *pb, Slapi_Entry *entryBefore, Slapi_Entry *entr
LDAPMod **mods = NULL;
int num_mods = 0; /* count the number of mods */
int schema_ds4x_compat = config_get_ds4_compatible_schema();
+ int schema_modify_enabled = config_get_schemamod();
int reapply_mods = 0;
int is_replicated_operation = 0;
+ if (!schema_modify_enabled) {
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ schema_create_errormsg( returntext, SLAPI_DSE_RETURNTEXT_SIZE,
+ schema_errprefix_generic, "Generic",
+ "schema update is disabled" );
+ return (SLAPI_DSE_CALLBACK_ERROR);
+ }
+
slapi_pblock_get( pb, SLAPI_MODIFY_MODS, &mods );
slapi_pblock_get( pb, SLAPI_IS_REPLICATED_OPERATION, &is_replicated_operation);
schema_dse_lock_write();
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index cc99486..8b43f5a 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -1872,6 +1872,7 @@ typedef struct _slapdEntryPoints {
#define CONFIG_OBJECTCLASS_ATTRIBUTE "nsslapd-objectclass"
#define CONFIG_ATTRIBUTE_ATTRIBUTE "nsslapd-attribute"
#define CONFIG_SCHEMACHECK_ATTRIBUTE "nsslapd-schemacheck"
+#define CONFIG_SCHEMAMOD_ATTRIBUTE "nsslapd-schemamod"
#define CONFIG_SYNTAXCHECK_ATTRIBUTE "nsslapd-syntaxcheck"
#define CONFIG_SYNTAXLOGGING_ATTRIBUTE "nsslapd-syntaxlogging"
#define CONFIG_DN_VALIDATE_STRICT_ATTRIBUTE "nsslapd-dn-validate-strict"
@@ -2097,6 +2098,7 @@ typedef struct _slapdFrontendConfig {
int readonly;
int reservedescriptors;
int schemacheck;
+ int schemamod;
int syntaxcheck;
int syntaxlogging;
int dn_validate_strict;
1
0
ldap/servers/slapd/modify.c | 170 +++++++++++++++++++++++++++++++++++++++++---
1 file changed, 161 insertions(+), 9 deletions(-)
New commits:
commit ecf3cc3436accbae478ebe0774e817ead91c6fdf
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Nov 19 15:52:32 2012 -0500
Ticket 394 - modify-delete userpassword
Bug Description: Attempting to delete a specific user password results in an error 16 - if
you are not using clear-text password storage scheme.
Fix Description: The error is caused because it can not find a userpassword attr with
the clear-text password - as its usually encoded. If you know the correct
userpassword encoded value to delete, then you won't get an error 16, but
the unhashed userpassword will not be removed.
This fix checks the scheme of the password value to delete, then compares it
to all the userpassword attrs. Once we find a match, we change the "value to delete"
to the encoded value.
If you do supply an encoded password value to delete, we do the opposite. We
grab all the clear-text unhashed userpasswords from the password entry extension.
Then we compare each one to the hashed value. If we have a match, we know which
unhashed userpassword to delete.
Also, added a check to make sure we don't add encoded values to the unhashed_password
extension.
https://fedorahosted.org/389/ticket/394
Reviewed by: richm (Thank you)
diff --git a/ldap/servers/slapd/modify.c b/ldap/servers/slapd/modify.c
index 424badb..867e391 100644
--- a/ldap/servers/slapd/modify.c
+++ b/ldap/servers/slapd/modify.c
@@ -80,6 +80,7 @@ static void remove_mod (Slapi_Mods *smods, const char *type, Slapi_Mods *smod_un
#endif
static int op_shared_allow_pw_change (Slapi_PBlock *pb, LDAPMod *mod, char **old_pw, Slapi_Mods *smods);
static int hash_rootpw (LDAPMod **mods);
+static int valuearray_init_bervalarray_unhashed_only(struct berval **bvals, Slapi_Value ***cvals);
#ifdef LDAP_DEBUG
static const char*
@@ -836,19 +837,137 @@ static void op_shared_modify (Slapi_PBlock *pb, int pw_change, char *old_pw)
if (strcasecmp (pw_mod->mod_type, SLAPI_USERPWD_ATTR) != 0)
continue;
- if (LDAP_MOD_DELETE == pw_mod->mod_op) {
+ if (SLAPI_IS_MOD_DELETE(pw_mod->mod_op)) {
Slapi_Attr *a = NULL;
- /* delete pseudo password attribute if it exists in the entry */
- if (!slapi_entry_attr_find(e, unhashed_pw_attr, &a)) {
- slapi_mods_add_mod_values(&smods, pw_mod->mod_op,
- unhashed_pw_attr, va);
+ struct pw_scheme *pwsp = NULL;
+ int remove_unhashed_pw = 1;
+ char *password = NULL;
+ char *valpwd = NULL;
+
+ /* if there are mod values, we need to delete a specific userpassword */
+ for ( i = 0; pw_mod->mod_bvalues != NULL && pw_mod->mod_bvalues[i] != NULL; i++ ) {
+ password = slapi_ch_strdup(pw_mod->mod_bvalues[i]->bv_val);
+ pwsp = pw_val2scheme( password, &valpwd, 1 );
+ if(strcmp(pwsp->pws_name, "CLEAR") == 0){
+ /*
+ * CLEAR password
+ *
+ * Ok, so now we to check the entry's userpassword values.
+ * First, find out the password encoding of the entry's pw.
+ * Then compare our clear text password to the encoded userpassword
+ * using the proper scheme. If we have a match, we know which
+ * userpassword value to delete.
+ */
+ Slapi_Attr *pw = NULL;
+ struct berval bval, *bv[2];
+
+ if(slapi_entry_attr_find(e, SLAPI_USERPWD_ATTR, &pw) == 0 && pw){
+ struct pw_scheme *pass_scheme = NULL;
+ Slapi_Value **present_values = NULL;
+ char *pval = NULL;
+ int ii;
+
+ present_values = attr_get_present_values(pw);
+ for(ii = 0; present_values && present_values[ii]; ii++){
+ const char *userpwd = slapi_value_get_string(present_values[ii]);
+
+ pass_scheme = pw_val2scheme( (char *)userpwd, &pval, 1 );
+ if(strcmp(pass_scheme->pws_name,"CLEAR")){
+ /* its encoded, so compare it */
+ if((*(pass_scheme->pws_cmp))( valpwd, pval ) == 0 ){
+ /*
+ * Match, replace the mod value with the encoded password
+ */
+ slapi_ch_free_string(&pw_mod->mod_bvalues[i]->bv_val);
+ pw_mod->mod_bvalues[i]->bv_val = strdup(userpwd);
+ pw_mod->mod_bvalues[i]->bv_len = strlen(userpwd);
+ free_pw_scheme( pass_scheme );
+ break;
+ }
+ } else {
+ /* userpassword is already clear text, nothing to do */
+ free_pw_scheme( pass_scheme );
+ break;
+ }
+ free_pw_scheme( pass_scheme );
+ }
+ }
+ /*
+ * Finally, delete the unhashed userpassword
+ * (this will update the password entry extension)
+ */
+ bval.bv_val = password;
+ bval.bv_len = strlen(password);
+ bv[0] = &bval;
+ bv[1] = NULL;
+ valuearray_init_bervalarray(bv, &va);
+ slapi_mods_add_mod_values(&smods, pw_mod->mod_op, unhashed_pw_attr, va);
+ valuearray_free(&va);
+ } else {
+ /*
+ * Password is encoded, try and find a matching unhashed_password to delete
+ */
+ Slapi_Value **vals;
+
+ /*
+ * Grab the current unhashed passwords from the password entry extension,
+ * as the "attribute" is no longer present in the entry.
+ */
+ if(slapi_pw_get_entry_ext(e, &vals) == LDAP_SUCCESS){
+ int ii;
+
+ for(ii = 0; vals && vals[ii]; ii++){
+ const char *unhashed_pwd = slapi_value_get_string(vals[ii]);
+ struct pw_scheme *unhashed_pwsp = NULL;
+ struct berval bval, *bv[2];
+
+ /* prepare the value to delete from the list of unhashed userpasswords */
+ bval.bv_val = (char *)unhashed_pwd;
+ bval.bv_len = strlen(unhashed_pwd);
+ bv[0] = &bval;
+ bv[1] = NULL;
+ /*
+ * Compare the clear text unhashed password, to the encoded password
+ * provided by the client.
+ */
+ unhashed_pwsp = pw_val2scheme( (char *)unhashed_pwd, NULL, 1 );
+ if(strcmp(unhashed_pwsp->pws_name, "CLEAR") == 0){
+ if((*(pwsp->pws_cmp))((char *)unhashed_pwd , valpwd) == 0 ){
+ /* match, add the delete mod for this particular unhashed userpassword */
+ valuearray_init_bervalarray(bv, &va);
+ slapi_mods_add_mod_values(&smods, pw_mod->mod_op, unhashed_pw_attr, va);
+ valuearray_free(&va);
+ free_pw_scheme( unhashed_pwsp );
+ break;
+ }
+ } else {
+ /*
+ * We have a hashed unhashed_userpassword! We must delete it.
+ */
+ valuearray_init_bervalarray(bv, &va);
+ slapi_mods_add_mod_values(&smods, pw_mod->mod_op, unhashed_pw_attr, va);
+ valuearray_free(&va);
+ }
+ free_pw_scheme( unhashed_pwsp );
+ }
+ } else {
+
+ }
+ }
+ remove_unhashed_pw = 0; /* mark that we already removed the unhashed userpassword */
+ slapi_ch_free_string(&password);
+ free_pw_scheme( pwsp );
+ }
+ if (remove_unhashed_pw && !slapi_entry_attr_find(e, unhashed_pw_attr, &a)){
+ slapi_mods_add_mod_values(&smods, pw_mod->mod_op,unhashed_pw_attr, va);
}
} else {
/* add pseudo password attribute */
- valuearray_init_bervalarray(pw_mod->mod_bvalues, &va);
- slapi_mods_add_mod_values(&smods, pw_mod->mod_op,
- unhashed_pw_attr, va);
- valuearray_free(&va);
+ valuearray_init_bervalarray_unhashed_only(pw_mod->mod_bvalues, &va);
+ if(va){
+ slapi_mods_add_mod_values(&smods, pw_mod->mod_op, unhashed_pw_attr, va);
+ valuearray_free(&va);
+ }
}
/* Init new value array for hashed value */
@@ -859,6 +978,7 @@ static void op_shared_modify (Slapi_PBlock *pb, int pw_change, char *old_pw)
/* remove current clear value of userpassword */
ber_bvecfree(pw_mod->mod_bvalues);
+
/* add the cipher in the structure */
valuearray_get_bervalarray(va, &pw_mod->mod_bvalues);
@@ -1020,6 +1140,38 @@ free_and_return:
}
}
+/*
+ * Only add password mods that are in clear text. The console likes to send two mods:
+ * - Already encoded password
+ * - Clear text password
+ *
+ * We don't want to add the encoded value to the unhashed_userpassword attr
+ */
+static int
+valuearray_init_bervalarray_unhashed_only(struct berval **bvals, Slapi_Value ***cvals)
+{
+ int n;
+
+ for(n=0; bvals != NULL && bvals[n] != NULL; n++);
+ if(n==0){
+ *cvals = NULL;
+ } else {
+ struct pw_scheme *pwsp = NULL;
+ int i,p;
+
+ *cvals = (Slapi_Value **) slapi_ch_malloc((n + 1) * sizeof(Slapi_Value *));
+ for(i=0,p=0;i<n;i++){
+ pwsp = pw_val2scheme( bvals[i]->bv_val, NULL, 1 );
+ if(strcmp(pwsp->pws_name, "CLEAR") == 0){
+ (*cvals)[p++] = slapi_value_new_berval(bvals[i]);
+ }
+ free_pw_scheme( pwsp );
+ }
+ (*cvals)[p] = NULL;
+ }
+ return n;
+}
+
#if 0 /* not used */
static void remove_mod (Slapi_Mods *smods, const char *type, Slapi_Mods *smod_unhashed)
{
1
0
ldap/servers/plugins/rootdn_access/rootdn_access.c | 1 +
ldap/servers/slapd/back-ldbm/dblayer.c | 2 +-
ldap/servers/slapd/util.c | 6 +++++-
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 32ab01f55684859213bfebf8190b82ba84f374c5
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Oct 25 17:16:08 2012 -0600
minor fixes for bdb 4.2/4.3 and mozldap
diff --git a/ldap/servers/plugins/rootdn_access/rootdn_access.c b/ldap/servers/plugins/rootdn_access/rootdn_access.c
index ad1e125..5323915 100644
--- a/ldap/servers/plugins/rootdn_access/rootdn_access.c
+++ b/ldap/servers/plugins/rootdn_access/rootdn_access.c
@@ -46,6 +46,7 @@
#include <nspr.h>
#include <time.h>
#include <ctype.h>
+#include <string.h>
/*
* Add an entry like the following to dse.ldif to enable this plugin:
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
index 26007f4..5e53de9 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -136,7 +136,7 @@
#define LOG_FLUSH(env, lsn) (env)->log_flush((env), (lsn))
#define LOCK_DETECT(env, flags, atype, aborted) \
(env)->lock_detect((env), (flags), (atype), (aborted))
-#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4000 /* db4.4 or later */
+#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4400 /* db4.4 or later */
#define DB_ENV_SET_TAS_SPINS(env, tas_spins) \
(env)->mutex_set_tas_spins((env), (tas_spins))
#else /* < 4.4 */
diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c
index a70910f..bdff366 100644
--- a/ldap/servers/slapd/util.c
+++ b/ldap/servers/slapd/util.c
@@ -340,12 +340,16 @@ filter_stuff_func(void *arg, const char *val, PRUint32 slen)
buf = escaped_filter.bv_val;
}
#else
+ char *val2 = NULL;
buf = slapi_ch_calloc(sizeof(char), filter_len*3 + 1);
- if(do_escape_string(val, filter_len, buf, special_filter) == NULL){
+ val2 = do_escape_string(val, filter_len, buf, special_filter);
+ if(val2 == 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 if (val == val2) { /* value did not need escaping and was just returned */
+ strcpy(buf, val); /* just use value as-is - len did not change */
} else {
filter_len = strlen(buf);
}
1
0
ldap/servers/slapd/connection.c | 90 ++++++++++++++++++++++++++--------------
1 file changed, 59 insertions(+), 31 deletions(-)
New commits:
commit 48b35ec4e48a38c257d5b9a5d2ef584661895261
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Sun Oct 14 16:46:16 2012 -0700
Trac Ticket #276 - Multiple threads simultaneously working on
connection's private buffer causes ns-slapd to abort
https://fedorahosted.org/389/ticket/276
Bug description: When a connection is to be released, the current
code releases the connection object before making it readable,
which leaves a small window for multiple threads accessing the
same private buffer.
Fix description: This patch moves the location of releasing the
connection object after the connection is readable.
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index a3b1df5..d598b0b 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -2029,6 +2029,11 @@ void connection_make_readable(Connection *conn)
signal_listner();
}
+void connection_make_readable_nolock(Connection *conn)
+{
+ conn->c_gettingber = 0;
+}
+
/*
* Figure out the operation completion rate for this connection
*/
@@ -2166,7 +2171,8 @@ connection_threadmain()
Connection *conn = NULL;
Operation *op;
ber_tag_t tag = 0;
- int need_wakeup;
+ int need_wakeup = 0;
+ int need_conn_release = 0;
int thread_turbo_flag = 0;
int ret = 0;
int more_data = 0;
@@ -2303,7 +2309,7 @@ connection_threadmain()
* they are received off the wire.
*/
replication_connection = conn->c_isreplication_session;
- if (tag != LDAP_REQ_UNBIND && (!thread_turbo_flag) && !more_data && !replication_connection) {
+ if ((tag != LDAP_REQ_UNBIND) && !thread_turbo_flag && !more_data && !replication_connection) {
connection_make_readable(conn);
}
@@ -2350,53 +2356,75 @@ done:
/* total number of ops for the server */
slapi_counter_increment(ops_completed);
/* If this op isn't a persistent search, remove it */
+ need_conn_release = 0;
if ( !( pb->pb_op->o_flags & OP_FLAG_PS )) {
/* delete from connection operation queue & decr refcnt */
PR_Lock( conn->c_mutex );
connection_remove_operation( conn, op );
- /* destroying the pblock will cause destruction of the operation
- * so this must happend before releasing the connection
- */
+ /* destroying the pblock will cause destruction of the operation
+ * so this must happend before releasing the connection
+ */
slapi_pblock_destroy( pb );
- /* If we're in turbo mode, we keep our reference to the connection
- alive */
+ /* If we're in turbo mode, we keep our reference to the connection
+ alive */
if (!thread_turbo_flag && !more_data) {
- connection_release_nolock (conn);
- }
+ /*
+ * Don't release the connection now.
+ * But note down what to do.
+ */
+ need_conn_release = 1;
+ }
PR_Unlock( conn->c_mutex );
} else { /* the ps code acquires a ref to the conn - we need to release ours here */
PR_Lock( conn->c_mutex );
- connection_release_nolock (conn);
+ connection_release_nolock (conn);
PR_Unlock( conn->c_mutex );
}
- /* Since we didn't do so earlier, we need to make a replication connection readable again here */
- if ( ((1 == is_timedout) || (replication_connection && !thread_turbo_flag)) && !more_data)
- connection_make_readable(conn);
pb = NULL;
if (doshutdown) {
+ PR_Lock(conn->c_mutex);
+ connection_make_readable_nolock(conn);
+ conn->c_threadnumber--;
+ connection_release_nolock(conn);
+ PR_Unlock(conn->c_mutex);
+ signal_listner();
return;
}
- if (!thread_turbo_flag && !more_data) { /* Don't do this in turbo mode */
- PR_Lock( conn->c_mutex );
- /* if the threadnumber of now below the maximum, wakeup
- * the listener thread so that we start polling on this
- * connection again
- */
- /* DBDB I think this code is bogus -- we already signaled the listener above here */
- if (conn->c_threadnumber == config_get_maxthreadsperconn())
- need_wakeup = 1;
- else
- need_wakeup = 0;
- conn->c_threadnumber--;
- PR_Unlock( conn->c_mutex );
-
- if (need_wakeup)
- signal_listner();
+ if (!more_data) { /* no more data in the buffer */
+ if (!thread_turbo_flag) { /* Don't do this in turbo mode */
+ /* Since we didn't do so earlier, we need to make a
+ * replication connection readable again here */
+ PR_Lock( conn->c_mutex );
+ if (replication_connection || (1 == is_timedout)) {
+ connection_make_readable_nolock(conn);
+ need_wakeup = 1;
+ }
+ /* if the threadnumber of now below the maximum, wakeup
+ * the listener thread so that we start polling on this
+ * connection again
+ */
+ if (!need_wakeup) {
+ if (conn->c_threadnumber == config_get_maxthreadsperconn())
+ need_wakeup = 1;
+ else
+ need_wakeup = 0;
+ }
+ conn->c_threadnumber--;
+ if (need_conn_release) {
+ connection_release_nolock(conn);
+ }
+ PR_Unlock( conn->c_mutex );
+ /* Call signal_listner after releasing the
+ * connection if required. */
+ if (need_wakeup) {
+ signal_listner();
+ }
+ } else if (1 == is_timedout) {
+ connection_make_readable(conn);
+ }
}
-
-
} /* while (1) */
}
1
0
ldap/servers/slapd/back-ldbm/monitor.c | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 2f1021c8253ffe8c21e2a1e1a10a7953bda64948
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Fri Nov 16 16:58:35 2012 +0100
Fix for ticket 465: cn=monitor showing stats for other db instances
Check that part of the db file name that matches is the full db dir name
diff --git a/ldap/servers/slapd/back-ldbm/monitor.c b/ldap/servers/slapd/back-ldbm/monitor.c
index ee4f01a..1a06a25 100644
--- a/ldap/servers/slapd/back-ldbm/monitor.c
+++ b/ldap/servers/slapd/back-ldbm/monitor.c
@@ -196,6 +196,8 @@ int ldbm_back_monitor_instance_search(Slapi_PBlock *pb, Slapi_Entry *e,
if (strncmp(mpfstat[i]->file_name, inst->inst_dir_name,
strlen(inst->inst_dir_name)) != 0)
continue;
+ if (mpfstat[i]->file_name[strlen(inst->inst_dir_name)] != get_sep(mpfstat[i]->file_name))
+ continue;
/* Since the filenames are now relative, we need to construct an absolute version
* for the purpose of stat() etc below...
1
0
ldap/servers/plugins/dna/dna.c | 4 ++
ldap/servers/slapd/add.c | 56 +++++++++++++++++++++++++++++++++----
ldap/servers/slapd/opshared.c | 8 +++--
ldap/servers/slapd/proto-slap.h | 1
ldap/servers/slapd/slapi-private.h | 10 ++++++
5 files changed, 71 insertions(+), 8 deletions(-)
New commits:
commit fb8c9f305398f713154bc3d8dddeb89d3c9d386a
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Fri Oct 19 10:22:21 2012 -0400
Ticket 495 - internalModifiersname not updated by DNA plugin
Bug Description: If you are using the "nsslapd-plugin-binddn-tracking", and the DNA plugin
modifiers the entry, the internalmodifiersname is not updated.
Fix Description: This is because the DNA plugin directly modifies the entry, and does not
use the internal modify functions that would trigger the last mod attributes
to be updated. So we have to call the last mod update funtciont directly from
the dna plugin.
There is also a slight change to the behavior now. The internalModifiersname &
internalCreatorsname will never be the bind dn, but instead it will be the plugin
that actually did the update. So if a entry was not touched by a DS plugin, then
the "database" plugin would be the internal modifier/creator:
cn=ldbm database,cn=plugins,cn=config
This would also allow us to detect if someone replaced the default backend.
https://fedorahosted.org/389/ticket/495
Reviewed by: nhosoi(Thanks!)
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
index ef01735..66d4a05 100644
--- a/ldap/servers/plugins/dna/dna.c
+++ b/ldap/servers/plugins/dna/dna.c
@@ -2846,6 +2846,8 @@ _dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e)
/* no need to dup */
DNA_NEEDS_UPDATE);
}
+ /* Update the internalModifiersname for this add op */
+ add_internal_modifiersname(pb, e);
/* Make sure we don't generate for this
* type again by keeping a list of types
@@ -3101,6 +3103,8 @@ _dna_pre_op_modify(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Mods *smods)
/* no need to dup */
DNA_NEEDS_UPDATE);
}
+ /* Update the internalModifersname for this mod op */
+ modify_update_last_modified_attr(pb, smods);
/* Make sure we don't generate for this
* type again by keeping a list of types
diff --git a/ldap/servers/slapd/add.c b/ldap/servers/slapd/add.c
index 55deeee..3206d5b 100644
--- a/ldap/servers/slapd/add.c
+++ b/ldap/servers/slapd/add.c
@@ -73,7 +73,7 @@
/* Forward declarations */
static int add_internal_pb (Slapi_PBlock *pb);
static void op_shared_add (Slapi_PBlock *pb);
-static int add_created_attrs(Operation *op, Slapi_Entry *e);
+static int add_created_attrs(Slapi_PBlock *pb, Slapi_Entry *e);
static int check_rdn_for_created_attrs(Slapi_Entry *e);
static void handle_fast_add(Slapi_PBlock *pb, Slapi_Entry *entry);
static int add_uniqueid (Slapi_Entry *e);
@@ -631,7 +631,7 @@ static void op_shared_add (Slapi_PBlock *pb)
/* can get lastmod only after backend is selected */
slapi_pblock_get(pb, SLAPI_BE_LASTMOD, &lastmod);
- if (lastmod && add_created_attrs(operation, e) != 0)
+ if (lastmod && add_created_attrs(pb, e) != 0)
{
send_ldap_result(pb, LDAP_UNWILLING_TO_PERFORM, NULL,
"cannot insert computed attributes", 0, NULL);
@@ -745,20 +745,25 @@ done:
}
static int
-add_created_attrs(Operation *op, Slapi_Entry *e)
+add_created_attrs(Slapi_PBlock *pb, Slapi_Entry *e)
{
char buf[20];
char *binddn = NULL;
+ char *plugin_dn = NULL;
struct berval bv;
struct berval *bvals[2];
time_t curtime;
struct tm ltm;
+ Operation *op;
+ struct slapdplugin *plugin = NULL;
+ struct slapi_componentid *cid = NULL;
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
LDAPDebug(LDAP_DEBUG_TRACE, "add_created_attrs\n", 0, 0, 0);
bvals[0] = &bv;
bvals[1] = NULL;
+ slapi_pblock_get(pb, SLAPI_OPERATION, &op);
if(slapdFrontendConfig->plugin_track){
/* plugin bindDN tracking is enabled, grab the dn from thread local storage */
@@ -766,8 +771,21 @@ add_created_attrs(Operation *op, Slapi_Entry *e)
bv.bv_val = "";
bv.bv_len = strlen(bv.bv_val);
} else {
- bv.bv_val = (char*)slapi_sdn_get_dn(&op->o_sdn);
- bv.bv_len = strlen(bv.bv_val);
+ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &cid);
+ if (cid){
+ plugin=(struct slapdplugin *) cid->sci_plugin;
+ } else {
+ slapi_pblock_get (pb, SLAPI_PLUGIN, &plugin);
+ }
+ if(plugin)
+ plugin_dn = plugin_get_dn (plugin);
+ if(plugin_dn){
+ bv.bv_val = plugin_dn;
+ bv.bv_len = strlen(bv.bv_val);
+ } else {
+ bv.bv_val = (char*)slapi_sdn_get_dn(&op->o_sdn);
+ bv.bv_len = strlen(bv.bv_val);
+ }
}
slapi_entry_attr_replace(e, "internalCreatorsName", bvals);
slapi_entry_attr_replace(e, "internalModifiersName", bvals);
@@ -971,3 +989,31 @@ check_oc_subentry(Slapi_Entry *e, struct berval **vals, char *normtype) {
}
return subentry;
}
+
+/*
+ * Used by plugins that modify entries on add operations, otherwise the internalModifiersname
+ * would be incorrect.
+ */
+void
+add_internal_modifiersname(Slapi_PBlock *pb, Slapi_Entry *e)
+{
+ slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+ struct slapi_componentid *cid = NULL;
+ struct slapdplugin *plugin = NULL;
+ char *plugin_dn = NULL;
+
+ if(slapdFrontendConfig->plugin_track){
+ /* plugin bindDN tracking is enabled, grab the bind dn from thread local storage */
+ slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &cid);
+ if (cid){
+ plugin=(struct slapdplugin *) cid->sci_plugin;
+ } else {
+ slapi_pblock_get (pb, SLAPI_PLUGIN, &plugin);
+ }
+ if(plugin)
+ plugin_dn = plugin_get_dn (plugin);
+ if(plugin_dn){
+ slapi_entry_attr_set_charptr(e, "internalModifiersname", plugin_dn);
+ }
+ }
+}
diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c
index 2701250..485763e 100644
--- a/ldap/servers/slapd/opshared.c
+++ b/ldap/servers/slapd/opshared.c
@@ -133,7 +133,8 @@ do_ps_service(Slapi_Entry *e, Slapi_Entry *eprev, ber_int_t chgtype, ber_int_t c
(ps_service_fn)(e, eprev, chgtype, chgnum);
}
-void modify_update_last_modified_attr(Slapi_PBlock *pb, Slapi_Mods *smods)
+void
+modify_update_last_modified_attr(Slapi_PBlock *pb, Slapi_Mods *smods)
{
char buf[20];
char *plugin_dn = NULL;
@@ -160,8 +161,11 @@ void modify_update_last_modified_attr(Slapi_PBlock *pb, Slapi_Mods *smods)
bv.bv_len = strlen(bv.bv_val);
} else {
slapi_pblock_get (pb, SLAPI_PLUGIN_IDENTITY, &cid);
- if (cid)
+ if (cid){
plugin=(struct slapdplugin *) cid->sci_plugin;
+ } else {
+ slapi_pblock_get (pb, SLAPI_PLUGIN, &plugin);
+ }
if(plugin)
plugin_dn = plugin_get_dn (plugin);
if(plugin_dn){
diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
index 7e438b7..2289efa 100644
--- a/ldap/servers/slapd/proto-slap.h
+++ b/ldap/servers/slapd/proto-slap.h
@@ -1284,7 +1284,6 @@ void set_config_params (Slapi_PBlock *pb);
/* set parameters common for all internal operations */
void set_common_params (Slapi_PBlock *pb);
void do_ps_service(Slapi_Entry *e, Slapi_Entry *eprev, ber_int_t chgtype, ber_int_t chgnum);
-void modify_update_last_modified_attr(Slapi_PBlock *pb, Slapi_Mods *smods);
/*
* debugdump.cpp
diff --git a/ldap/servers/slapd/slapi-private.h b/ldap/servers/slapd/slapi-private.h
index f995e30..f7b4d04 100644
--- a/ldap/servers/slapd/slapi-private.h
+++ b/ldap/servers/slapd/slapi-private.h
@@ -1247,6 +1247,16 @@ int is_slapd_running();
/* attrsyntax.c */
int slapi_add_internal_attr_syntax( const char *name, const char *oid, const char *syntax, const char *mr_equality, unsigned long extraflags );
+/* pw.c */
+void pw_exp_init ( void );
+int pw_copy_entry_ext(Slapi_Entry *src_e, Slapi_Entry *dest_e);
+
+/* op_shared.c */
+void modify_update_last_modified_attr(Slapi_PBlock *pb, Slapi_Mods *smods);
+
+/* add.c */
+void add_internal_modifiersname(Slapi_PBlock *pb, Slapi_Entry *e);
+
#ifdef __cplusplus
}
#endif
1
0
ldap/servers/slapd/daemon.c | 8 ++++----
ldap/servers/slapd/libglobs.c | 14 ++++++++++----
ldap/servers/slapd/slap.h | 16 ++++++++++++++--
3 files changed, 28 insertions(+), 10 deletions(-)
New commits:
commit e53973451dc8dbdd9e8829a1d86a2cd7a14733fe
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Thu Nov 15 12:57:35 2012 -0500
Ticket 507 - use mutex for FrontendConfig lock instead of rwlock
Bug Description: There was a lot of contention over the read/write lock
for the frontend config
Fix Description: Updated the macros to use a simple lock.
https://fedorahosted.org/389/ticket/507
Reviewed by: noriko(Thanks!)
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index 62a52fc..85052fe 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -602,11 +602,11 @@ disk_mon_get_dirs(char ***list, int logs_critical){
char *dir = NULL;
if(logs_critical){
- slapi_rwlock_rdlock(config->cfg_rwlock);
+ CFG_LOCK_READ(config);
disk_mon_add_dir(list, config->accesslog);
disk_mon_add_dir(list, config->errorlog);
disk_mon_add_dir(list, config->auditlog);
- slapi_rwlock_unlock(config->cfg_rwlock);
+ CFG_UNLOCK_READ(config);
}
/* Add /var just to be safe */
@@ -617,9 +617,9 @@ disk_mon_get_dirs(char ***list, int logs_critical){
#endif
/* config and backend directories */
- slapi_rwlock_rdlock(config->cfg_rwlock);
+ CFG_LOCK_READ(config);
disk_mon_add_dir(list, config->configdir);
- slapi_rwlock_unlock(config->cfg_rwlock);
+ CFG_UNLOCK_READ(config);
be = slapi_get_first_backend (&cookie);
while (be) {
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index b19c2d9..caae9ee 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -1238,14 +1238,20 @@ void
FrontendConfig_init () {
slapdFrontendConfig_t *cfg = getFrontendConfig();
+#if SLAPI_CFG_USE_RWLOCK == 1
/* initialize the read/write configuration lock */
if ( (cfg->cfg_rwlock = slapi_new_rwlock()) == NULL ) {
- LDAPDebug ( LDAP_DEBUG_ANY,
- "FrontendConfig_init: failed to initialize cfg_rwlock. Exiting now.",
- 0,0,0 );
+ LDAPDebug ( LDAP_DEBUG_ANY, "FrontendConfig_init: "
+ "failed to initialize cfg_rwlock. Exiting now.",0,0,0);
exit(-1);
}
-
+#else
+ if ((cfg->cfg_lock = PR_NewLock()) == NULL){
+ LDAPDebug(LDAP_DEBUG_ANY, "FrontendConfig_init: "
+ "failed to initialize cfg_lock. Exiting now.",0,0,0);
+ exit(-1);
+ }
+#endif
cfg->port = LDAP_PORT;
cfg->secureport = LDAPS_PORT;
cfg->ldapi_filename = slapi_ch_strdup(SLAPD_LDAPI_DEFAULT_FILENAME);
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index dbd9727..cc99486 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -2056,10 +2056,18 @@ typedef struct _slapdEntryPoints {
/* flag used to indicate that the change to the config parameter should be saved */
#define CONFIG_APPLY 1
-#define CFG_LOCK_READ(cfg) slapi_rwlock_rdlock(cfg->cfg_rwlock)
-#define CFG_UNLOCK_READ(cfg) slapi_rwlock_unlock(cfg->cfg_rwlock)
+#define SLAPI_CFG_USE_RWLOCK 0
+#if SLAPI_CFG_USE_RWLOCK == 0
+#define CFG_LOCK_READ(cfg) PR_Lock(cfg->cfg_lock)
+#define CFG_UNLOCK_READ(cfg) PR_Unlock(cfg->cfg_lock)
+#define CFG_LOCK_WRITE(cfg) PR_Lock(cfg->cfg_lock)
+#define CFG_UNLOCK_WRITE(cfg) PR_Unlock(cfg->cfg_lock)
+#else
+#define CFG_LOCK_READ(cfg) slapi_rwlock_rdlock(cfg->cfg_rwlock)
+#define CFG_UNLOCK_READ(cfg) slapi_rwlock_unlock(cfg->cfg_rwlock)
#define CFG_LOCK_WRITE(cfg) slapi_rwlock_wrlock(cfg->cfg_rwlock)
#define CFG_UNLOCK_WRITE(cfg) slapi_rwlock_unlock(cfg->cfg_rwlock)
+#endif
#define REFER_MODE_OFF 0
#define REFER_MODE_ON 1
@@ -2067,7 +2075,11 @@ typedef struct _slapdEntryPoints {
#define MAX_ALLOWED_TIME_IN_SECS 2147483647
typedef struct _slapdFrontendConfig {
+#if SLAPI_CFG_USE_RWLOCK == 1
Slapi_RWLock *cfg_rwlock; /* read/write lock to serialize access */
+#else
+ PRLock *cfg_lock;
+#endif
struct pw_scheme *rootpwstoragescheme;
int accesscontrol;
int groupevalnestlevel;
1
0
ldap/servers/slapd/attrsyntax.c | 18 ++++++++++++++++++
ldap/servers/slapd/dn.c | 15 +++------------
ldap/servers/slapd/slapi-plugin.h | 1 +
3 files changed, 22 insertions(+), 12 deletions(-)
New commits:
commit 49b7b668953f576040f308081e1920a325f49971
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Fri Nov 16 14:13:27 2012 +0100
Fix for ticket 510
Avoid creating an attribute just to determine the syntax for a type, look up the syntax directly by type
diff --git a/ldap/servers/slapd/attrsyntax.c b/ldap/servers/slapd/attrsyntax.c
index f134fa4..59506a0 100644
--- a/ldap/servers/slapd/attrsyntax.c
+++ b/ldap/servers/slapd/attrsyntax.c
@@ -812,6 +812,24 @@ slapi_attr_is_dn_syntax_attr(Slapi_Attr *attr)
return dn_syntax;
}
+int
+slapi_attr_is_dn_syntax_type(char *type)
+{
+ const char *syntaxoid = NULL;
+ int dn_syntax = 0; /* not DN, by default */
+ struct asyntaxinfo * asi;
+
+ asi = attr_syntax_get_by_name(type);
+
+ if (asi && asi->asi_plugin) { /* If not set, there is no way to get the info */
+ if (syntaxoid = asi->asi_plugin->plg_syntax_oid) {
+ dn_syntax = ((0 == strcmp(syntaxoid, NAMEANDOPTIONALUID_SYNTAX_OID))
+ || (0 == strcmp(syntaxoid, DN_SYNTAX_OID)));
+ }
+ }
+ return dn_syntax;
+}
+
#ifdef ATTR_LDAP_DEBUG
PRIntn
diff --git a/ldap/servers/slapd/dn.c b/ldap/servers/slapd/dn.c
index 0ca44e7..d643d33 100644
--- a/ldap/servers/slapd/dn.c
+++ b/ldap/servers/slapd/dn.c
@@ -608,7 +608,6 @@ slapi_dn_normalize_ext(char *src, size_t src_len, char **dest, size_t *dest_len)
/* See if the type is defined to use
* the Distinguished Name syntax. */
char savechar;
- Slapi_Attr test_attr;
/* We need typestart to be a string containing only
* the type. We terminate the type and then reset
@@ -616,9 +615,7 @@ slapi_dn_normalize_ext(char *src, size_t src_len, char **dest, size_t *dest_len)
savechar = *d;
*d = '\0';
- slapi_attr_init(&test_attr, typestart);
- is_dn_syntax = slapi_attr_is_dn_syntax_attr(&test_attr);
- attr_done(&test_attr);
+ is_dn_syntax = slapi_attr_is_dn_syntax_type(typestart);
/* Reset the character we modified. */
*d = savechar;
@@ -629,7 +626,6 @@ slapi_dn_normalize_ext(char *src, size_t src_len, char **dest, size_t *dest_len)
/* See if the type is defined to use
* the Distinguished Name syntax. */
char savechar;
- Slapi_Attr test_attr;
/* We need typestart to be a string containing only
* the type. We terminate the type and then reset
@@ -637,9 +633,7 @@ slapi_dn_normalize_ext(char *src, size_t src_len, char **dest, size_t *dest_len)
savechar = *d;
*d = '\0';
- slapi_attr_init(&test_attr, typestart);
- is_dn_syntax = slapi_attr_is_dn_syntax_attr(&test_attr);
- attr_done(&test_attr);
+ is_dn_syntax = slapi_attr_is_dn_syntax_type(typestart);
/* Reset the character we modified. */
*d = savechar;
@@ -650,7 +644,6 @@ slapi_dn_normalize_ext(char *src, size_t src_len, char **dest, size_t *dest_len)
/* See if the type is defined to use
* the Distinguished Name syntax. */
char savechar;
- Slapi_Attr test_attr;
/* We need typestart to be a string containing only
* the type. We terminate the type and then reset
@@ -658,9 +651,7 @@ slapi_dn_normalize_ext(char *src, size_t src_len, char **dest, size_t *dest_len)
savechar = *d;
*d = '\0';
- slapi_attr_init(&test_attr, typestart);
- is_dn_syntax = slapi_attr_is_dn_syntax_attr(&test_attr);
- attr_done(&test_attr);
+ is_dn_syntax = slapi_attr_is_dn_syntax_type(typestart);
/* Reset the character we modified. */
*d = savechar;
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index 4883ad5..978b02c 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -3738,6 +3738,7 @@ int slapi_attr_get_syntax_oid_copy( const Slapi_Attr *a, char **oidp );
* \return \c 0 if the attribute does not use a DN syntax.
*/
int slapi_attr_is_dn_syntax_attr(Slapi_Attr *attr);
+int slapi_attr_is_dn_syntax_type(char *type);
/**
* Get the flags associated with a particular attribute.
1
0
ldap/servers/slapd/libglobs.c | 1 +
1 file changed, 1 insertion(+)
New commits:
commit e754339c441ea30b5c555171e6723ea74375d523
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Wed Nov 14 13:41:30 2012 -0800
Coverity defect: Resource leak 13110
This commit 94b123780b21e503b78bceca9d60904206ef91fa
introduced the resource leak.
Trac Ticket #447 - Possible to add invalid attribute
to nsslapd-allowed-to-delete-attrs
Fix description: This patch calls slapi_ch_array_free for the
allocated charray "allowed".
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index a7e504f..b19c2d9 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -6508,6 +6508,7 @@ config_set_allowed_to_delete_attrs( const char *attrname, char *value,
slapi_ch_free_string(&vcopy);
vcopy = slapi_ch_strdup(value);
}
+ slapi_ch_array_free(allowed);
CFG_LOCK_WRITE(slapdFrontendConfig);
slapi_ch_free_string(&(slapdFrontendConfig->allowed_to_delete_attrs));
slapdFrontendConfig->allowed_to_delete_attrs = vcopy;
1
0
ldap/servers/plugins/dna/dna.c | 49 ++++++++++++++++++-----------------------
1 file changed, 22 insertions(+), 27 deletions(-)
New commits:
commit 322c4ecc2363c4e7a7107ae2e8aa05aa3a55ddf3
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Nov 14 15:18:57 2012 -0500
Ticket 517 - crash in DNA if no dnaMagicRegen is specified
Bug Description: There are several places where we deference config_entry->generate
Fix Description: Properly check for NULL, and allow the update of dnaType.
https://fedorahosted.org/389/ticket/517
Reviewed by: richm(Thanks Rich)
(cherry picked from commit d97835969db3e957032c52ac317699354299c07c)
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
index 34d67ab..ef01735 100644
--- a/ldap/servers/plugins/dna/dna.c
+++ b/ldap/servers/plugins/dna/dna.c
@@ -804,10 +804,9 @@ dna_parse_config_entry(Slapi_Entry * e, int apply)
value = slapi_entry_attr_get_charptr(e, DNA_GENERATE);
if (value) {
entry->generate = value;
- }
-
- slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
"----------> %s [%s]\n", DNA_GENERATE, entry->generate);
+ }
value = slapi_entry_attr_get_charptr(e, DNA_FILTER);
if (value) {
@@ -2809,8 +2808,7 @@ _dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e)
/* does the entry match the filter? */
if (config_entry->slapi_filter) {
- ret = slapi_vattr_filter_test(pb, e, config_entry->slapi_filter,
- 0);
+ ret = slapi_vattr_filter_test(pb, e, config_entry->slapi_filter, 0);
if (LDAP_SUCCESS != ret) {
goto next;
}
@@ -2820,28 +2818,23 @@ _dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e)
/* For a multi-type range, we only generate a value
* for types where the magic value is set. We do not
* generate a value for missing types. */
- for (i = 0; config_entry->types && config_entry->types[i];
- i++) {
- value = slapi_entry_attr_get_charptr(e,
- config_entry->types[i]);
-
- if (value &&
- !slapi_UTF8CASECMP(config_entry->generate, value)) {
- slapi_ch_array_add(&types_to_generate,
- slapi_ch_strdup(config_entry->types[i]));
+ for (i = 0; config_entry->types && config_entry->types[i]; i++) {
+ value = slapi_entry_attr_get_charptr(e, config_entry->types[i]);
+ if (value){
+ if(config_entry->generate == NULL || !slapi_UTF8CASECMP(config_entry->generate, value)){
+ slapi_ch_array_add(&types_to_generate, slapi_ch_strdup(config_entry->types[i]));
+ }
+ slapi_ch_free_string(&value);
}
- slapi_ch_free_string(&value);
}
} else {
/* For a single type range, we generate the value if
* the magic value is set or if the type is missing. */
value = slapi_entry_attr_get_charptr(e, config_entry->types[0]);
- if ((value &&
- !slapi_UTF8CASECMP(config_entry->generate, value)) ||
- (0 == value)) {
- slapi_ch_array_add(&types_to_generate,
- slapi_ch_strdup(config_entry->types[0]));
+ if((config_entry->generate == NULL) || (0 == value) ||
+ (value && !slapi_UTF8CASECMP(config_entry->generate, value))){
+ slapi_ch_array_add(&types_to_generate, slapi_ch_strdup(config_entry->types[0]));
}
slapi_ch_free_string(&value);
}
@@ -3060,13 +3053,15 @@ _dna_pre_op_modify(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Mods *smods)
/* If we have a value, see if it's the magic value. */
if (bv) {
- len = strlen(config_entry->generate);
- if (len == bv->bv_len) {
- if (!slapi_UTF8NCASECMP(bv->bv_val,
- config_entry->generate,
- len)) {
- slapi_ch_array_add(&types_to_generate,
- slapi_ch_strdup(type));
+ if(config_entry->generate == NULL){
+ /* we don't have a magic number set, so apply the update */
+ slapi_ch_array_add(&types_to_generate, slapi_ch_strdup(type));
+ } else {
+ len = strlen(config_entry->generate);
+ if (len == bv->bv_len) {
+ if (!slapi_UTF8NCASECMP(bv->bv_val, config_entry->generate,len)){
+ slapi_ch_array_add(&types_to_generate, slapi_ch_strdup(type));
+ }
}
}
} else if (!dna_is_multitype_range(config_entry)) {
1
0
ldap/servers/plugins/dna/dna.c | 49 ++++++++++++++++++-----------------------
1 file changed, 22 insertions(+), 27 deletions(-)
New commits:
commit d97835969db3e957032c52ac317699354299c07c
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Nov 14 15:18:57 2012 -0500
Ticket 517 - crash in DNA if no dnaMagicRegen is specified
Bug Description: There are several places where we deference config_entry->generate
Fix Description: Properly check for NULL, and allow the update of dnaType.
https://fedorahosted.org/389/ticket/517
Reviewed by: richm(Thanks Rich)
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
index 2b56967..66d4a05 100644
--- a/ldap/servers/plugins/dna/dna.c
+++ b/ldap/servers/plugins/dna/dna.c
@@ -804,10 +804,9 @@ dna_parse_config_entry(Slapi_Entry * e, int apply)
value = slapi_entry_attr_get_charptr(e, DNA_GENERATE);
if (value) {
entry->generate = value;
- }
-
- slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
"----------> %s [%s]\n", DNA_GENERATE, entry->generate);
+ }
value = slapi_entry_attr_get_charptr(e, DNA_FILTER);
if (value) {
@@ -2809,8 +2808,7 @@ _dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e)
/* does the entry match the filter? */
if (config_entry->slapi_filter) {
- ret = slapi_vattr_filter_test(pb, e, config_entry->slapi_filter,
- 0);
+ ret = slapi_vattr_filter_test(pb, e, config_entry->slapi_filter, 0);
if (LDAP_SUCCESS != ret) {
goto next;
}
@@ -2820,28 +2818,23 @@ _dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e)
/* For a multi-type range, we only generate a value
* for types where the magic value is set. We do not
* generate a value for missing types. */
- for (i = 0; config_entry->types && config_entry->types[i];
- i++) {
- value = slapi_entry_attr_get_charptr(e,
- config_entry->types[i]);
-
- if (value &&
- !slapi_UTF8CASECMP(config_entry->generate, value)) {
- slapi_ch_array_add(&types_to_generate,
- slapi_ch_strdup(config_entry->types[i]));
+ for (i = 0; config_entry->types && config_entry->types[i]; i++) {
+ value = slapi_entry_attr_get_charptr(e, config_entry->types[i]);
+ if (value){
+ if(config_entry->generate == NULL || !slapi_UTF8CASECMP(config_entry->generate, value)){
+ slapi_ch_array_add(&types_to_generate, slapi_ch_strdup(config_entry->types[i]));
+ }
+ slapi_ch_free_string(&value);
}
- slapi_ch_free_string(&value);
}
} else {
/* For a single type range, we generate the value if
* the magic value is set or if the type is missing. */
value = slapi_entry_attr_get_charptr(e, config_entry->types[0]);
- if ((value &&
- !slapi_UTF8CASECMP(config_entry->generate, value)) ||
- (0 == value)) {
- slapi_ch_array_add(&types_to_generate,
- slapi_ch_strdup(config_entry->types[0]));
+ if((config_entry->generate == NULL) || (0 == value) ||
+ (value && !slapi_UTF8CASECMP(config_entry->generate, value))){
+ slapi_ch_array_add(&types_to_generate, slapi_ch_strdup(config_entry->types[0]));
}
slapi_ch_free_string(&value);
}
@@ -3062,13 +3055,15 @@ _dna_pre_op_modify(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Mods *smods)
/* If we have a value, see if it's the magic value. */
if (bv) {
- len = strlen(config_entry->generate);
- if (len == bv->bv_len) {
- if (!slapi_UTF8NCASECMP(bv->bv_val,
- config_entry->generate,
- len)) {
- slapi_ch_array_add(&types_to_generate,
- slapi_ch_strdup(type));
+ if(config_entry->generate == NULL){
+ /* we don't have a magic number set, so apply the update */
+ slapi_ch_array_add(&types_to_generate, slapi_ch_strdup(type));
+ } else {
+ len = strlen(config_entry->generate);
+ if (len == bv->bv_len) {
+ if (!slapi_UTF8NCASECMP(bv->bv_val, config_entry->generate,len)){
+ slapi_ch_array_add(&types_to_generate, slapi_ch_strdup(type));
+ }
}
}
} else if (!dna_is_multitype_range(config_entry)) {
1
0
ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit d4dbb3d01a7f3f39c5370a10a02109d90c5140e0
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Wed Nov 14 12:23:06 2012 -0800
Trac Ticket #520 - RedHat Directory Server crashes (segfaults) when moving ldap entry
https://fedorahosted.org/389/ticket/520
Fix description: The code to check if the new superior entry exists
or not was returning the "No such object" error only when the op
was requested by the directory manager. This patch is removing
the condition so that whoever the requester is, it returns the error.
(cherry picked from commit 40e68b18dae23a21654719a742419f172aa54806)
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
index c7d821a..69fc053 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
@@ -426,10 +426,11 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
if ( newparententry == NULL )
{
/* There may not be a new parent because we don't intend there to be one. */
- if(slapi_sdn_get_ndn(dn_newsuperiordn)!=NULL)
+ if (slapi_sdn_get_ndn(dn_newsuperiordn))
{
- /* If the new entry is to be a suffix, and we're root, then it's OK that the new parent doesn't exist */
- if (!(slapi_be_issuffix(pb->pb_backend, &dn_newdn)) && isroot)
+ /* If the new entry is not to be a suffix,
+ * return an error no matter who requested this modrdn */
+ if (!slapi_be_issuffix(pb->pb_backend, &dn_newdn))
{
/* Here means that we didn't find the parent */
int err = 0;
@@ -447,7 +448,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
slapi_sdn_get_ndn(dn_newsuperiordn), 0 );
slapi_sdn_done(&ancestorsdn);
goto error_return;
- }
+ }
}
}
else
@@ -465,7 +466,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
if ( parententry == NULL )
{
/* If the entry a suffix, and we're root, then it's OK that the parent doesn't exist */
- if (!(slapi_be_issuffix(pb->pb_backend, sdn)) && isroot)
+ if (!(slapi_be_issuffix(pb->pb_backend, sdn)) && !isroot)
{
/* Here means that we didn't find the parent */
ldap_result_matcheddn = "NULL";
1
0
ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 40e68b18dae23a21654719a742419f172aa54806
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Wed Nov 14 10:49:35 2012 -0800
Trac Ticket #520 - RedHat Directory Server crashes (segfaults) when moving ldap entry
https://fedorahosted.org/389/ticket/520
Fix description: The code to check if the new superior entry exists
or not was returning the "No such object" error only when the op
was requested by the directory manager. This patch is removing
the condition so that whoever the requester is, it returns the error.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
index 98b30dc..b6bd61c 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
@@ -549,10 +549,11 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
if ( newparententry == NULL )
{
/* There may not be a new parent because we don't intend there to be one. */
- if(slapi_sdn_get_ndn(dn_newsuperiordn)!=NULL)
+ if (slapi_sdn_get_dn(dn_newsuperiordn))
{
- /* If the new entry is to be a suffix, and we're root, then it's OK that the new parent doesn't exist */
- if (!(slapi_be_issuffix(pb->pb_backend, &dn_newdn)) && isroot)
+ /* If the new entry is not to be a suffix,
+ * return an error no matter who requested this modrdn */
+ if (!slapi_be_issuffix(pb->pb_backend, &dn_newdn))
{
/* Here means that we didn't find the parent */
int err = 0;
@@ -570,7 +571,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
slapi_sdn_get_ndn(dn_newsuperiordn), 0 );
slapi_sdn_done(&ancestorsdn);
goto error_return;
- }
+ }
}
}
else
@@ -588,7 +589,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
if ( parententry == NULL )
{
/* If the entry a suffix, and we're root, then it's OK that the parent doesn't exist */
- if (!(slapi_be_issuffix(pb->pb_backend, sdn)) && isroot)
+ if (!(slapi_be_issuffix(pb->pb_backend, sdn)) && !isroot)
{
/* Here means that we didn't find the parent */
ldap_result_matcheddn = "NULL";
1
0
ldap/servers/slapd/back-ldbm/back-ldbm.h | 5 ++-
ldap/servers/slapd/back-ldbm/idl.c | 7 ++++
ldap/servers/slapd/back-ldbm/index.c | 39 ++++++++++++++++++-------
ldap/servers/slapd/back-ldbm/ldbm_config.c | 23 ++++++++++++++
ldap/servers/slapd/back-ldbm/ldbm_config.h | 1
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 1
ldap/servers/slapd/back-ldbm/start.c | 9 +++++
ldap/servers/slapd/back-ldbm/vlv.c | 8 -----
8 files changed, 75 insertions(+), 18 deletions(-)
New commits:
commit 0a54aa676341b7f5f1056373a5067a69cbe54b89
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Nov 13 18:01:57 2012 -0800
Trac Ticket #519 - Search with a complex filter including range search is slow
https://fedorahosted.org/389/ticket/519
Bug description: If a filter contains a range search, the
search retrieves one ID per one idl_fetch and merge it to
the idlist using idl_union, which is slow especially when
the range search result size is large.
Fix description: When the idlist size is larger than nsslapd-
lookthroughlimit, the range search returns ALLID (default
value of nsslapd-lookthroughlimit is 5000). Then, the range
search filter is evaluated before returning to the client.
If the default value of nsslapd-lookthroughlimit can be used,
the search elapsed time is much shorter than generating a
complete idlist in index_range_read_ext. Since the nsslapd-
lookthroughlimit is shared among all the search operations,
larger value might be required for other cases. To have its
own control, this patch introduces a new config parameter
nsslapd-rangelookthroughlimit for the range search.
Also, this patch replaced idl_union in index_range_read_ext
with idl_append_extend and sort the idlist at the end. It
improves the range search, but it is still slower than just
returning ALLID for the large range search.
(cherry picked from commit f026ef0447b18994e0e9b847698703436e874f84)
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h
index fb45a9f..aed57cf 100644
--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h
@@ -210,7 +210,6 @@ typedef unsigned short u_int16_t;
#define DEFAULT_DBCACHE_SIZE 1000000
#define DEFAULT_MODE 0600
#define DEFAULT_ALLIDSTHRESHOLD 4000
-#define DEFAULT_LOOKTHROUGHLIMIT 5000
#define DEFAULT_IDL_TUNE 1
#define DEFAULT_SEARCH_TUNE 0
#define DEFAULT_IMPORT_INDEX_BUFFER_SIZE 0
@@ -650,6 +649,8 @@ struct ldbminfo {
int li_pagedallidsthreshold;
int li_reslimit_pagedlookthrough_handle;
int li_reslimit_pagedallids_handle; /* allids aka idlistscan */
+ int li_rangelookthroughlimit;
+ int li_reslimit_rangelookthrough_handle;
};
/* li_flags could store these bits defined in ../slapi-plugin.h
@@ -819,6 +820,8 @@ typedef struct _back_search_result_set
/* Name of attribute type used for binder-based look through limit */
#define LDBM_LOOKTHROUGHLIMIT_AT "nsLookThroughLimit"
/* Name of attribute type used for binder-based look through limit */
+#define LDBM_RANGELOOKTHROUGHLIMIT_AT "nsRangeSearchLookThroughLimit"
+/* Name of attribute type used for binder-based look through limit */
#define LDBM_ALLIDSLIMIT_AT "nsIDListScanLimit"
/* Name of attribute type used for binder-based look through simple paged limit */
#define LDBM_PAGEDLOOKTHROUGHLIMIT_AT "nsPagedLookThroughLimit"
diff --git a/ldap/servers/slapd/back-ldbm/idl.c b/ldap/servers/slapd/back-ldbm/idl.c
index 5d467bd..58736f8 100644
--- a/ldap/servers/slapd/back-ldbm/idl.c
+++ b/ldap/servers/slapd/back-ldbm/idl.c
@@ -1620,3 +1620,10 @@ make_cont_key( DBT *contkey, DBT *key, ID id )
sprintf( contkey->dptr, "%c%s%lu", CONT_PREFIX, (char *)key->dptr, (u_long)id );
contkey->dsize = strlen( contkey->dptr ) + 1;
}
+
+int
+idl_sort_cmp(const void *x, const void *y)
+{
+ return *(ID *)x - *(ID *)y;
+}
+
diff --git a/ldap/servers/slapd/back-ldbm/index.c b/ldap/servers/slapd/back-ldbm/index.c
index a5c6ac5..5948717 100644
--- a/ldap/servers/slapd/back-ldbm/index.c
+++ b/ldap/servers/slapd/back-ldbm/index.c
@@ -1236,6 +1236,7 @@ index_range_read_ext(
time_t curtime, stoptime, optime;
int timelimit = -1;
back_search_result_set *sr = NULL;
+ int isroot = 0;
if (!pb) {
LDAPDebug(LDAP_DEBUG_ANY, "index_range_read: NULL pblock\n",
@@ -1270,11 +1271,11 @@ index_range_read_ext(
if (sr != NULL) {
/* the normal case */
lookthrough_limit = sr->sr_lookthroughlimit;
- } else {
- int isroot = 0;
- slapi_pblock_get( pb, SLAPI_REQUESTOR_ISROOT, &isroot );
- if (!isroot) {
- lookthrough_limit = li->li_lookthroughlimit;
+ }
+ slapi_pblock_get( pb, SLAPI_REQUESTOR_ISROOT, &isroot );
+ if (!isroot) {
+ if (lookthrough_limit > li->li_rangelookthroughlimit) {
+ lookthrough_limit = li->li_rangelookthroughlimit;
}
}
@@ -1478,7 +1479,7 @@ index_range_read_ext(
/* exit the loop when we either run off the end of the table,
* fail to read a key, or read a key that's out of range.
*/
- IDList *tmp, *tmp2;
+ IDList *tmp;
/*
char encbuf [BUFSIZ];
LDAPDebug( LDAP_DEBUG_FILTER, " cur_key=%s(%li bytes)\n",
@@ -1549,10 +1550,22 @@ index_range_read_ext(
encoded(&cur_key, encbuf), (long)cur_key.dsize);
}
} else {
- tmp2 = idl_union( be, idl, tmp );
- idl_free( idl );
- idl_free( tmp );
- idl = tmp2;
+ /* idl tmp only contains one id */
+ /* append it at the end here; sort idlist at the end */
+ if (ALLIDS(tmp)) {
+ idl_free(idl);
+ idl = tmp;
+ } else {
+ ID id;
+ for (id = idl_firstid(tmp); id != NOID; id = idl_nextid(tmp, id)) {
+ *err = idl_append_extend(&idl, id);
+ if (*err) {
+ ldbm_nasty("index_range_read - failed to generate idlist",
+ 1097, *err);
+ }
+ }
+ idl_free(tmp);
+ }
if (ALLIDS(idl)) {
LDAPDebug(LDAP_DEBUG_TRACE, "index_range_read hit an allids value\n",
0, 0, 0);
@@ -1601,6 +1614,12 @@ error:
dblayer_release_index_file( be, ai, db );
+ /* sort idl */
+ if (idl && !ALLIDS(idl)) {
+ qsort((void *)&idl->b_ids[0], idl->b_nids,
+ (size_t)sizeof(ID), idl_sort_cmp);
+ }
+
LDAPDebug( LDAP_DEBUG_TRACE, "<= index_range_read(%s,%s) %lu candidates\n",
type, prefix, (u_long)IDL_NIDS(idl) );
return( idl );
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index d0664eb..232af54 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -187,6 +187,28 @@ static int ldbm_config_pagedlookthroughlimit_set(void *arg, void *value, char *e
return retval;
}
+static void *ldbm_config_rangelookthroughlimit_get(void *arg)
+{
+ struct ldbminfo *li = (struct ldbminfo *) arg;
+
+ return (void *) ((uintptr_t)(li->li_rangelookthroughlimit));
+}
+
+static int ldbm_config_rangelookthroughlimit_set(void *arg, void *value, char *errorbuf, int phase, int apply)
+{
+ struct ldbminfo *li = (struct ldbminfo *) arg;
+ int retval = LDAP_SUCCESS;
+ int val = (int) ((uintptr_t)value);
+
+ /* Do whatever we can to make sure the data is ok. */
+
+ if (apply) {
+ li->li_rangelookthroughlimit = val;
+ }
+
+ return retval;
+}
+
static void *ldbm_config_mode_get(void *arg)
{
struct ldbminfo *li = (struct ldbminfo *) arg;
@@ -1341,6 +1363,7 @@ static config_info ldbm_config[] = {
{CONFIG_ENTRYRDN_NOANCESTORID, CONFIG_TYPE_ONOFF, "off", &ldbm_config_entryrdn_noancestorid_get, &ldbm_config_entryrdn_noancestorid_set, 0 /* no show */},
{CONFIG_PAGEDLOOKTHROUGHLIMIT, CONFIG_TYPE_INT, "0", &ldbm_config_pagedlookthroughlimit_get, &ldbm_config_pagedlookthroughlimit_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_PAGEDIDLISTSCANLIMIT, CONFIG_TYPE_INT, "0", &ldbm_config_pagedallidsthreshold_get, &ldbm_config_pagedallidsthreshold_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
+ {CONFIG_RANGELOOKTHROUGHLIMIT, CONFIG_TYPE_INT, "5000", &ldbm_config_rangelookthroughlimit_get, &ldbm_config_rangelookthroughlimit_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{NULL, 0, NULL, NULL, NULL, 0}
};
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.h b/ldap/servers/slapd/back-ldbm/ldbm_config.h
index 36b8f60..a5830e3 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.h
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.h
@@ -85,6 +85,7 @@ struct config_info {
#define CONFIG_INSTANCE "nsslapd-instance"
#define CONFIG_LOOKTHROUGHLIMIT "nsslapd-lookthroughlimit"
+#define CONFIG_RANGELOOKTHROUGHLIMIT "nsslapd-rangelookthroughlimit"
#define CONFIG_PAGEDLOOKTHROUGHLIMIT "nsslapd-pagedlookthroughlimit"
#define CONFIG_IDLISTSCANLIMIT "nsslapd-idlistscanlimit"
#define CONFIG_PAGEDIDLISTSCANLIMIT "nsslapd-pagedidlistscanlimit"
diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
index be4120a..48b3164 100644
--- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -235,6 +235,7 @@ int idl_is_allids(IDList *idl);
int idl_append(IDList *idl, ID id);
int idl_append_extend(IDList **idl, ID id);
void idl_insert(IDList **idl, ID id);
+int idl_sort_cmp(const void *x, const void *y);
/*
* idl_delete - delete an id from an id list.
* returns 0 id deleted
diff --git a/ldap/servers/slapd/back-ldbm/start.c b/ldap/servers/slapd/back-ldbm/start.c
index 0f42bed..4276c3b 100644
--- a/ldap/servers/slapd/back-ldbm/start.c
+++ b/ldap/servers/slapd/back-ldbm/start.c
@@ -116,6 +116,15 @@ ldbm_back_start( Slapi_PBlock *pb )
return SLAPI_FAIL_GENERAL;
}
+ /* lookthrough limit for the rangesearch */
+ if ( slapi_reslimit_register( SLAPI_RESLIMIT_TYPE_INT,
+ LDBM_RANGELOOKTHROUGHLIMIT_AT, &li->li_reslimit_rangelookthrough_handle )
+ != SLAPI_RESLIMIT_STATUS_SUCCESS ) {
+ LDAPDebug( LDAP_DEBUG_ANY, "start: Resource limit registration failed for rangelookthroughlimit\n",
+ 0, 0, 0 );
+ return SLAPI_FAIL_GENERAL;
+ }
+
/* If the db directory hasn't been set yet, we need to set it to
* the default. */
if (NULL == li->li_directory || '\0' == li->li_directory[0]) {
diff --git a/ldap/servers/slapd/back-ldbm/vlv.c b/ldap/servers/slapd/back-ldbm/vlv.c
index 7172104..39d16bf 100644
--- a/ldap/servers/slapd/back-ldbm/vlv.c
+++ b/ldap/servers/slapd/back-ldbm/vlv.c
@@ -1048,12 +1048,6 @@ vlv_build_candidate_list_byvalue( struct vlvIndex* p, DBC *dbc, PRUint32 length,
return si;
}
-static int
-vlv_idl_sort_cmp(const void *x, const void *y)
-{
- return *(ID *)x - *(ID *)y;
-}
-
/* build a candidate list (IDL) from a VLV index, given the starting index
* and the ending index (as an inclusive list).
* returns 0 on success, or an LDAP error code.
@@ -1111,7 +1105,7 @@ int vlv_build_idl(PRUint32 start, PRUint32 stop, DB *db, DBC *dbc,
if (dosort)
{
qsort((void *)&idl->b_ids[0], idl->b_nids,
- (size_t)sizeof(ID), vlv_idl_sort_cmp);
+ (size_t)sizeof(ID), idl_sort_cmp);
}
*candidates = idl;
1
0
ldap/servers/slapd/back-ldbm/back-ldbm.h | 5 ++-
ldap/servers/slapd/back-ldbm/idl.c | 7 ++++
ldap/servers/slapd/back-ldbm/index.c | 39 ++++++++++++++++++-------
ldap/servers/slapd/back-ldbm/ldbm_config.c | 23 ++++++++++++++
ldap/servers/slapd/back-ldbm/ldbm_config.h | 1
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 1
ldap/servers/slapd/back-ldbm/start.c | 9 +++++
ldap/servers/slapd/back-ldbm/vlv.c | 8 -----
8 files changed, 75 insertions(+), 18 deletions(-)
New commits:
commit f026ef0447b18994e0e9b847698703436e874f84
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Nov 13 18:01:57 2012 -0800
Trac Ticket #519 - Search with a complex filter including range search is slow
https://fedorahosted.org/389/ticket/519
Bug description: If a filter contains a range search, the
search retrieves one ID per one idl_fetch and merge it to
the idlist using idl_union, which is slow especially when
the range search result size is large.
Fix description: When the idlist size is larger than nsslapd-
lookthroughlimit, the range search returns ALLID (default
value of nsslapd-lookthroughlimit is 5000). Then, the range
search filter is evaluated before returning to the client.
If the default value of nsslapd-lookthroughlimit can be used,
the search elapsed time is much shorter than generating a
complete idlist in index_range_read_ext. Since the nsslapd-
lookthroughlimit is shared among all the search operations,
larger value might be required for other cases. To have its
own control, this patch introduces a new config parameter
nsslapd-rangelookthroughlimit for the range search.
Also, this patch replaced idl_union in index_range_read_ext
with idl_append_extend and sort the idlist at the end. It
improves the range search, but it is still slower than just
returning ALLID for the large range search.
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h
index 39fd950..6536664 100644
--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h
@@ -210,7 +210,6 @@ typedef unsigned short u_int16_t;
#define DEFAULT_DBCACHE_SIZE 1000000
#define DEFAULT_MODE 0600
#define DEFAULT_ALLIDSTHRESHOLD 4000
-#define DEFAULT_LOOKTHROUGHLIMIT 5000
#define DEFAULT_IDL_TUNE 1
#define DEFAULT_SEARCH_TUNE 0
#define DEFAULT_IMPORT_INDEX_BUFFER_SIZE 0
@@ -650,6 +649,8 @@ struct ldbminfo {
int li_pagedallidsthreshold;
int li_reslimit_pagedlookthrough_handle;
int li_reslimit_pagedallids_handle; /* allids aka idlistscan */
+ int li_rangelookthroughlimit;
+ int li_reslimit_rangelookthrough_handle;
};
/* li_flags could store these bits defined in ../slapi-plugin.h
@@ -817,6 +818,8 @@ typedef struct _back_search_result_set
/* Name of attribute type used for binder-based look through limit */
#define LDBM_LOOKTHROUGHLIMIT_AT "nsLookThroughLimit"
/* Name of attribute type used for binder-based look through limit */
+#define LDBM_RANGELOOKTHROUGHLIMIT_AT "nsRangeSearchLookThroughLimit"
+/* Name of attribute type used for binder-based look through limit */
#define LDBM_ALLIDSLIMIT_AT "nsIDListScanLimit"
/* Name of attribute type used for binder-based look through simple paged limit */
#define LDBM_PAGEDLOOKTHROUGHLIMIT_AT "nsPagedLookThroughLimit"
diff --git a/ldap/servers/slapd/back-ldbm/idl.c b/ldap/servers/slapd/back-ldbm/idl.c
index 4227055..65fca7c 100644
--- a/ldap/servers/slapd/back-ldbm/idl.c
+++ b/ldap/servers/slapd/back-ldbm/idl.c
@@ -1620,3 +1620,10 @@ make_cont_key( DBT *contkey, DBT *key, ID id )
sprintf( contkey->dptr, "%c%s%lu", CONT_PREFIX, (char *)key->dptr, (u_long)id );
contkey->dsize = strlen( contkey->dptr ) + 1;
}
+
+int
+idl_sort_cmp(const void *x, const void *y)
+{
+ return *(ID *)x - *(ID *)y;
+}
+
diff --git a/ldap/servers/slapd/back-ldbm/index.c b/ldap/servers/slapd/back-ldbm/index.c
index a5c6ac5..5948717 100644
--- a/ldap/servers/slapd/back-ldbm/index.c
+++ b/ldap/servers/slapd/back-ldbm/index.c
@@ -1236,6 +1236,7 @@ index_range_read_ext(
time_t curtime, stoptime, optime;
int timelimit = -1;
back_search_result_set *sr = NULL;
+ int isroot = 0;
if (!pb) {
LDAPDebug(LDAP_DEBUG_ANY, "index_range_read: NULL pblock\n",
@@ -1270,11 +1271,11 @@ index_range_read_ext(
if (sr != NULL) {
/* the normal case */
lookthrough_limit = sr->sr_lookthroughlimit;
- } else {
- int isroot = 0;
- slapi_pblock_get( pb, SLAPI_REQUESTOR_ISROOT, &isroot );
- if (!isroot) {
- lookthrough_limit = li->li_lookthroughlimit;
+ }
+ slapi_pblock_get( pb, SLAPI_REQUESTOR_ISROOT, &isroot );
+ if (!isroot) {
+ if (lookthrough_limit > li->li_rangelookthroughlimit) {
+ lookthrough_limit = li->li_rangelookthroughlimit;
}
}
@@ -1478,7 +1479,7 @@ index_range_read_ext(
/* exit the loop when we either run off the end of the table,
* fail to read a key, or read a key that's out of range.
*/
- IDList *tmp, *tmp2;
+ IDList *tmp;
/*
char encbuf [BUFSIZ];
LDAPDebug( LDAP_DEBUG_FILTER, " cur_key=%s(%li bytes)\n",
@@ -1549,10 +1550,22 @@ index_range_read_ext(
encoded(&cur_key, encbuf), (long)cur_key.dsize);
}
} else {
- tmp2 = idl_union( be, idl, tmp );
- idl_free( idl );
- idl_free( tmp );
- idl = tmp2;
+ /* idl tmp only contains one id */
+ /* append it at the end here; sort idlist at the end */
+ if (ALLIDS(tmp)) {
+ idl_free(idl);
+ idl = tmp;
+ } else {
+ ID id;
+ for (id = idl_firstid(tmp); id != NOID; id = idl_nextid(tmp, id)) {
+ *err = idl_append_extend(&idl, id);
+ if (*err) {
+ ldbm_nasty("index_range_read - failed to generate idlist",
+ 1097, *err);
+ }
+ }
+ idl_free(tmp);
+ }
if (ALLIDS(idl)) {
LDAPDebug(LDAP_DEBUG_TRACE, "index_range_read hit an allids value\n",
0, 0, 0);
@@ -1601,6 +1614,12 @@ error:
dblayer_release_index_file( be, ai, db );
+ /* sort idl */
+ if (idl && !ALLIDS(idl)) {
+ qsort((void *)&idl->b_ids[0], idl->b_nids,
+ (size_t)sizeof(ID), idl_sort_cmp);
+ }
+
LDAPDebug( LDAP_DEBUG_TRACE, "<= index_range_read(%s,%s) %lu candidates\n",
type, prefix, (u_long)IDL_NIDS(idl) );
return( idl );
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index d0664eb..232af54 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -187,6 +187,28 @@ static int ldbm_config_pagedlookthroughlimit_set(void *arg, void *value, char *e
return retval;
}
+static void *ldbm_config_rangelookthroughlimit_get(void *arg)
+{
+ struct ldbminfo *li = (struct ldbminfo *) arg;
+
+ return (void *) ((uintptr_t)(li->li_rangelookthroughlimit));
+}
+
+static int ldbm_config_rangelookthroughlimit_set(void *arg, void *value, char *errorbuf, int phase, int apply)
+{
+ struct ldbminfo *li = (struct ldbminfo *) arg;
+ int retval = LDAP_SUCCESS;
+ int val = (int) ((uintptr_t)value);
+
+ /* Do whatever we can to make sure the data is ok. */
+
+ if (apply) {
+ li->li_rangelookthroughlimit = val;
+ }
+
+ return retval;
+}
+
static void *ldbm_config_mode_get(void *arg)
{
struct ldbminfo *li = (struct ldbminfo *) arg;
@@ -1341,6 +1363,7 @@ static config_info ldbm_config[] = {
{CONFIG_ENTRYRDN_NOANCESTORID, CONFIG_TYPE_ONOFF, "off", &ldbm_config_entryrdn_noancestorid_get, &ldbm_config_entryrdn_noancestorid_set, 0 /* no show */},
{CONFIG_PAGEDLOOKTHROUGHLIMIT, CONFIG_TYPE_INT, "0", &ldbm_config_pagedlookthroughlimit_get, &ldbm_config_pagedlookthroughlimit_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_PAGEDIDLISTSCANLIMIT, CONFIG_TYPE_INT, "0", &ldbm_config_pagedallidsthreshold_get, &ldbm_config_pagedallidsthreshold_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
+ {CONFIG_RANGELOOKTHROUGHLIMIT, CONFIG_TYPE_INT, "5000", &ldbm_config_rangelookthroughlimit_get, &ldbm_config_rangelookthroughlimit_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{NULL, 0, NULL, NULL, NULL, 0}
};
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.h b/ldap/servers/slapd/back-ldbm/ldbm_config.h
index 36b8f60..a5830e3 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.h
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.h
@@ -85,6 +85,7 @@ struct config_info {
#define CONFIG_INSTANCE "nsslapd-instance"
#define CONFIG_LOOKTHROUGHLIMIT "nsslapd-lookthroughlimit"
+#define CONFIG_RANGELOOKTHROUGHLIMIT "nsslapd-rangelookthroughlimit"
#define CONFIG_PAGEDLOOKTHROUGHLIMIT "nsslapd-pagedlookthroughlimit"
#define CONFIG_IDLISTSCANLIMIT "nsslapd-idlistscanlimit"
#define CONFIG_PAGEDIDLISTSCANLIMIT "nsslapd-pagedidlistscanlimit"
diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
index daf6d05..40fa325 100644
--- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -241,6 +241,7 @@ int idl_is_allids(IDList *idl);
int idl_append(IDList *idl, ID id);
int idl_append_extend(IDList **idl, ID id);
void idl_insert(IDList **idl, ID id);
+int idl_sort_cmp(const void *x, const void *y);
/*
* idl_delete - delete an id from an id list.
* returns 0 id deleted
diff --git a/ldap/servers/slapd/back-ldbm/start.c b/ldap/servers/slapd/back-ldbm/start.c
index 0f42bed..4276c3b 100644
--- a/ldap/servers/slapd/back-ldbm/start.c
+++ b/ldap/servers/slapd/back-ldbm/start.c
@@ -116,6 +116,15 @@ ldbm_back_start( Slapi_PBlock *pb )
return SLAPI_FAIL_GENERAL;
}
+ /* lookthrough limit for the rangesearch */
+ if ( slapi_reslimit_register( SLAPI_RESLIMIT_TYPE_INT,
+ LDBM_RANGELOOKTHROUGHLIMIT_AT, &li->li_reslimit_rangelookthrough_handle )
+ != SLAPI_RESLIMIT_STATUS_SUCCESS ) {
+ LDAPDebug( LDAP_DEBUG_ANY, "start: Resource limit registration failed for rangelookthroughlimit\n",
+ 0, 0, 0 );
+ return SLAPI_FAIL_GENERAL;
+ }
+
/* If the db directory hasn't been set yet, we need to set it to
* the default. */
if (NULL == li->li_directory || '\0' == li->li_directory[0]) {
diff --git a/ldap/servers/slapd/back-ldbm/vlv.c b/ldap/servers/slapd/back-ldbm/vlv.c
index cf68bb3..3131661 100644
--- a/ldap/servers/slapd/back-ldbm/vlv.c
+++ b/ldap/servers/slapd/back-ldbm/vlv.c
@@ -1048,12 +1048,6 @@ vlv_build_candidate_list_byvalue( struct vlvIndex* p, DBC *dbc, PRUint32 length,
return si;
}
-static int
-vlv_idl_sort_cmp(const void *x, const void *y)
-{
- return *(ID *)x - *(ID *)y;
-}
-
/* build a candidate list (IDL) from a VLV index, given the starting index
* and the ending index (as an inclusive list).
* returns 0 on success, or an LDAP error code.
@@ -1111,7 +1105,7 @@ int vlv_build_idl(PRUint32 start, PRUint32 stop, DB *db, DBC *dbc,
if (dosort)
{
qsort((void *)&idl->b_ids[0], idl->b_nids,
- (size_t)sizeof(ID), vlv_idl_sort_cmp);
+ (size_t)sizeof(ID), idl_sort_cmp);
}
*candidates = idl;
1
0
ldap/servers/plugins/posix-winsync/posix-winsync.c | 129 ++++++++++++++-------
ldap/servers/slapd/mapping_tree.c | 2
2 files changed, 91 insertions(+), 40 deletions(-)
New commits:
commit f95bc254e3019727123068af5612058be05fb6be
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Tue Nov 13 11:21:26 2012 -0800
Trac Ticket #500 - Newly created users with organizationalPerson objectClass fails to sync from AD to DS with missing attribute error
https://fedorahosted.org/389/ticket/500
Bug description: Posix Account objectclass requires homeDirectory,
uidNumber, and gidNumber. When an AD entry has just some of these
attributes or other allow-to-have attributes, i.e., loginShell or
gecos, the entry is incompletely converted to Posix Account entry
and fails to be added due to the missing attribute error.
Fix description: Before transforming the AD entry to the DS posix
account entry, check the required attributes first. If any of the
above 3 attributes is missing, all of the posix account related
attributes are dropped and added to the DS as a non-posix account
entry. If the PLUGIN log level is set, this type of message is
logged in the error log.
[] posix-winsync - AD entry CN=<CN>,OU=<OU>,DC=<DC>,DC=<COM> does
not have required attribute uidNumber for posixAccount objectclass.
(cherry picked from commit 19e49e69124ff19530a584f90808aa652a4c686f)
diff --git a/ldap/servers/plugins/posix-winsync/posix-winsync.c b/ldap/servers/plugins/posix-winsync/posix-winsync.c
index aa292c3..92a3a79 100644
--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c
+++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c
@@ -86,14 +86,17 @@ typedef struct _windows_attr_map
{
char *windows_attribute_name;
char *ldap_attribute_name;
+ int isMUST; /* schema: required attribute */
} windows_attribute_map;
-static windows_attribute_map user_attribute_map[] = { { "unixHomeDirectory", "homeDirectory" },
- { "loginShell", "loginShell" },
- { "uidNumber", "uidNumber" },
- { "gidNumber", "gidNumber" },
- { "gecos", "gecos" },
- { NULL, NULL } };
+static windows_attribute_map user_attribute_map[] = {
+ { "unixHomeDirectory", "homeDirectory", 1 },
+ { "loginShell", "loginShell", 0 },
+ { "uidNumber", "uidNumber", 1 },
+ { "gidNumber", "gidNumber", 1 },
+ { "gecos", "gecos", 0 },
+ { NULL, NULL, 0 }
+};
static windows_attribute_map user_mssfu_attribute_map[] =
{ { "msSFU30homedirectory", "homeDirectory" },
@@ -751,7 +754,9 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
int is_present_local = 0;
int do_modify_local = 0;
int rc;
+ int i;
windows_attribute_map *attr_map = user_attribute_map;
+ PRBool posixval = PR_TRUE;
if (posix_winsync_config_get_msSFUSchema())
attr_map = user_mssfu_attribute_map;
@@ -759,15 +764,33 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
"--> _pre_ds_mod_user_cb -- begin\n");
+ /* check all of the required attributes are in the ad_entry:
+ * MUST (cn $ uid $ uidNumber $ gidNumber $ homeDirectory).
+ * If any of the required attributes are missing, drop them before adding
+ * the entry to the DS. */
+ for (i = 0; attr_map[i].windows_attribute_name != NULL; i++) {
+ Slapi_Attr *pa_attr;
+ if (attr_map[i].isMUST &&
+ slapi_entry_attr_find(ad_entry,
+ attr_map[i].windows_attribute_name,
+ &pa_attr)) {
+ /* required attribute does not exist */
+ posixval = PR_FALSE;
+ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
+ "AD entry %s does not have required attribute %s for posixAccount objectclass.\n",
+ slapi_entry_get_dn_const(ad_entry),
+ attr_map[i].ldap_attribute_name);
+ }
+ }
+
/* add objectclass: posixAccount, uidnumber ,gidnumber ,homeDirectory, loginshell */
/* in the ad to ds case we have no changelog, so we have to compare the entries */
for (rc = slapi_entry_first_attr(ad_entry, &attr); rc == 0;
rc = slapi_entry_next_attr(ad_entry, attr, &attr)) {
char *type = NULL;
- size_t i = 0;
slapi_attr_get_type(attr, &type);
- for (; attr_map[i].windows_attribute_name != NULL; i++) {
+ for (i = 0; attr_map[i].windows_attribute_name != NULL; i++) {
if (0 == slapi_attr_type_cmp(type, attr_map[i].windows_attribute_name,
SLAPI_TYPE_CMP_SUBTYPE)) {
Slapi_Attr *local_attr = NULL;
@@ -779,7 +802,10 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
slapi_entry_attr_find(ds_entry, local_type, &local_attr);
is_present_local = (NULL == local_attr) ? 0 : 1;
if (is_present_local) {
+ /* DS entry has the posix attrs.
+ * I.e., it is a posix account*/
int values_equal = 0;
+ posixval = PR_TRUE;
values_equal = attr_compare_equal(attr, local_attr);
if (!values_equal) {
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
@@ -791,8 +817,8 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
valueset_get_valuearray(vs));
*do_modify = 1;
}
- } else {
-
+ } else if (posixval) {
+ /* only if AD provides the all necessary attributes */
slapi_mods_add_mod_values(smods, LDAP_MOD_ADD, local_type,
valueset_get_valuearray(vs));
*do_modify = do_modify_local = 1;
@@ -804,10 +830,11 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
}
}
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
- "<-- _pre_ds_mod_user_cb present %d modify %d\n", is_present_local,
- do_modify_local);
+ "<-- _pre_ds_mod_user_cb present %d modify %d isPosixaccount %s\n",
+ is_present_local, do_modify_local,
+ posixval?"yes":"no");
- if (!is_present_local && do_modify_local) {
+ if (!is_present_local && do_modify_local && posixval) {
Slapi_Attr *oc_attr = NULL;
Slapi_Value *voc = slapi_value_new();
@@ -988,8 +1015,9 @@ posix_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
{
Slapi_Attr *attr = NULL;
char *type = NULL;
- PRBool posixval = PR_FALSE;
+ PRBool posixval = PR_TRUE;
windows_attribute_map *attr_map = user_attribute_map;
+ int i = 0;
if (posix_winsync_config_get_msSFUSchema())
attr_map = user_mssfu_attribute_map;
@@ -998,42 +1026,65 @@ posix_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
"--> _pre_ds_add_user_cb -- begin\n");
- for (slapi_entry_first_attr(ad_entry, &attr); attr; slapi_entry_next_attr(ad_entry, attr, &attr)) {
- size_t i = 0;
-
- slapi_attr_get_type(attr, &type);
- if (!type) {
- continue;
+ /* check all of the required attributes are in the ad_entry:
+ * MUST (cn $ uid $ uidNumber $ gidNumber $ homeDirectory).
+ * If any of the required attributes are missing, drop them before adding
+ * the entry to the DS. */
+ for (i = 0; attr_map[i].windows_attribute_name != NULL; i++) {
+ Slapi_Attr *pa_attr;
+ if (attr_map[i].isMUST &&
+ slapi_entry_attr_find(ad_entry,
+ attr_map[i].windows_attribute_name,
+ &pa_attr)) {
+ /* required attribute does not exist */
+ posixval = PR_FALSE;
+ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
+ "AD entry %s does not have required attribute %s for posixAccount objectclass.\n",
+ slapi_entry_get_dn_const(ad_entry),
+ attr_map[i].ldap_attribute_name);
}
+ }
- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "--> _pre_ds_add_user_cb -- "
- "look for [%s] to new entry [%s]\n", type, slapi_entry_get_dn_const(ds_entry));
- for (; attr_map[i].windows_attribute_name != NULL; i++) {
- if (slapi_attr_type_cmp(attr_map[i].windows_attribute_name, type,
- SLAPI_TYPE_CMP_SUBTYPE) == 0) {
- Slapi_ValueSet *svs = NULL;
- slapi_attr_get_valueset(attr, &svs);
- slapi_entry_add_valueset(ds_entry, attr_map[i].ldap_attribute_name, svs);
- slapi_valueset_free(svs);
+ /* converts the AD attributes to DS posix attribute if all the posix
+ * required attributes are available */
+ if (posixval) {
+ int rc;
+ for (slapi_entry_first_attr(ad_entry, &attr); attr;
+ slapi_entry_next_attr(ad_entry, attr, &attr)) {
- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
- "--> _pre_ds_add_user_cb -- "
- "adding val for [%s] to new entry [%s]\n", type,
- slapi_entry_get_dn_const(ds_entry));
- posixval = PR_TRUE;
+ slapi_attr_get_type(attr, &type);
+ if (!type) {
+ continue;
+ }
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
+ "--> _pre_ds_add_user_cb -- "
+ "look for [%s] to new entry [%s]\n",
+ type, slapi_entry_get_dn_const(ds_entry));
+ for (i = 0; attr_map[i].windows_attribute_name != NULL; i++) {
+ if (slapi_attr_type_cmp(attr_map[i].windows_attribute_name,
+ type, SLAPI_TYPE_CMP_SUBTYPE) == 0) {
+ Slapi_ValueSet *svs = NULL;
+ slapi_attr_get_valueset(attr, &svs);
+ slapi_entry_add_valueset(ds_entry,
+ attr_map[i].ldap_attribute_name, svs);
+ slapi_valueset_free(svs);
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
+ "--> _pre_ds_add_user_cb -- "
+ "adding val for [%s] to new entry [%s]\n",
+ type, slapi_entry_get_dn_const(ds_entry));
+ }
}
}
- }
- if (posixval) {
- int rc;
rc = slapi_entry_add_string(ds_entry, "objectClass", "posixAccount");
rc |= slapi_entry_add_string(ds_entry, "objectClass", "shadowAccount");
rc |= slapi_entry_add_string(ds_entry, "objectClass", "inetUser");
- if (rc != 0)
+ if (rc != 0) {
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
"<-- _pre_ds_add_user_cb -- adding objectclass for new entry failed %d\n",
rc);
- else {
+ } else {
if (posix_winsync_config_get_mapNestedGrouping()) {
memberUidLock();
addUserToGroupMembership(ds_entry);
diff --git a/ldap/servers/slapd/mapping_tree.c b/ldap/servers/slapd/mapping_tree.c
index e8e414f..da8e4f3 100644
--- a/ldap/servers/slapd/mapping_tree.c
+++ b/ldap/servers/slapd/mapping_tree.c
@@ -2451,7 +2451,7 @@ int slapi_mapping_tree_select_and_check(Slapi_PBlock *pb,char *newdn, Slapi_Back
{
ret = LDAP_AFFECTS_MULTIPLE_DSAS;
PR_snprintf(errorbuf, BUFSIZ,
- "Cannot move entries accross backends\n");
+ "Cannot move entries across backends\n");
goto unlock_and_return;
}
}
1
0
ldap/servers/plugins/posix-winsync/posix-winsync.c | 129 ++++++++++++++-------
ldap/servers/slapd/mapping_tree.c | 2
2 files changed, 91 insertions(+), 40 deletions(-)
New commits:
commit 19e49e69124ff19530a584f90808aa652a4c686f
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Tue Nov 13 11:21:26 2012 -0800
Trac Ticket #500 - Newly created users with
organizationalPerson objectClass fails to sync from AD to DS with missing attribute error
https://fedorahosted.org/389/ticket/500
Bug description: Posix Account objectclass requires homeDirectory,
uidNumber, and gidNumber. When an AD entry has just some of these
attributes or other allow-to-have attributes, i.e., loginShell or
gecos, the entry is incompletely converted to Posix Account entry
and fails to be added due to the missing attribute error.
Fix description: Before transforming the AD entry to the DS posix
account entry, check the required attributes first. If any of the
above 3 attributes is missing, all of the posix account related
attributes are dropped and added to the DS as a non-posix account
entry. If the PLUGIN log level is set, this type of message is
logged in the error log.
[] posix-winsync - AD entry CN=<CN>,OU=<OU>,DC=<DC>,DC=<COM> does
not have required attribute uidNumber for posixAccount objectclass.
diff --git a/ldap/servers/plugins/posix-winsync/posix-winsync.c b/ldap/servers/plugins/posix-winsync/posix-winsync.c
index aa292c3..92a3a79 100644
--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c
+++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c
@@ -86,14 +86,17 @@ typedef struct _windows_attr_map
{
char *windows_attribute_name;
char *ldap_attribute_name;
+ int isMUST; /* schema: required attribute */
} windows_attribute_map;
-static windows_attribute_map user_attribute_map[] = { { "unixHomeDirectory", "homeDirectory" },
- { "loginShell", "loginShell" },
- { "uidNumber", "uidNumber" },
- { "gidNumber", "gidNumber" },
- { "gecos", "gecos" },
- { NULL, NULL } };
+static windows_attribute_map user_attribute_map[] = {
+ { "unixHomeDirectory", "homeDirectory", 1 },
+ { "loginShell", "loginShell", 0 },
+ { "uidNumber", "uidNumber", 1 },
+ { "gidNumber", "gidNumber", 1 },
+ { "gecos", "gecos", 0 },
+ { NULL, NULL, 0 }
+};
static windows_attribute_map user_mssfu_attribute_map[] =
{ { "msSFU30homedirectory", "homeDirectory" },
@@ -751,7 +754,9 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
int is_present_local = 0;
int do_modify_local = 0;
int rc;
+ int i;
windows_attribute_map *attr_map = user_attribute_map;
+ PRBool posixval = PR_TRUE;
if (posix_winsync_config_get_msSFUSchema())
attr_map = user_mssfu_attribute_map;
@@ -759,15 +764,33 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
"--> _pre_ds_mod_user_cb -- begin\n");
+ /* check all of the required attributes are in the ad_entry:
+ * MUST (cn $ uid $ uidNumber $ gidNumber $ homeDirectory).
+ * If any of the required attributes are missing, drop them before adding
+ * the entry to the DS. */
+ for (i = 0; attr_map[i].windows_attribute_name != NULL; i++) {
+ Slapi_Attr *pa_attr;
+ if (attr_map[i].isMUST &&
+ slapi_entry_attr_find(ad_entry,
+ attr_map[i].windows_attribute_name,
+ &pa_attr)) {
+ /* required attribute does not exist */
+ posixval = PR_FALSE;
+ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
+ "AD entry %s does not have required attribute %s for posixAccount objectclass.\n",
+ slapi_entry_get_dn_const(ad_entry),
+ attr_map[i].ldap_attribute_name);
+ }
+ }
+
/* add objectclass: posixAccount, uidnumber ,gidnumber ,homeDirectory, loginshell */
/* in the ad to ds case we have no changelog, so we have to compare the entries */
for (rc = slapi_entry_first_attr(ad_entry, &attr); rc == 0;
rc = slapi_entry_next_attr(ad_entry, attr, &attr)) {
char *type = NULL;
- size_t i = 0;
slapi_attr_get_type(attr, &type);
- for (; attr_map[i].windows_attribute_name != NULL; i++) {
+ for (i = 0; attr_map[i].windows_attribute_name != NULL; i++) {
if (0 == slapi_attr_type_cmp(type, attr_map[i].windows_attribute_name,
SLAPI_TYPE_CMP_SUBTYPE)) {
Slapi_Attr *local_attr = NULL;
@@ -779,7 +802,10 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
slapi_entry_attr_find(ds_entry, local_type, &local_attr);
is_present_local = (NULL == local_attr) ? 0 : 1;
if (is_present_local) {
+ /* DS entry has the posix attrs.
+ * I.e., it is a posix account*/
int values_equal = 0;
+ posixval = PR_TRUE;
values_equal = attr_compare_equal(attr, local_attr);
if (!values_equal) {
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
@@ -791,8 +817,8 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
valueset_get_valuearray(vs));
*do_modify = 1;
}
- } else {
-
+ } else if (posixval) {
+ /* only if AD provides the all necessary attributes */
slapi_mods_add_mod_values(smods, LDAP_MOD_ADD, local_type,
valueset_get_valuearray(vs));
*do_modify = do_modify_local = 1;
@@ -804,10 +830,11 @@ posix_winsync_pre_ds_mod_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
}
}
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
- "<-- _pre_ds_mod_user_cb present %d modify %d\n", is_present_local,
- do_modify_local);
+ "<-- _pre_ds_mod_user_cb present %d modify %d isPosixaccount %s\n",
+ is_present_local, do_modify_local,
+ posixval?"yes":"no");
- if (!is_present_local && do_modify_local) {
+ if (!is_present_local && do_modify_local && posixval) {
Slapi_Attr *oc_attr = NULL;
Slapi_Value *voc = slapi_value_new();
@@ -988,8 +1015,9 @@ posix_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
{
Slapi_Attr *attr = NULL;
char *type = NULL;
- PRBool posixval = PR_FALSE;
+ PRBool posixval = PR_TRUE;
windows_attribute_map *attr_map = user_attribute_map;
+ int i = 0;
if (posix_winsync_config_get_msSFUSchema())
attr_map = user_mssfu_attribute_map;
@@ -998,42 +1026,65 @@ posix_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry, Slap
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
"--> _pre_ds_add_user_cb -- begin\n");
- for (slapi_entry_first_attr(ad_entry, &attr); attr; slapi_entry_next_attr(ad_entry, attr, &attr)) {
- size_t i = 0;
-
- slapi_attr_get_type(attr, &type);
- if (!type) {
- continue;
+ /* check all of the required attributes are in the ad_entry:
+ * MUST (cn $ uid $ uidNumber $ gidNumber $ homeDirectory).
+ * If any of the required attributes are missing, drop them before adding
+ * the entry to the DS. */
+ for (i = 0; attr_map[i].windows_attribute_name != NULL; i++) {
+ Slapi_Attr *pa_attr;
+ if (attr_map[i].isMUST &&
+ slapi_entry_attr_find(ad_entry,
+ attr_map[i].windows_attribute_name,
+ &pa_attr)) {
+ /* required attribute does not exist */
+ posixval = PR_FALSE;
+ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
+ "AD entry %s does not have required attribute %s for posixAccount objectclass.\n",
+ slapi_entry_get_dn_const(ad_entry),
+ attr_map[i].ldap_attribute_name);
}
+ }
- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name, "--> _pre_ds_add_user_cb -- "
- "look for [%s] to new entry [%s]\n", type, slapi_entry_get_dn_const(ds_entry));
- for (; attr_map[i].windows_attribute_name != NULL; i++) {
- if (slapi_attr_type_cmp(attr_map[i].windows_attribute_name, type,
- SLAPI_TYPE_CMP_SUBTYPE) == 0) {
- Slapi_ValueSet *svs = NULL;
- slapi_attr_get_valueset(attr, &svs);
- slapi_entry_add_valueset(ds_entry, attr_map[i].ldap_attribute_name, svs);
- slapi_valueset_free(svs);
+ /* converts the AD attributes to DS posix attribute if all the posix
+ * required attributes are available */
+ if (posixval) {
+ int rc;
+ for (slapi_entry_first_attr(ad_entry, &attr); attr;
+ slapi_entry_next_attr(ad_entry, attr, &attr)) {
- slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
- "--> _pre_ds_add_user_cb -- "
- "adding val for [%s] to new entry [%s]\n", type,
- slapi_entry_get_dn_const(ds_entry));
- posixval = PR_TRUE;
+ slapi_attr_get_type(attr, &type);
+ if (!type) {
+ continue;
+ }
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
+ "--> _pre_ds_add_user_cb -- "
+ "look for [%s] to new entry [%s]\n",
+ type, slapi_entry_get_dn_const(ds_entry));
+ for (i = 0; attr_map[i].windows_attribute_name != NULL; i++) {
+ if (slapi_attr_type_cmp(attr_map[i].windows_attribute_name,
+ type, SLAPI_TYPE_CMP_SUBTYPE) == 0) {
+ Slapi_ValueSet *svs = NULL;
+ slapi_attr_get_valueset(attr, &svs);
+ slapi_entry_add_valueset(ds_entry,
+ attr_map[i].ldap_attribute_name, svs);
+ slapi_valueset_free(svs);
+
+ slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
+ "--> _pre_ds_add_user_cb -- "
+ "adding val for [%s] to new entry [%s]\n",
+ type, slapi_entry_get_dn_const(ds_entry));
+ }
}
}
- }
- if (posixval) {
- int rc;
rc = slapi_entry_add_string(ds_entry, "objectClass", "posixAccount");
rc |= slapi_entry_add_string(ds_entry, "objectClass", "shadowAccount");
rc |= slapi_entry_add_string(ds_entry, "objectClass", "inetUser");
- if (rc != 0)
+ if (rc != 0) {
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
"<-- _pre_ds_add_user_cb -- adding objectclass for new entry failed %d\n",
rc);
- else {
+ } else {
if (posix_winsync_config_get_mapNestedGrouping()) {
memberUidLock();
addUserToGroupMembership(ds_entry);
diff --git a/ldap/servers/slapd/mapping_tree.c b/ldap/servers/slapd/mapping_tree.c
index 237fc24..5de0e46 100644
--- a/ldap/servers/slapd/mapping_tree.c
+++ b/ldap/servers/slapd/mapping_tree.c
@@ -2451,7 +2451,7 @@ int slapi_mapping_tree_select_and_check(Slapi_PBlock *pb,char *newdn, Slapi_Back
{
ret = LDAP_AFFECTS_MULTIPLE_DSAS;
PR_snprintf(errorbuf, BUFSIZ,
- "Cannot move entries accross backends\n");
+ "Cannot move entries across backends\n");
goto unlock_and_return;
}
}
1
0
lib/libaccess/lasdns.cpp | 283 ++++++++++++++++++++++-------------------------
1 file changed, 133 insertions(+), 150 deletions(-)
New commits:
commit 8a9684ff9cadddc58de3a849c1e875955ea16128
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Fri Nov 9 10:52:38 2012 -0800
Trac Ticket #311 - IP lookup failing with multiple DNS
entries
https://fedorahosted.org/389/ticket/311
Bug description: DNS keyword in ACI only accepted an FQDN returned
from gethostbyaddr. If an alias hostname was set in an ACI, a request
sent from the host was treated as the one from the primary hostname
and it failed to get the expected access rights.
Fix description: This patch turns the "dns" keyword covers the alias
hostnames, as well. In addition to the primary hostname, by setting
the secondary hostnames as dns, clients requests would obtain the
expected access rights. When an IP address is associated with multiple
hostnames (primary: hostA, aliases: hostB and hostC), they could be
listed, for instance, in an aci as follows:
aci: (targetattr = "*") (version 3.0;acl "dns example";allow (all)
dns="hostA.example.com" or dns="hostB.example.com" or dns="hostC.
example.com";)
diff --git a/lib/libaccess/lasdns.cpp b/lib/libaccess/lasdns.cpp
index e4032f1..de8e624 100644
--- a/lib/libaccess/lasdns.cpp
+++ b/lib/libaccess/lasdns.cpp
@@ -137,14 +137,13 @@ LASDnsMatch(char *token, LASDnsContext_t *context)
int
LASDnsBuild(NSErr_t *errp, char *attr_pattern, LASDnsContext_t *context, int aliasflg)
{
- size_t delimiter; /* length of valid token */
- char token[256]; /* max length dns name */
- int i;
- int ipcnt = 0;
- char **p;
- unsigned long *ipaddrs=0;
+ size_t delimiter; /* length of valid tokeni */
+ char token[256]; /* max length dns name */
+ int i;
+ int ipcnt = 0;
+ char **p;
pool_handle_t *pool;
- PRStatus error=PR_SUCCESS;
+ PRStatus error=PR_SUCCESS;
char buffer[PR_NETDB_BUF_SIZE];
#ifdef UTEST
struct hostent *he, host;
@@ -154,164 +153,146 @@ LASDnsBuild(NSErr_t *errp, char *attr_pattern, LASDnsContext_t *context, int ali
char *end_attr_pattern;
if (attr_pattern == NULL) {
- nserrGenerate(errp, ACLERRINVAL, ACLERR4770, ACL_Program, 1,
- XP_GetAdminStr(DBT_lasdnsbuildInvalidAttributePattern_));
+ nserrGenerate(errp, ACLERRINVAL, ACLERR4770, ACL_Program, 1,
+ XP_GetAdminStr(DBT_lasdnsbuildInvalidAttributePattern_));
return LAS_EVAL_INVALID;
}
context->Table = PR_NewHashTable(0,
- PR_HashCaseString,
- PR_CompareCaseStrings,
- PR_CompareValues,
- &ACLPermAllocOps,
- NULL);
+ PR_HashCaseString,
+ PR_CompareCaseStrings,
+ PR_CompareValues,
+ &ACLPermAllocOps,
+ NULL);
pool = pool_create();
context->pool = pool;
if ((!context->Table) || (!context->pool)) {
- nserrGenerate(errp, ACLERRNOMEM, ACLERR4700, ACL_Program, 1,
- XP_GetAdminStr(DBT_lasdnsbuildUnableToAllocateHashT_));
+ nserrGenerate(errp, ACLERRNOMEM, ACLERR4700, ACL_Program, 1,
+ XP_GetAdminStr(DBT_lasdnsbuildUnableToAllocateHashT_));
return LAS_EVAL_INVALID;
}
end_attr_pattern = attr_pattern + strlen(attr_pattern);
do {
- size_t maxsize = sizeof(token);
- /* Get a single hostname from the pattern string */
- delimiter = strcspn(attr_pattern, ", \t");
- if (delimiter >= maxsize) {
- delimiter = maxsize-1;
- }
+ size_t maxsize = sizeof(token);
+ /* Get a single hostname from the pattern string */
+ delimiter = strcspn(attr_pattern, ", \t");
+ if (delimiter >= maxsize) {
+ delimiter = maxsize-1;
+ }
PL_strncpyz(token, attr_pattern, delimiter + 1);
token[delimiter] = '\0';
- /* Skip any white space after the token */
+ /* Skip any white space after the token */
attr_pattern += delimiter;
if (attr_pattern < end_attr_pattern) {
attr_pattern += strspn(attr_pattern, ", \t");
}
/* If there's a wildcard, strip it off but leave the "."
- * Can't have aliases for a wildcard pattern.
- * Treat "*" as a special case. If so, go ahead and hash it.
- */
+ * Can't have aliases for a wildcard pattern.
+ * Treat "*" as a special case. If so, go ahead and hash it.
+ */
if (token[0] == '*') {
- if (token[1] != '\0') {
- if (!PR_HashTableAdd(context->Table, pool_strdup(pool, &token[1]), (void *)-1)) {
- nserrGenerate(errp, ACLERRFAIL, ACLERR4710, ACL_Program, 2,
- XP_GetAdminStr(DBT_lasdnsbuildUnableToAddKeySN_), token);
- return LAS_EVAL_INVALID;
- }
- } else {
- if (!PR_HashTableAdd(context->Table, pool_strdup(pool, token), (void *)-1)) {
- nserrGenerate(errp, ACLERRFAIL, ACLERR4720, ACL_Program, 2, XP_GetAdminStr(DBT_lasdnsbuildUnableToAddKeySN_), token);
- return LAS_EVAL_INVALID;
- }
- }
- } else {
- /* This is a single hostname add it to the hash table */
- if (!PR_HashTableAdd(context->Table, pool_strdup(pool, &token[0]), (void *)-1)) {
- nserrGenerate(errp, ACLERRFAIL, ACLERR4730, ACL_Program, 2, XP_GetAdminStr(DBT_lasdnsbuildUnableToAddKeySN_), token);
- return LAS_EVAL_INVALID;
- }
-
- if (aliasflg) {
- /* memset(buffer, '\0', PR_NETDB_BUF_SIZE);
- */
-#ifdef UTEST
- he = gethostbyname(token);
-#else
- error = PR_GetHostByName(token,
- buffer,
- PR_NETDB_BUF_SIZE,
- &host);
- if (error == PR_SUCCESS) he = &host;
- else he = NULL;
-#endif
- if (he) {
- /* Make a copy of the list of IP addresses if any */
- if (he->h_addr_list && he->h_addr_list[0]) {
-
- /* Count the IP addresses */
- for (p = he->h_addr_list, ipcnt = 0; *p; ++p) {
- ++ipcnt;
- }
-
- /* Allocate space */
- ipaddrs = (unsigned long *)PERM_MALLOC(ipcnt * sizeof(unsigned long));
-
- /* Copy IP addresses */
- for (i = 0; i < ipcnt; ++i) {
- ipaddrs[i] = 0;
- memcpy((void *)&ipaddrs[i], he->h_addr_list[i], 4);
- }
- }
-
- /* Add each of the aliases to the list */
- if (he->h_aliases && he->h_aliases[0]) {
-
- for (p = he->h_aliases; *p; ++p) {
- /* Add it to the hash table */
- if (!PR_HashTableAdd(context->Table, pool_strdup(pool, *p), (void*)-1)) {
- nserrGenerate(errp, ACLERRFAIL, ACLERR4740, ACL_Program, 2,
- XP_GetAdminStr(DBT_lasdnsbuildUnableToAddKeySN_), *p);
- PERM_FREE(ipaddrs);
- return LAS_EVAL_INVALID;
- }
- }
- }
-
- for (i = 0; i < ipcnt; ++i) {
-
-#ifdef UTEST
- he = gethostbyaddr((char *)&ipaddrs[i], 4, AF_INET);
-#else
- error = PR_GetHostByAddr((PRNetAddr *)&ipaddrs[i],
- buffer,
- PR_NETDB_BUF_SIZE,
- &host);
- if (error == PR_SUCCESS) he = &host;
- else he = NULL;
-#endif
- if (he) {
- if (he->h_name) {
- /* Add it to the hash table */
- if (!PR_HashTableAdd(context->Table, pool_strdup(pool, he->h_name),
- (void *)-1)) {
- nserrGenerate(errp, ACLERRFAIL, ACLERR4750, ACL_Program, 2,
- XP_GetAdminStr(DBT_lasdnsbuildUnableToAddKeySN_), he->h_name);
- PERM_FREE(ipaddrs);
- return LAS_EVAL_INVALID;
- }
- }
+ if (token[1] != '\0') {
+ if (!PR_HashTableAdd(context->Table, pool_strdup(pool, &token[1]), (void *)-1)) {
+ nserrGenerate(errp, ACLERRFAIL, ACLERR4710, ACL_Program, 2,
+ XP_GetAdminStr(DBT_lasdnsbuildUnableToAddKeySN_), token);
+ return LAS_EVAL_INVALID;
+ }
+ } else {
+ if (!PR_HashTableAdd(context->Table, pool_strdup(pool, token), (void *)-1)) {
+ nserrGenerate(errp, ACLERRFAIL, ACLERR4720, ACL_Program, 2, XP_GetAdminStr(DBT_lasdnsbuildUnableToAddKeySN_), token);
+ return LAS_EVAL_INVALID;
+ }
+ }
+ } else {
+ /* This is a single hostname add it to the hash table */
+ if (!PR_HashTableAdd(context->Table, pool_strdup(pool, &token[0]), (void *)-1)) {
+ nserrGenerate(errp, ACLERRFAIL, ACLERR4730, ACL_Program, 2, XP_GetAdminStr(DBT_lasdnsbuildUnableToAddKeySN_), token);
+ return LAS_EVAL_INVALID;
+ }
+
+ if (aliasflg) {
+ void *iter = NULL;
+ int addrcnt = 0;
+ PRNetAddr *netaddr = (PRNetAddr *)PERM_CALLOC(sizeof(PRNetAddr));
+ PRAddrInfo *infop = PR_GetAddrInfoByName(token,
+ PR_AF_UNSPEC, (PR_AI_ADDRCONFIG|PR_AI_NOCANONNAME));
+ if (!netaddr) {
+ if (infop) {
+ PR_FreeAddrInfo(infop);
+ }
+ return LAS_EVAL_NEED_MORE_INFO; /* hostname not known to dns? */
+ }
+ if (!infop) {
+ if (netaddr) {
+ PERM_FREE(netaddr);
+ }
+ return LAS_EVAL_NEED_MORE_INFO; /* hostname not known to dns? */
+ }
+ /* need to count the address, first */
+ while ((iter = PR_EnumerateAddrInfo(iter, infop, 0, netaddr))) {
+ addrcnt++;
+ }
+ if (0 == addrcnt) {
+ PERM_FREE(netaddr);
+ PR_FreeAddrInfo(infop);
+ return LAS_EVAL_NEED_MORE_INFO; /* hostname not known to dns? */
+ }
+ iter = NULL; /* from the beginning */
+ memset(netaddr, 0, sizeof(PRNetAddr));
+ for (i = 0; i < addrcnt; i++) {
+ iter = PR_EnumerateAddrInfo( iter, infop, 0, netaddr );
+ if (NULL == iter) {
+ break;
+ }
+ error = PR_GetHostByAddr(netaddr, buffer,
+ PR_NETDB_BUF_SIZE, &host);
+ if (error == PR_SUCCESS) {
+ he = &host;
+ } else {
+ continue;
+ }
+ if (he->h_name) {
+ /* Add it to the hash table */
+ if (!PR_HashTableAdd(context->Table,
+ pool_strdup(pool, he->h_name),
+ (void *)-1)) {
+ nserrGenerate(errp, ACLERRFAIL, ACLERR4750,
+ ACL_Program, 2,
+ XP_GetAdminStr(DBT_lasdnsbuildUnableToAddKeySN_),
+ he->h_name);
+ PERM_FREE(netaddr);
+ PR_FreeAddrInfo(infop);
+ return LAS_EVAL_INVALID;
+ }
+ }
- if (he->h_aliases && he->h_aliases[0]) {
- for (p = he->h_aliases; *p; ++p) {
- /* Add it to the hash table */
- if (!PR_HashTableAdd(context->Table, pool_strdup(pool, *p), (void *)-1)) {
- nserrGenerate(errp, ACLERRFAIL, ACLERR4760, ACL_Program, 2,
- XP_GetAdminStr(DBT_lasdnsbuildUnableToAddKeySN_), *p);
- PERM_FREE(ipaddrs);
- return LAS_EVAL_INVALID;
- }
- }
- }
- }
- }
-
- PERM_FREE(ipaddrs);
- ipaddrs = NULL;
-
- } /* if he */
-
-
- } /* if aliasflg */
-
- } /* else - single hostname */
-
-
+ if (he->h_aliases && he->h_aliases[0]) {
+ for (p = he->h_aliases; *p; ++p) {
+ /* Add it to the hash table */
+ if (!PR_HashTableAdd(context->Table,
+ pool_strdup(pool, *p),
+ (void *)-1)) {
+ nserrGenerate(errp, ACLERRFAIL, ACLERR4760,
+ ACL_Program, 2,
+ XP_GetAdminStr(DBT_lasdnsbuildUnableToAddKeySN_),
+ *p);
+ PERM_FREE(netaddr);
+ PR_FreeAddrInfo(infop);
+ return LAS_EVAL_INVALID;
+ }
+ }
+ }
+ } /* for (i = 0; i < addrcnt; i++) */
+ PERM_FREE(netaddr);
+ PR_FreeAddrInfo(infop);
+ } /* if aliasflg */
+ } /* else - single hostname */
} while ((attr_pattern != NULL) &&
- (attr_pattern[0] != '\0') &&
- (delimiter != 0));
+ (attr_pattern[0] != '\0') &&
+ (delimiter != 0));
return 0;
}
@@ -363,18 +344,20 @@ int LASDnsEval(NSErr_t *errp, char *attr_name, CmpOp_t comparator,
*cachable = ACL_INDEF_CACHABLE;
- if (strcmp(attr_name, "dns") == 0)
- aliasflg = 0;
- else if (strcmp(attr_name, "dnsalias") == 0)
- aliasflg = 1;
- else {
- nserrGenerate(errp, ACLERRINVAL, ACLERR4800, ACL_Program, 2, XP_GetAdminStr(DBT_lasDnsBuildReceivedRequestForAtt_), attr_name);
- return LAS_EVAL_INVALID;
+ if (strcmp(attr_name, "dns") == 0) {
+ /* Enable aliasflg for "dns", which allows "dns" hostname to look up
+ * DSN hash table using the primary hostname. */
+ aliasflg = 1;
+ } else if (strcmp(attr_name, "dnsalias") == 0) {
+ aliasflg = 1;
+ } else {
+ nserrGenerate(errp, ACLERRINVAL, ACLERR4800, ACL_Program, 2, XP_GetAdminStr(DBT_lasDnsBuildReceivedRequestForAtt_), attr_name);
+ return LAS_EVAL_INVALID;
}
if ((comparator != CMP_OP_EQ) && (comparator != CMP_OP_NE)) {
- nserrGenerate(errp, ACLERRINVAL, ACLERR4810, ACL_Program, 2, XP_GetAdminStr(DBT_lasdnsevalIllegalComparatorDN_), comparator_string(comparator));
- return LAS_EVAL_INVALID;
+ nserrGenerate(errp, ACLERRINVAL, ACLERR4810, ACL_Program, 2, XP_GetAdminStr(DBT_lasdnsevalIllegalComparatorDN_), comparator_string(comparator));
+ return LAS_EVAL_INVALID;
}
/* If this is the first time through, build the pattern tree first. */
1
0
ldap/servers/slapd/libglobs.c | 47 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 42 insertions(+), 5 deletions(-)
New commits:
commit 94b123780b21e503b78bceca9d60904206ef91fa
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Wed Nov 7 17:21:09 2012 -0800
Trac Ticket #447 - Possible to add invalid attribute
to nsslapd-allowed-to-delete-attrs
https://fedorahosted.org/389/ticket/447
Fix description: This patch is adding a code to check if the value
of config parameter nsslapd-allowed-to-delete-attrs includes any
invalid attributes or not. If it does, the server ignores the
invalid ones, and the following search returns only the valid
attributes. Also, it is logged in the error log:
nsslapd-allowed-to-delete-attrs: Unknown attribute bogus will be
ignored
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index bd1062d..a7e504f 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -568,7 +568,7 @@ static struct config_get_and_set {
{CONFIG_AUDITLOG_LOGROTATIONTIMEUNIT_ATTRIBUTE, NULL,
log_set_rotationtimeunit, SLAPD_AUDIT_LOG,
(void**)&global_slapdFrontendConfig.auditlog_rotationunit,
- CONFIG_STRING_OR_UNKNOWN, INIT_AUDITLOG_ROTATIONUNIT},
+ CONFIG_STRING_OR_UNKNOWN, NULL, INIT_AUDITLOG_ROTATIONUNIT},
{CONFIG_PW_RESETFAILURECOUNT_ATTRIBUTE, config_set_pw_resetfailurecount,
NULL, 0,
(void**)&global_slapdFrontendConfig.pw_policy.pw_resetfailurecount,
@@ -6473,9 +6473,44 @@ config_set_allowed_to_delete_attrs( const char *attrname, char *value,
}
if (apply) {
+ char *vcopy = slapi_ch_strdup(value);
+ char **allowed = NULL, **s, *d;
+ struct config_get_and_set *cgas = 0;
+ int needcopy = 0;
+ allowed = slapi_str2charray_ext(vcopy, " ", 0);
+ for (s = allowed; s && *s; s++) ;
+ for (--s; s && *s && (s >= allowed); s--) {
+ cgas = (struct config_get_and_set *)PL_HashTableLookup(confighash,
+ *s);
+ if (!cgas && PL_strcasecmp(*s, "aci") /* aci is an exception */) {
+ slapi_log_error(SLAPI_LOG_FATAL, "config",
+ "%s: Unknown attribute %s will be ignored\n",
+ CONFIG_ALLOWED_TO_DELETE_ATTRIBUTE, *s);
+ charray_remove(allowed, *s, 1);
+ needcopy = 1;
+ s--;
+ }
+ }
+ if (needcopy) {
+ /* given value included unknown attribute,
+ * we need to re-create a value. */
+ /* reuse the duplicated string for the new attr value. */
+ for (s = allowed, d = vcopy; s && *s; s++) {
+ size_t slen = strlen(*s);
+ memmove(d, *s, slen);
+ d += slen;
+ memmove(d, " ", 1);
+ d++;
+ }
+ *(d-1) = '\0';
+ strcpy(value, vcopy); /* original value needs to be refreshed */
+ } else {
+ slapi_ch_free_string(&vcopy);
+ vcopy = slapi_ch_strdup(value);
+ }
CFG_LOCK_WRITE(slapdFrontendConfig);
slapi_ch_free_string(&(slapdFrontendConfig->allowed_to_delete_attrs));
- slapdFrontendConfig->allowed_to_delete_attrs = slapi_ch_strdup(value);
+ slapdFrontendConfig->allowed_to_delete_attrs = vcopy;
CFG_UNLOCK_WRITE(slapdFrontendConfig);
}
return retVal;
@@ -6618,17 +6653,19 @@ config_set(const char *attr, struct berval **values, char *errorbuf, int apply)
}
for (ii = 0; !retval && values && values[ii]; ++ii)
{
- if (cgas->setfunc)
+ if (cgas->setfunc) {
retval = (cgas->setfunc)(cgas->attr_name,
(char *)values[ii]->bv_val, errorbuf, apply);
- else if (cgas->logsetfunc)
+ } else if (cgas->logsetfunc) {
retval = (cgas->logsetfunc)(cgas->attr_name,
(char *)values[ii]->bv_val, cgas->whichlog,
errorbuf, apply);
- else
+ } else {
LDAPDebug(LDAP_DEBUG_ANY,
"config_set: the attribute %s is read only; ignoring new value %s\n",
attr, values[ii]->bv_val, 0);
+ }
+ values[ii]->bv_len = strlen((char *)values[ii]->bv_val);
}
break;
}
1
0
ldap/servers/slapd/libglobs.c | 897 ++++++++++++++++++++++++++++--------------
1 file changed, 609 insertions(+), 288 deletions(-)
New commits:
commit 90dd9bb3c1411daca353d055d90618e67aa1fa7e
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Tue Nov 6 18:15:46 2012 -0800
Trac Ticket #443 - Deleting attribute present in
nsslapd-allowed-to-delete-attrs returns Operations error
https://fedorahosted.org/389/ticket/443
Bug Description: Even if setting a config parameter to nsslapd-
allowed-to-delete-attrs, the value failed to delete if the type
was on|off or integer.
Fix Description: Store all the initial config param values in
ConfigList. If the attribute value is deleted, reset the initial
value.
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index dc8452a..bd1062d 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -125,6 +125,139 @@ static int config_set_onoff( const char *attrname, char *value,
static int config_set_schemareplace ( const char *attrname, char *value,
char *errorbuf, int apply );
+/* Keeping the initial values */
+/* CONFIG_INT/CONFIG_LONG */
+#define DEFAULT_LOG_ROTATIONSYNCHOUR "0"
+#define DEFAULT_LOG_ROTATIONSYNCMIN "0"
+#define DEFAULT_LOG_ROTATIONTIME "1"
+#define DEFAULT_LOG_ACCESS_MAXNUMLOGS "10"
+#define DEFAULT_LOG_MAXNUMLOGS "1"
+#define DEFAULT_LOG_EXPTIME "1"
+#define DEFAULT_LOG_ACCESS_MAXDISKSPACE "500"
+#define DEFAULT_LOG_MAXDISKSPACE "100"
+#define DEFAULT_LOG_MAXLOGSIZE "100"
+#define DEFAULT_LOG_MINFREESPACE "5"
+#define DEFAULT_ACCESSLOGLEVEL "256"
+#define DEFAULT_SIZELIMIT "2000"
+#define DEFAULT_TIMELIMIT "3600"
+#define DEFAULT_PAGEDSIZELIMIT "0"
+#define DEFAULT_IDLE_TIMEOUT "0"
+#define DEFAULT_MAXDESCRIPTORS "1024"
+#define DEFAULT_RESERVE_FDS "64"
+#define DEFAULT_MAX_BERSIZE "0"
+#define DEFAULT_MAX_THREADS "30"
+#define DEFAULT_MAX_THREADS_PER_CONN "5"
+#define DEFAULT_IOBLOCK_TIMEOUT "1800000"
+#define DEFAULT_OUTBOUND_LDAP_IO_TIMEOUT "300000"
+#define DEFAULT_MAX_FILTER_NEST_LEVEL "40"
+#define DEFAULT_GROUPEVALNESTLEVEL "0"
+#define DEFAULT_MAX_SASLIO_SIZE "2097152"
+#define DEFAULT_DISK_THRESHOLD "2097152"
+#define DEFAULT_DISK_GRACE_PERIOD "60"
+#define DEFAULT_LOCAL_SSF "71"
+#define DEFAULT_MIN_SSF "0"
+#define DEFAULT_PW_INHISTORY "6"
+#define DEFAULT_PW_GRACELIMIT "0"
+#define DEFAULT_PW_MINLENGTH "0"
+#define DEFAULT_PW_MINDIGITS "0"
+#define DEFAULT_PW_MINALPHAS "0"
+#define DEFAULT_PW_MINUPPERS "0"
+#define DEFAULT_PW_MINLOWERS "0"
+#define DEFAULT_PW_MINSPECIALS "0"
+#define DEFAULT_PW_MIN8BIT "0"
+#define DEFAULT_PW_MAXREPEATS "0"
+#define DEFAULT_PW_MINCATEGORIES "3"
+#define DEFAULT_PW_MINTOKENLENGTH "3"
+#define DEFAULT_PW_MAXAGE "8640000"
+#define DEFAULT_PW_MINAGE "0"
+#define DEFAULT_PW_WARNING "86400"
+#define DEFAULT_PW_MAXFAILURE "3"
+#define DEFAULT_PW_RESETFAILURECOUNT "600"
+#define DEFAULT_PW_LOCKDURATION "3600"
+#define DEFAULT_NDN_SIZE "20971520"
+#ifdef MEMPOOL_EXPERIMENTAL
+#define DEFAULT_MEMPOOL_MAXFREELIST "1024"
+#endif
+
+/* CONFIG_STRING... */
+#define INIT_ACCESSLOG_MODE "600"
+#define INIT_ERRORLOG_MODE "600"
+#define INIT_AUDITLOG_MODE "600"
+#define INIT_ACCESSLOG_ROTATIONUNIT "day"
+#define INIT_ERRORLOG_ROTATIONUNIT "week"
+#define INIT_AUDITLOG_ROTATIONUNIT "week"
+#define INIT_ACCESSLOG_EXPTIMEUNIT "month"
+#define INIT_ERRORLOG_EXPTIMEUNIT "month"
+#define INIT_AUDITLOG_EXPTIMEUNIT "month"
+#define DEFAULT_DIRECTORY_MANAGER "cn=Directory Manager"
+#define DEFAULT_UIDNUM_TYPE "uidNumber"
+#define DEFAULT_GIDNUM_TYPE "gidNumber"
+#define DEFAULT_LDAPI_SEARCH_BASE "dc=example,dc=com"
+#define DEFAULT_LDAPI_AUTO_DN "cn=peercred,cn=external,cn=auth"
+#define ENTRYUSN_IMPORT_INIT "0"
+#define DEFAULT_ALLOWED_TO_DELETE_ATTRS "nsslapd-listenhost nsslapd-securelistenhost nsslapd-defaultnamingcontext"
+#define SALTED_SHA1_SCHEME_NAME "SSHA"
+
+/* CONFIG_ON_OFF */
+int init_accesslog_rotationsync_enabled;
+int init_errorlog_rotationsync_enabled;
+int init_auditlog_rotationsync_enabled;
+int init_accesslog_logging_enabled;
+int init_accesslogbuffering;
+int init_errorlog_logging_enabled;
+int init_auditlog_logging_enabled;
+int init_auditlog_logging_hide_unhashed_pw;
+int init_csnlogging;
+int init_pw_unlock;
+int init_pw_must_change;
+int init_pwpolicy_local;
+int init_pw_lockout;
+int init_pw_history;
+int init_pw_is_global_policy;
+int init_pw_is_legacy;
+int init_pw_track_update_time;
+int init_pw_change;
+int init_pw_exp;
+int init_pw_syntax;
+int init_schemacheck;
+int init_ds4_compatible_schema;
+int init_schema_ignore_trailing_spaces;
+int init_enquote_sup_oc;
+int init_rewrite_rfc1274;
+int init_syntaxcheck;
+int init_syntaxlogging;
+int init_dn_validate_strict;
+int init_attrname_exceptions;
+int init_return_exact_case;
+int init_result_tweak;
+int init_plugin_track;
+int init_lastmod;
+int init_readonly;
+int init_accesscontrol;
+int init_nagle;
+int init_security;
+int init_ssl_check_hostname;
+int init_ldapi_switch;
+int init_ldapi_bind_switch;
+int init_ldapi_map_entries;
+int init_allow_unauth_binds;
+int init_require_secure_binds;
+int init_minssf_exclude_rootdse;
+int init_force_sasl_external;
+int init_slapi_counters;
+int init_entryusn_global;
+int init_disk_monitoring;
+int init_disk_logging_critical;
+int init_disk_preserve_logging;
+int init_ndn_cache_enabled;
+#ifdef MEMPOOL_EXPERIMENTAL
+int init_mempool_switch;
+#endif
+
+#define DEFAULT_SSLCLIENTAPTH "off"
+#define DEFAULT_ALLOW_ANON_ACCESS "on"
+#define DEFAULT_VALIDATE_CERT "warn"
+
static int
isInt(ConfigVarType type)
{
@@ -145,567 +278,740 @@ static struct config_get_and_set {
void** config_var_addr; /* address of member of slapdFrontendConfig struct */
ConfigVarType config_var_type; /* cast to this type when getting */
ConfigGetFunc getfunc; /* for special handling */
+ void *initvalue;
} ConfigList[] = {
{CONFIG_AUDITLOG_MODE_ATTRIBUTE, NULL,
log_set_mode, SLAPD_AUDIT_LOG,
- (void**)&global_slapdFrontendConfig.auditlog_mode, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog_mode,
+ CONFIG_STRING, NULL, INIT_AUDITLOG_MODE},
{CONFIG_AUDITLOG_LOGROTATIONSYNCENABLED_ATTRIBUTE, NULL,
log_set_rotationsync_enabled, SLAPD_AUDIT_LOG,
- (void**)&global_slapdFrontendConfig.auditlog_rotationsync_enabled, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog_rotationsync_enabled,
+ CONFIG_ON_OFF, NULL, &init_auditlog_rotationsync_enabled},
{CONFIG_AUDITLOG_LOGROTATIONSYNCHOUR_ATTRIBUTE, NULL,
log_set_rotationsynchour, SLAPD_AUDIT_LOG,
- (void**)&global_slapdFrontendConfig.auditlog_rotationsynchour, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog_rotationsynchour,
+ CONFIG_INT, NULL, DEFAULT_LOG_ROTATIONSYNCHOUR},
{CONFIG_AUDITLOG_LOGROTATIONSYNCMIN_ATTRIBUTE, NULL,
log_set_rotationsyncmin, SLAPD_AUDIT_LOG,
- (void**)&global_slapdFrontendConfig.auditlog_rotationsyncmin, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog_rotationsyncmin,
+ CONFIG_INT, NULL, DEFAULT_LOG_ROTATIONSYNCMIN},
{CONFIG_AUDITLOG_LOGROTATIONTIME_ATTRIBUTE, NULL,
log_set_rotationtime, SLAPD_AUDIT_LOG,
- (void**)&global_slapdFrontendConfig.auditlog_rotationtime, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog_rotationtime,
+ CONFIG_INT, NULL, DEFAULT_LOG_ROTATIONTIME},
{CONFIG_ACCESSLOG_MODE_ATTRIBUTE, NULL,
log_set_mode, SLAPD_ACCESS_LOG,
- (void**)&global_slapdFrontendConfig.accesslog_mode, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog_mode,
+ CONFIG_STRING, NULL, INIT_ACCESSLOG_MODE},
{CONFIG_ACCESSLOG_MAXNUMOFLOGSPERDIR_ATTRIBUTE, NULL,
log_set_numlogsperdir, SLAPD_ACCESS_LOG,
- (void**)&global_slapdFrontendConfig.accesslog_maxnumlogs, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog_maxnumlogs,
+ CONFIG_INT, NULL, DEFAULT_LOG_ACCESS_MAXNUMLOGS},
{CONFIG_LOGLEVEL_ATTRIBUTE, config_set_errorlog_level,
NULL, 0,
(void**)&global_slapdFrontendConfig.errorloglevel,
- CONFIG_SPECIAL_ERRORLOGLEVEL, NULL},
+ CONFIG_SPECIAL_ERRORLOGLEVEL, NULL, NULL},
{CONFIG_ERRORLOG_LOGGING_ENABLED_ATTRIBUTE, NULL,
log_set_logging, SLAPD_ERROR_LOG,
- (void**)&global_slapdFrontendConfig.errorlog_logging_enabled, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.errorlog_logging_enabled,
+ CONFIG_ON_OFF, NULL, &init_errorlog_logging_enabled},
{CONFIG_ERRORLOG_MODE_ATTRIBUTE, NULL,
log_set_mode, SLAPD_ERROR_LOG,
- (void**)&global_slapdFrontendConfig.errorlog_mode, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.errorlog_mode,
+ CONFIG_STRING, NULL, INIT_ERRORLOG_MODE},
{CONFIG_ERRORLOG_LOGEXPIRATIONTIME_ATTRIBUTE, NULL,
log_set_expirationtime, SLAPD_ERROR_LOG,
- (void**)&global_slapdFrontendConfig.errorlog_exptime, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.errorlog_exptime,
+ CONFIG_INT, NULL, DEFAULT_LOG_EXPTIME},
{CONFIG_ACCESSLOG_LOGGING_ENABLED_ATTRIBUTE, NULL,
log_set_logging, SLAPD_ACCESS_LOG,
- (void**)&global_slapdFrontendConfig.accesslog_logging_enabled, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog_logging_enabled,
+ CONFIG_ON_OFF, NULL, &init_accesslog_logging_enabled},
{CONFIG_PORT_ATTRIBUTE, config_set_port,
NULL, 0,
- (void**)&global_slapdFrontendConfig.port, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.port,
+ CONFIG_INT, NULL, NULL/* deletion is not allowed */},
{CONFIG_WORKINGDIR_ATTRIBUTE, config_set_workingdir,
NULL, 0,
- (void**)&global_slapdFrontendConfig.workingdir, CONFIG_STRING_OR_EMPTY, NULL},
+ (void**)&global_slapdFrontendConfig.workingdir,
+ CONFIG_STRING_OR_EMPTY, NULL, NULL/* deletion is not allowed */},
{CONFIG_MAXTHREADSPERCONN_ATTRIBUTE, config_set_maxthreadsperconn,
NULL, 0,
- (void**)&global_slapdFrontendConfig.maxthreadsperconn, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.maxthreadsperconn,
+ CONFIG_INT, NULL, DEFAULT_MAX_THREADS_PER_CONN},
{CONFIG_ACCESSLOG_LOGEXPIRATIONTIME_ATTRIBUTE, NULL,
log_set_expirationtime, SLAPD_ACCESS_LOG,
- (void**)&global_slapdFrontendConfig.accesslog_exptime, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog_exptime,
+ CONFIG_INT, NULL, DEFAULT_LOG_EXPTIME},
#ifndef _WIN32
{CONFIG_LOCALUSER_ATTRIBUTE, config_set_localuser,
NULL, 0,
- (void**)&global_slapdFrontendConfig.localuser, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.localuser,
+ CONFIG_STRING, NULL, NULL/* deletion is not allowed */},
#endif
{CONFIG_ERRORLOG_LOGROTATIONSYNCENABLED_ATTRIBUTE, NULL,
log_set_rotationsync_enabled, SLAPD_ERROR_LOG,
- (void**)&global_slapdFrontendConfig.errorlog_rotationsync_enabled, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.errorlog_rotationsync_enabled,
+ CONFIG_ON_OFF, NULL, &init_errorlog_rotationsync_enabled},
{CONFIG_ERRORLOG_LOGROTATIONSYNCHOUR_ATTRIBUTE, NULL,
log_set_rotationsynchour, SLAPD_ERROR_LOG,
- (void**)&global_slapdFrontendConfig.errorlog_rotationsynchour, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.errorlog_rotationsynchour,
+ CONFIG_INT, NULL, DEFAULT_LOG_ROTATIONSYNCHOUR},
{CONFIG_ERRORLOG_LOGROTATIONSYNCMIN_ATTRIBUTE, NULL,
log_set_rotationsyncmin, SLAPD_ERROR_LOG,
- (void**)&global_slapdFrontendConfig.errorlog_rotationsyncmin, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.errorlog_rotationsyncmin,
+ CONFIG_INT, NULL, DEFAULT_LOG_ROTATIONSYNCMIN},
{CONFIG_ERRORLOG_LOGROTATIONTIME_ATTRIBUTE, NULL,
log_set_rotationtime, SLAPD_ERROR_LOG,
- (void**)&global_slapdFrontendConfig.errorlog_rotationtime, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.errorlog_rotationtime,
+ CONFIG_INT, NULL, DEFAULT_LOG_ROTATIONTIME},
{CONFIG_PW_INHISTORY_ATTRIBUTE, config_set_pw_inhistory,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_inhistory, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_inhistory,
+ CONFIG_INT, NULL, DEFAULT_PW_INHISTORY},
{CONFIG_PW_STORAGESCHEME_ATTRIBUTE, config_set_pw_storagescheme,
- NULL, 0, NULL, CONFIG_STRING, (ConfigGetFunc)config_get_pw_storagescheme},
+ NULL, 0, NULL,
+ CONFIG_STRING, (ConfigGetFunc)config_get_pw_storagescheme,
+ SALTED_SHA1_SCHEME_NAME},
{CONFIG_PW_UNLOCK_ATTRIBUTE, config_set_pw_unlock,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_unlock, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_unlock,
+ CONFIG_ON_OFF, NULL, &init_pw_unlock},
{CONFIG_PW_GRACELIMIT_ATTRIBUTE, config_set_pw_gracelimit,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_gracelimit, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_gracelimit,
+ CONFIG_INT, NULL, DEFAULT_PW_GRACELIMIT},
{CONFIG_ACCESSLOG_LOGROTATIONSYNCENABLED_ATTRIBUTE, NULL,
log_set_rotationsync_enabled, SLAPD_ACCESS_LOG,
- (void**)&global_slapdFrontendConfig.accesslog_rotationsync_enabled, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog_rotationsync_enabled,
+ CONFIG_ON_OFF, NULL, &init_accesslog_rotationsync_enabled},
{CONFIG_ACCESSLOG_LOGROTATIONSYNCHOUR_ATTRIBUTE, NULL,
log_set_rotationsynchour, SLAPD_ACCESS_LOG,
- (void**)&global_slapdFrontendConfig.accesslog_rotationsynchour, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog_rotationsynchour,
+ CONFIG_INT, NULL, DEFAULT_LOG_ROTATIONSYNCHOUR},
{CONFIG_ACCESSLOG_LOGROTATIONSYNCMIN_ATTRIBUTE, NULL,
log_set_rotationsyncmin, SLAPD_ACCESS_LOG,
- (void**)&global_slapdFrontendConfig.accesslog_rotationsyncmin, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog_rotationsyncmin,
+ CONFIG_INT, NULL, DEFAULT_LOG_ROTATIONSYNCMIN},
{CONFIG_ACCESSLOG_LOGROTATIONTIME_ATTRIBUTE, NULL,
log_set_rotationtime, SLAPD_ACCESS_LOG,
- (void**)&global_slapdFrontendConfig.accesslog_rotationtime, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog_rotationtime,
+ CONFIG_INT, NULL, DEFAULT_LOG_ROTATIONTIME},
{CONFIG_PW_MUSTCHANGE_ATTRIBUTE, config_set_pw_must_change,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_must_change, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_must_change,
+ CONFIG_ON_OFF, NULL, &init_pw_must_change},
{CONFIG_PWPOLICY_LOCAL_ATTRIBUTE, config_set_pwpolicy_local,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pwpolicy_local, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.pwpolicy_local,
+ CONFIG_ON_OFF, NULL, &init_pwpolicy_local},
{CONFIG_AUDITLOG_MAXLOGDISKSPACE_ATTRIBUTE, NULL,
log_set_maxdiskspace, SLAPD_AUDIT_LOG,
- (void**)&global_slapdFrontendConfig.auditlog_maxdiskspace, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog_maxdiskspace,
+ CONFIG_INT, NULL, DEFAULT_LOG_MAXDISKSPACE},
{CONFIG_SIZELIMIT_ATTRIBUTE, config_set_sizelimit,
NULL, 0,
- (void**)&global_slapdFrontendConfig.sizelimit, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.sizelimit,
+ CONFIG_INT, NULL, DEFAULT_SIZELIMIT},
{CONFIG_AUDITLOG_MAXLOGSIZE_ATTRIBUTE, NULL,
log_set_logsize, SLAPD_AUDIT_LOG,
- (void**)&global_slapdFrontendConfig.auditlog_maxlogsize, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog_maxlogsize,
+ CONFIG_INT, NULL, DEFAULT_LOG_MAXLOGSIZE},
{CONFIG_PW_WARNING_ATTRIBUTE, config_set_pw_warning,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_warning, CONFIG_LONG, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_warning,
+ CONFIG_LONG, NULL, DEFAULT_PW_WARNING},
{CONFIG_READONLY_ATTRIBUTE, config_set_readonly,
NULL, 0,
- (void**)&global_slapdFrontendConfig.readonly, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.readonly,
+ CONFIG_ON_OFF, NULL, &init_readonly},
{CONFIG_THREADNUMBER_ATTRIBUTE, config_set_threadnumber,
NULL, 0,
- (void**)&global_slapdFrontendConfig.threadnumber, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.threadnumber,
+ CONFIG_INT, NULL, DEFAULT_MAX_THREADS},
{CONFIG_PW_LOCKOUT_ATTRIBUTE, config_set_pw_lockout,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_lockout, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_lockout,
+ CONFIG_ON_OFF, NULL, &init_pw_lockout},
{CONFIG_ENQUOTE_SUP_OC_ATTRIBUTE, config_set_enquote_sup_oc,
NULL, 0,
- (void**)&global_slapdFrontendConfig.enquote_sup_oc, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.enquote_sup_oc,
+ CONFIG_ON_OFF, NULL, &init_enquote_sup_oc},
{CONFIG_LOCALHOST_ATTRIBUTE, config_set_localhost,
NULL, 0,
- (void**)&global_slapdFrontendConfig.localhost, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.localhost,
+ CONFIG_STRING, NULL, NULL/* deletion is not allowed */},
{CONFIG_IOBLOCKTIMEOUT_ATTRIBUTE, config_set_ioblocktimeout,
NULL, 0,
- (void**)&global_slapdFrontendConfig.ioblocktimeout, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.ioblocktimeout,
+ CONFIG_INT, NULL, DEFAULT_IOBLOCK_TIMEOUT},
{CONFIG_MAX_FILTER_NEST_LEVEL_ATTRIBUTE, config_set_max_filter_nest_level,
- NULL, 0, (void**)&global_slapdFrontendConfig.max_filter_nest_level,
- CONFIG_INT, NULL},
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.max_filter_nest_level,
+ CONFIG_INT, NULL, DEFAULT_MAX_FILTER_NEST_LEVEL},
{CONFIG_ERRORLOG_MAXLOGDISKSPACE_ATTRIBUTE, NULL,
log_set_maxdiskspace, SLAPD_ERROR_LOG,
- (void**)&global_slapdFrontendConfig.errorlog_maxdiskspace, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.errorlog_maxdiskspace,
+ CONFIG_INT, NULL, DEFAULT_LOG_MAXDISKSPACE},
{CONFIG_PW_MINLENGTH_ATTRIBUTE, config_set_pw_minlength,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_minlength, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_minlength,
+ CONFIG_INT, NULL, DEFAULT_PW_MINLENGTH},
{CONFIG_PW_MINDIGITS_ATTRIBUTE, config_set_pw_mindigits,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_mindigits, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_mindigits,
+ CONFIG_INT, NULL, DEFAULT_PW_MINDIGITS},
{CONFIG_PW_MINALPHAS_ATTRIBUTE, config_set_pw_minalphas,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_minalphas, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_minalphas,
+ CONFIG_INT, NULL, DEFAULT_PW_MINALPHAS},
{CONFIG_PW_MINUPPERS_ATTRIBUTE, config_set_pw_minuppers,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_minuppers, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_minuppers,
+ CONFIG_INT, NULL, DEFAULT_PW_MINUPPERS},
{CONFIG_PW_MINLOWERS_ATTRIBUTE, config_set_pw_minlowers,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_minlowers, CONFIG_INT, NULL},
- {CONFIG_PW_MINSPECIALS_ATTRIBUTE, config_set_pw_minspecials,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_minspecials, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_minlowers,
+ CONFIG_INT, NULL, DEFAULT_PW_MINLOWERS},
+ {CONFIG_PW_MINSPECIALS_ATTRIBUTE, config_set_pw_minspecials,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_minspecials,
+ CONFIG_INT, NULL, DEFAULT_PW_MINSPECIALS},
{CONFIG_PW_MIN8BIT_ATTRIBUTE, config_set_pw_min8bit,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_min8bit, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_min8bit,
+ CONFIG_INT, NULL, DEFAULT_PW_MIN8BIT},
{CONFIG_PW_MAXREPEATS_ATTRIBUTE, config_set_pw_maxrepeats,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_maxrepeats, CONFIG_INT, NULL},
- {CONFIG_PW_MINCATEGORIES_ATTRIBUTE, config_set_pw_mincategories,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_mincategories, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_maxrepeats,
+ CONFIG_INT, NULL, DEFAULT_PW_MAXREPEATS},
+ {CONFIG_PW_MINCATEGORIES_ATTRIBUTE, config_set_pw_mincategories,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_mincategories,
+ CONFIG_INT, NULL, DEFAULT_PW_MINCATEGORIES},
{CONFIG_PW_MINTOKENLENGTH_ATTRIBUTE, config_set_pw_mintokenlength,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_mintokenlength, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_mintokenlength,
+ CONFIG_INT, NULL, DEFAULT_PW_MINTOKENLENGTH},
{CONFIG_ERRORLOG_ATTRIBUTE, config_set_errorlog,
NULL, 0,
- (void**)&global_slapdFrontendConfig.errorlog, CONFIG_STRING_OR_EMPTY, NULL},
+ (void**)&global_slapdFrontendConfig.errorlog,
+ CONFIG_STRING_OR_EMPTY, NULL, NULL/* deletion is not allowed */},
{CONFIG_AUDITLOG_LOGEXPIRATIONTIME_ATTRIBUTE, NULL,
log_set_expirationtime, SLAPD_AUDIT_LOG,
- (void**)&global_slapdFrontendConfig.auditlog_exptime, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog_exptime,
+ CONFIG_INT, NULL, DEFAULT_LOG_EXPTIME},
{CONFIG_SCHEMACHECK_ATTRIBUTE, config_set_schemacheck,
NULL, 0,
- (void**)&global_slapdFrontendConfig.schemacheck, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.schemacheck,
+ CONFIG_ON_OFF, NULL, &init_schemacheck},
{CONFIG_SYNTAXCHECK_ATTRIBUTE, config_set_syntaxcheck,
NULL, 0,
- (void**)&global_slapdFrontendConfig.syntaxcheck, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.syntaxcheck,
+ CONFIG_ON_OFF, NULL, &init_syntaxcheck},
{CONFIG_SYNTAXLOGGING_ATTRIBUTE, config_set_syntaxlogging,
NULL, 0,
- (void**)&global_slapdFrontendConfig.syntaxlogging, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.syntaxlogging,
+ CONFIG_ON_OFF, NULL, &init_syntaxlogging},
{CONFIG_DN_VALIDATE_STRICT_ATTRIBUTE, config_set_dn_validate_strict,
NULL, 0,
- (void**)&global_slapdFrontendConfig.dn_validate_strict, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.dn_validate_strict,
+ CONFIG_ON_OFF, NULL, &init_dn_validate_strict},
{CONFIG_DS4_COMPATIBLE_SCHEMA_ATTRIBUTE, config_set_ds4_compatible_schema,
NULL, 0,
(void**)&global_slapdFrontendConfig.ds4_compatible_schema,
- CONFIG_ON_OFF, NULL},
+ CONFIG_ON_OFF, NULL, &init_ds4_compatible_schema},
{CONFIG_SCHEMA_IGNORE_TRAILING_SPACES,
config_set_schema_ignore_trailing_spaces, NULL, 0,
(void**)&global_slapdFrontendConfig.schema_ignore_trailing_spaces,
- CONFIG_ON_OFF, NULL},
+ CONFIG_ON_OFF, NULL, &init_schema_ignore_trailing_spaces},
{CONFIG_SCHEMAREPLACE_ATTRIBUTE, config_set_schemareplace, NULL, 0,
(void**)&global_slapdFrontendConfig.schemareplace,
- CONFIG_STRING_OR_OFF, NULL},
+ CONFIG_STRING_OR_OFF, NULL, CONFIG_SCHEMAREPLACE_STR_REPLICATION_ONLY},
{CONFIG_ACCESSLOG_MAXLOGDISKSPACE_ATTRIBUTE, NULL,
log_set_maxdiskspace, SLAPD_ACCESS_LOG,
- (void**)&global_slapdFrontendConfig.accesslog_maxdiskspace, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog_maxdiskspace,
+ CONFIG_INT, NULL, DEFAULT_LOG_ACCESS_MAXDISKSPACE},
{CONFIG_REFERRAL_ATTRIBUTE, (ConfigSetFunc)config_set_defaultreferral,
NULL, 0,
(void**)&global_slapdFrontendConfig.defaultreferral,
- CONFIG_SPECIAL_REFERRALLIST, NULL},
+ CONFIG_SPECIAL_REFERRALLIST, NULL, NULL/* deletion is not allowed */},
{CONFIG_PW_MAXFAILURE_ATTRIBUTE, config_set_pw_maxfailure,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_maxfailure, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_maxfailure,
+ CONFIG_INT, NULL, DEFAULT_PW_MAXFAILURE},
{CONFIG_ACCESSLOG_ATTRIBUTE, config_set_accesslog,
NULL, 0,
- (void**)&global_slapdFrontendConfig.accesslog, CONFIG_STRING_OR_EMPTY, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog,
+ CONFIG_STRING_OR_EMPTY, NULL, NULL/* deletion is not allowed */},
{CONFIG_LASTMOD_ATTRIBUTE, config_set_lastmod,
NULL, 0,
- (void**)&global_slapdFrontendConfig.lastmod, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.lastmod,
+ CONFIG_ON_OFF, NULL, &init_lastmod},
{CONFIG_ROOTPWSTORAGESCHEME_ATTRIBUTE, config_set_rootpwstoragescheme,
- NULL, 0, NULL, CONFIG_STRING, (ConfigGetFunc)config_get_rootpwstoragescheme},
+ NULL, 0, NULL,
+ CONFIG_STRING, (ConfigGetFunc)config_get_rootpwstoragescheme,
+ SALTED_SHA1_SCHEME_NAME},
{CONFIG_PW_HISTORY_ATTRIBUTE, config_set_pw_history,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_history, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_history,
+ CONFIG_ON_OFF, NULL, &init_pw_history},
{CONFIG_SECURITY_ATTRIBUTE, config_set_security,
NULL, 0,
- (void**)&global_slapdFrontendConfig.security, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.security,
+ CONFIG_ON_OFF, NULL, &init_security},
{CONFIG_PW_MAXAGE_ATTRIBUTE, config_set_pw_maxage,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_maxage, CONFIG_LONG, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_maxage,
+ CONFIG_LONG, NULL, DEFAULT_PW_MAXAGE},
{CONFIG_AUDITLOG_LOGROTATIONTIMEUNIT_ATTRIBUTE, NULL,
log_set_rotationtimeunit, SLAPD_AUDIT_LOG,
(void**)&global_slapdFrontendConfig.auditlog_rotationunit,
- CONFIG_STRING_OR_UNKNOWN, NULL},
+ CONFIG_STRING_OR_UNKNOWN, INIT_AUDITLOG_ROTATIONUNIT},
{CONFIG_PW_RESETFAILURECOUNT_ATTRIBUTE, config_set_pw_resetfailurecount,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_resetfailurecount, CONFIG_LONG, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_resetfailurecount,
+ CONFIG_LONG, NULL, DEFAULT_PW_RESETFAILURECOUNT},
{CONFIG_PW_ISGLOBAL_ATTRIBUTE, config_set_pw_is_global_policy,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_is_global_policy, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.pw_is_global_policy,
+ CONFIG_ON_OFF, NULL, &init_pw_is_global_policy},
{CONFIG_PW_IS_LEGACY, config_set_pw_is_legacy_policy,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_is_legacy, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_is_legacy,
+ CONFIG_ON_OFF, NULL, &init_pw_is_legacy},
{CONFIG_PW_TRACK_LAST_UPDATE_TIME, config_set_pw_track_last_update_time,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_track_update_time, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_track_update_time,
+ CONFIG_ON_OFF, NULL, &init_pw_track_update_time},
{CONFIG_AUDITLOG_MAXNUMOFLOGSPERDIR_ATTRIBUTE, NULL,
log_set_numlogsperdir, SLAPD_AUDIT_LOG,
- (void**)&global_slapdFrontendConfig.auditlog_maxnumlogs, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog_maxnumlogs,
+ CONFIG_INT, NULL, DEFAULT_LOG_MAXNUMLOGS},
{CONFIG_ERRORLOG_LOGEXPIRATIONTIMEUNIT_ATTRIBUTE, NULL,
log_set_expirationtimeunit, SLAPD_ERROR_LOG,
(void**)&global_slapdFrontendConfig.errorlog_exptimeunit,
- CONFIG_STRING_OR_UNKNOWN, NULL},
+ CONFIG_STRING_OR_UNKNOWN, NULL, INIT_ERRORLOG_EXPTIMEUNIT},
/* errorlog list is read only, so no set func and no config var addr */
- {CONFIG_ERRORLOG_LIST_ATTRIBUTE, NULL, NULL, 0, NULL,
- CONFIG_CHARRAY, (ConfigGetFunc)config_get_errorlog_list},
+ {CONFIG_ERRORLOG_LIST_ATTRIBUTE, NULL,
+ NULL, 0, NULL,
+ CONFIG_CHARRAY, (ConfigGetFunc)config_get_errorlog_list, NULL},
{CONFIG_GROUPEVALNESTLEVEL_ATTRIBUTE, config_set_groupevalnestlevel,
NULL, 0,
- (void**)&global_slapdFrontendConfig.groupevalnestlevel, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.groupevalnestlevel,
+ CONFIG_INT, NULL, DEFAULT_GROUPEVALNESTLEVEL},
{CONFIG_ACCESSLOG_LOGEXPIRATIONTIMEUNIT_ATTRIBUTE, NULL,
log_set_expirationtimeunit, SLAPD_ACCESS_LOG,
(void**)&global_slapdFrontendConfig.accesslog_exptimeunit,
- CONFIG_STRING_OR_UNKNOWN, NULL},
+ CONFIG_STRING_OR_UNKNOWN, NULL, INIT_ACCESSLOG_EXPTIMEUNIT},
{CONFIG_ROOTPW_ATTRIBUTE, config_set_rootpw,
NULL, 0,
- (void**)&global_slapdFrontendConfig.rootpw, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.rootpw,
+ CONFIG_STRING, NULL, NULL/* deletion is not allowed */},
{CONFIG_PW_CHANGE_ATTRIBUTE, config_set_pw_change,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_change, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_change,
+ CONFIG_ON_OFF, NULL, &init_pw_change},
{CONFIG_ACCESSLOGLEVEL_ATTRIBUTE, config_set_accesslog_level,
NULL, 0,
- (void**)&global_slapdFrontendConfig.accessloglevel, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.accessloglevel,
+ CONFIG_INT, NULL, DEFAULT_ACCESSLOGLEVEL},
{CONFIG_ERRORLOG_LOGROTATIONTIMEUNIT_ATTRIBUTE, NULL,
log_set_rotationtimeunit, SLAPD_ERROR_LOG,
(void**)&global_slapdFrontendConfig.errorlog_rotationunit,
- CONFIG_STRING_OR_UNKNOWN, NULL},
+ CONFIG_STRING_OR_UNKNOWN, NULL, INIT_ERRORLOG_ROTATIONUNIT},
{CONFIG_SECUREPORT_ATTRIBUTE, config_set_secureport,
NULL, 0,
- (void**)&global_slapdFrontendConfig.secureport, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.secureport,
+ CONFIG_INT, NULL, NULL/* deletion is not allowed */},
{CONFIG_BASEDN_ATTRIBUTE, config_set_basedn,
NULL, 0,
- (void**)&global_slapdFrontendConfig.certmap_basedn, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.certmap_basedn,
+ CONFIG_STRING, NULL, NULL/* deletion is not allowed */},
{CONFIG_TIMELIMIT_ATTRIBUTE, config_set_timelimit,
NULL, 0,
- (void**)&global_slapdFrontendConfig.timelimit, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.timelimit,
+ CONFIG_INT, NULL, DEFAULT_TIMELIMIT},
{CONFIG_ERRORLOG_MAXLOGSIZE_ATTRIBUTE, NULL,
log_set_logsize, SLAPD_ERROR_LOG,
- (void**)&global_slapdFrontendConfig.errorlog_maxlogsize, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.errorlog_maxlogsize,
+ CONFIG_INT, NULL, DEFAULT_LOG_MAXLOGSIZE},
{CONFIG_RESERVEDESCRIPTORS_ATTRIBUTE, config_set_reservedescriptors,
NULL, 0,
- (void**)&global_slapdFrontendConfig.reservedescriptors, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.reservedescriptors,
+ CONFIG_INT, NULL, DEFAULT_RESERVE_FDS},
/* access log list is read only, no set func, no config var addr */
- {CONFIG_ACCESSLOG_LIST_ATTRIBUTE, NULL, NULL, 0,
- NULL, CONFIG_CHARRAY, (ConfigGetFunc)config_get_accesslog_list},
+ {CONFIG_ACCESSLOG_LIST_ATTRIBUTE, NULL,
+ NULL, 0, NULL,
+ CONFIG_CHARRAY, (ConfigGetFunc)config_get_accesslog_list, NULL},
{CONFIG_SVRTAB_ATTRIBUTE, config_set_srvtab,
NULL, 0,
- (void**)&global_slapdFrontendConfig.srvtab, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.srvtab,
+ CONFIG_STRING, NULL, ""},
{CONFIG_PW_EXP_ATTRIBUTE, config_set_pw_exp,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_exp, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_exp,
+ CONFIG_ON_OFF, NULL, &init_pw_exp},
{CONFIG_ACCESSCONTROL_ATTRIBUTE, config_set_accesscontrol,
NULL, 0,
- (void**)&global_slapdFrontendConfig.accesscontrol, CONFIG_ON_OFF, NULL},
- {CONFIG_AUDITLOG_LIST_ATTRIBUTE, NULL, NULL, 0,
- NULL, CONFIG_CHARRAY, (ConfigGetFunc)config_get_auditlog_list},
+ (void**)&global_slapdFrontendConfig.accesscontrol,
+ CONFIG_ON_OFF, NULL, &init_accesscontrol},
+ {CONFIG_AUDITLOG_LIST_ATTRIBUTE, NULL,
+ NULL, 0, NULL,
+ CONFIG_CHARRAY, (ConfigGetFunc)config_get_auditlog_list, NULL},
{CONFIG_ACCESSLOG_LOGROTATIONTIMEUNIT_ATTRIBUTE, NULL,
log_set_rotationtimeunit, SLAPD_ACCESS_LOG,
- (void**)&global_slapdFrontendConfig.accesslog_rotationunit, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog_rotationunit,
+ CONFIG_STRING, NULL, INIT_ACCESSLOG_ROTATIONUNIT},
{CONFIG_PW_LOCKDURATION_ATTRIBUTE, config_set_pw_lockduration,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_lockduration, CONFIG_LONG, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_lockduration,
+ CONFIG_LONG, NULL, DEFAULT_PW_LOCKDURATION},
{CONFIG_ACCESSLOG_MAXLOGSIZE_ATTRIBUTE, NULL,
log_set_logsize, SLAPD_ACCESS_LOG,
- (void**)&global_slapdFrontendConfig.accesslog_maxlogsize, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog_maxlogsize,
+ CONFIG_INT, NULL, DEFAULT_LOG_MAXLOGSIZE},
{CONFIG_IDLETIMEOUT_ATTRIBUTE, config_set_idletimeout,
NULL, 0,
- (void**)&global_slapdFrontendConfig.idletimeout, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.idletimeout,
+ CONFIG_INT, NULL, DEFAULT_IDLE_TIMEOUT},
{CONFIG_NAGLE_ATTRIBUTE, config_set_nagle,
NULL, 0,
- (void**)&global_slapdFrontendConfig.nagle, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.nagle,
+ CONFIG_ON_OFF, NULL, &init_nagle},
{CONFIG_ERRORLOG_MINFREEDISKSPACE_ATTRIBUTE, NULL,
log_set_mindiskspace, SLAPD_ERROR_LOG,
- (void**)&global_slapdFrontendConfig.errorlog_minfreespace, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.errorlog_minfreespace,
+ CONFIG_INT, NULL, DEFAULT_LOG_MINFREESPACE},
{CONFIG_AUDITLOG_LOGGING_ENABLED_ATTRIBUTE, NULL,
log_set_logging, SLAPD_AUDIT_LOG,
- (void**)&global_slapdFrontendConfig.auditlog_logging_enabled, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog_logging_enabled,
+ CONFIG_ON_OFF, NULL, &init_auditlog_logging_enabled},
{CONFIG_AUDITLOG_LOGGING_HIDE_UNHASHED_PW, config_set_auditlog_unhashed_pw,
NULL, 0,
- (void**)&global_slapdFrontendConfig.auditlog_logging_hide_unhashed_pw, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog_logging_hide_unhashed_pw,
+ CONFIG_ON_OFF, NULL, &init_auditlog_logging_hide_unhashed_pw},
{CONFIG_ACCESSLOG_BUFFERING_ATTRIBUTE, config_set_accesslogbuffering,
NULL, 0,
- (void**)&global_slapdFrontendConfig.accesslogbuffering, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.accesslogbuffering,
+ CONFIG_ON_OFF, NULL, &init_accesslogbuffering},
{CONFIG_CSNLOGGING_ATTRIBUTE, config_set_csnlogging,
NULL, 0,
- (void**)&global_slapdFrontendConfig.csnlogging, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.csnlogging,
+ CONFIG_ON_OFF, NULL, &init_csnlogging},
{CONFIG_AUDITLOG_LOGEXPIRATIONTIMEUNIT_ATTRIBUTE, NULL,
log_set_expirationtimeunit, SLAPD_AUDIT_LOG,
(void**)&global_slapdFrontendConfig.auditlog_exptimeunit,
- CONFIG_STRING_OR_UNKNOWN, NULL},
+ CONFIG_STRING_OR_UNKNOWN, NULL, INIT_AUDITLOG_EXPTIMEUNIT},
{CONFIG_PW_SYNTAX_ATTRIBUTE, config_set_pw_syntax,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_syntax, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_syntax,
+ CONFIG_ON_OFF, NULL, &init_pw_syntax},
{CONFIG_LISTENHOST_ATTRIBUTE, config_set_listenhost,
NULL, 0,
- (void**)&global_slapdFrontendConfig.listenhost, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.listenhost,
+ CONFIG_STRING, NULL, NULL/* NULL value is allowed */},
{CONFIG_LDAPI_FILENAME_ATTRIBUTE, config_set_ldapi_filename,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.ldapi_filename, CONFIG_STRING, NULL},
- {CONFIG_LDAPI_SWITCH_ATTRIBUTE, config_set_ldapi_switch,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.ldapi_switch, CONFIG_ON_OFF, NULL},
- {CONFIG_LDAPI_BIND_SWITCH_ATTRIBUTE, config_set_ldapi_bind_switch,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.ldapi_bind_switch, CONFIG_ON_OFF, NULL},
- {CONFIG_LDAPI_ROOT_DN_ATTRIBUTE, config_set_ldapi_root_dn,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.ldapi_root_dn, CONFIG_STRING, NULL},
- {CONFIG_LDAPI_MAP_ENTRIES_ATTRIBUTE, config_set_ldapi_map_entries,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.ldapi_map_entries, CONFIG_ON_OFF, NULL},
- {CONFIG_LDAPI_UIDNUMBER_TYPE_ATTRIBUTE, config_set_ldapi_uidnumber_type,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.ldapi_uidnumber_type, CONFIG_STRING, NULL},
- {CONFIG_LDAPI_GIDNUMBER_TYPE_ATTRIBUTE, config_set_ldapi_gidnumber_type,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.ldapi_gidnumber_type, CONFIG_STRING, NULL},
- {CONFIG_LDAPI_SEARCH_BASE_DN_ATTRIBUTE, config_set_ldapi_search_base_dn,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.ldapi_search_base_dn, CONFIG_STRING, NULL},
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.ldapi_filename,
+ CONFIG_STRING, NULL, SLAPD_LDAPI_DEFAULT_FILENAME},
+ {CONFIG_LDAPI_SWITCH_ATTRIBUTE, config_set_ldapi_switch,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.ldapi_switch,
+ CONFIG_ON_OFF, NULL, &init_ldapi_switch},
+ {CONFIG_LDAPI_BIND_SWITCH_ATTRIBUTE, config_set_ldapi_bind_switch,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.ldapi_bind_switch,
+ CONFIG_ON_OFF, NULL, &init_ldapi_bind_switch},
+ {CONFIG_LDAPI_ROOT_DN_ATTRIBUTE, config_set_ldapi_root_dn,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.ldapi_root_dn,
+ CONFIG_STRING, NULL, DEFAULT_DIRECTORY_MANAGER},
+ {CONFIG_LDAPI_MAP_ENTRIES_ATTRIBUTE, config_set_ldapi_map_entries,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.ldapi_map_entries,
+ CONFIG_ON_OFF, NULL, &init_ldapi_map_entries},
+ {CONFIG_LDAPI_UIDNUMBER_TYPE_ATTRIBUTE, config_set_ldapi_uidnumber_type,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.ldapi_uidnumber_type,
+ CONFIG_STRING, NULL, DEFAULT_UIDNUM_TYPE},
+ {CONFIG_LDAPI_GIDNUMBER_TYPE_ATTRIBUTE, config_set_ldapi_gidnumber_type,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.ldapi_gidnumber_type,
+ CONFIG_STRING, NULL, DEFAULT_GIDNUM_TYPE},
+ {CONFIG_LDAPI_SEARCH_BASE_DN_ATTRIBUTE, config_set_ldapi_search_base_dn,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.ldapi_search_base_dn,
+ CONFIG_STRING, NULL, DEFAULT_LDAPI_SEARCH_BASE},
#if defined(ENABLE_AUTO_DN_SUFFIX)
- {CONFIG_LDAPI_AUTO_DN_SUFFIX_ATTRIBUTE, config_set_ldapi_auto_dn_suffix,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.ldapi_auto_dn_suffix, CONFIG_STRING, NULL},
+ {CONFIG_LDAPI_AUTO_DN_SUFFIX_ATTRIBUTE, config_set_ldapi_auto_dn_suffix,
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.ldapi_auto_dn_suffix,
+ CONFIG_STRING, NULL, DEFAULT_LDAPI_AUTO_DN},
#endif
{CONFIG_ANON_LIMITS_DN_ATTRIBUTE, config_set_anon_limits_dn,
- NULL, 0,
- (void**)&global_slapdFrontendConfig.anon_limits_dn, CONFIG_STRING, NULL},
+ NULL, 0,
+ (void**)&global_slapdFrontendConfig.anon_limits_dn,
+ CONFIG_STRING, NULL, ""},
{CONFIG_SLAPI_COUNTER_ATTRIBUTE, config_set_slapi_counters,
NULL, 0,
- (void**)&global_slapdFrontendConfig.slapi_counters, CONFIG_ON_OFF,
- (ConfigGetFunc)config_get_slapi_counters},
+ (void**)&global_slapdFrontendConfig.slapi_counters,
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_slapi_counters,
+ &init_slapi_counters},
{CONFIG_ACCESSLOG_MINFREEDISKSPACE_ATTRIBUTE, NULL,
log_set_mindiskspace, SLAPD_ACCESS_LOG,
- (void**)&global_slapdFrontendConfig.accesslog_minfreespace, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.accesslog_minfreespace,
+ CONFIG_INT, NULL, DEFAULT_LOG_MINFREESPACE},
{CONFIG_ERRORLOG_MAXNUMOFLOGSPERDIR_ATTRIBUTE, NULL,
log_set_numlogsperdir, SLAPD_ERROR_LOG,
- (void**)&global_slapdFrontendConfig.errorlog_maxnumlogs, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.errorlog_maxnumlogs,
+ CONFIG_INT, NULL, DEFAULT_LOG_MAXNUMLOGS},
{CONFIG_SECURELISTENHOST_ATTRIBUTE, config_set_securelistenhost,
NULL, 0,
- (void**)&global_slapdFrontendConfig.securelistenhost, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.securelistenhost,
+ CONFIG_STRING, NULL, NULL/* NULL value is allowed */},
{CONFIG_AUDITLOG_MINFREEDISKSPACE_ATTRIBUTE, NULL,
log_set_mindiskspace, SLAPD_AUDIT_LOG,
- (void**)&global_slapdFrontendConfig.auditlog_minfreespace, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog_minfreespace,
+ CONFIG_INT, NULL, DEFAULT_LOG_MINFREESPACE},
{CONFIG_ROOTDN_ATTRIBUTE, config_set_rootdn,
NULL, 0,
- (void**)&global_slapdFrontendConfig.rootdn, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.rootdn,
+ CONFIG_STRING, NULL, DEFAULT_DIRECTORY_MANAGER},
{CONFIG_PW_MINAGE_ATTRIBUTE, config_set_pw_minage,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pw_policy.pw_minage, CONFIG_LONG, NULL},
+ (void**)&global_slapdFrontendConfig.pw_policy.pw_minage,
+ CONFIG_LONG, NULL, DEFAULT_PW_MINAGE},
{CONFIG_AUDITFILE_ATTRIBUTE, config_set_auditlog,
NULL, 0,
- (void**)&global_slapdFrontendConfig.auditlog, CONFIG_STRING_OR_EMPTY, NULL},
+ (void**)&global_slapdFrontendConfig.auditlog,
+ CONFIG_STRING_OR_EMPTY, NULL, NULL/* deletion is not allowed */},
{CONFIG_RETURN_EXACT_CASE_ATTRIBUTE, config_set_return_exact_case,
NULL, 0,
- (void**)&global_slapdFrontendConfig.return_exact_case, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.return_exact_case,
+ CONFIG_ON_OFF, NULL, &init_return_exact_case},
{CONFIG_RESULT_TWEAK_ATTRIBUTE, config_set_result_tweak,
NULL, 0,
- (void**)&global_slapdFrontendConfig.result_tweak, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.result_tweak,
+ CONFIG_ON_OFF, NULL, &init_result_tweak},
{CONFIG_PLUGIN_BINDDN_TRACKING_ATTRIBUTE, config_set_plugin_tracking,
NULL, 0,
- (void**)&global_slapdFrontendConfig.plugin_track, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.plugin_track,
+ CONFIG_ON_OFF, NULL, &init_plugin_track},
{CONFIG_ATTRIBUTE_NAME_EXCEPTION_ATTRIBUTE, config_set_attrname_exceptions,
NULL, 0,
- (void**)&global_slapdFrontendConfig.attrname_exceptions, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.attrname_exceptions,
+ CONFIG_ON_OFF, NULL, &init_attrname_exceptions},
{CONFIG_MAXBERSIZE_ATTRIBUTE, config_set_maxbersize,
NULL, 0,
- (void**)&global_slapdFrontendConfig.maxbersize, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.maxbersize,
+ CONFIG_INT, NULL, DEFAULT_MAX_BERSIZE},
{CONFIG_MAXSASLIOSIZE_ATTRIBUTE, config_set_maxsasliosize,
NULL, 0,
- (void**)&global_slapdFrontendConfig.maxsasliosize, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.maxsasliosize,
+ CONFIG_INT, NULL, DEFAULT_MAX_SASLIO_SIZE},
{CONFIG_VERSIONSTRING_ATTRIBUTE, config_set_versionstring,
NULL, 0,
- (void**)&global_slapdFrontendConfig.versionstring, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.versionstring,
+ CONFIG_STRING, NULL, SLAPD_VERSION_STR},
{CONFIG_REFERRAL_MODE_ATTRIBUTE, config_set_referral_mode,
NULL, 0,
- (void**)&global_slapdFrontendConfig.refer_url, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.refer_url,
+ CONFIG_STRING, NULL, NULL/* deletion is not allowed */},
#if !defined(_WIN32) && !defined(AIX)
{CONFIG_MAXDESCRIPTORS_ATTRIBUTE, config_set_maxdescriptors,
NULL, 0,
- (void**)&global_slapdFrontendConfig.maxdescriptors, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.maxdescriptors,
+ CONFIG_INT, NULL, DEFAULT_MAXDESCRIPTORS},
#endif
{CONFIG_CONNTABLESIZE_ATTRIBUTE, config_set_conntablesize,
NULL, 0,
- (void**)&global_slapdFrontendConfig.conntablesize, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.conntablesize,
+ CONFIG_INT, NULL, NULL/* deletion is not allowed */},
{CONFIG_SSLCLIENTAUTH_ATTRIBUTE, config_set_SSLclientAuth,
NULL, 0,
- (void **)&global_slapdFrontendConfig.SSLclientAuth, CONFIG_SPECIAL_SSLCLIENTAUTH, NULL},
+ (void **)&global_slapdFrontendConfig.SSLclientAuth,
+ CONFIG_SPECIAL_SSLCLIENTAUTH, NULL, DEFAULT_SSLCLIENTAPTH},
{CONFIG_SSL_CHECK_HOSTNAME_ATTRIBUTE, config_set_ssl_check_hostname,
- NULL, 0, NULL, CONFIG_ON_OFF, (ConfigGetFunc)config_get_ssl_check_hostname},
- {CONFIG_CONFIG_ATTRIBUTE, 0, NULL, 0, (void**)SLAPD_CONFIG_DN,
- CONFIG_CONSTANT_STRING, NULL},
+ NULL, 0, NULL,
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_ssl_check_hostname,
+ &init_ssl_check_hostname},
+ {CONFIG_CONFIG_ATTRIBUTE, 0,
+ NULL, 0, (void**)SLAPD_CONFIG_DN,
+ CONFIG_CONSTANT_STRING, NULL, NULL/* deletion is not allowed */},
{CONFIG_HASH_FILTERS_ATTRIBUTE, config_set_hash_filters,
- NULL, 0, NULL, CONFIG_ON_OFF, (ConfigGetFunc)config_get_hash_filters},
+ NULL, 0, NULL,
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_hash_filters,
+ NULL/* deletion is not allowed */},
/* instance dir; used by admin tasks */
{CONFIG_INSTDIR_ATTRIBUTE, config_set_instancedir,
NULL, 0,
- (void**)&global_slapdFrontendConfig.instancedir, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.instancedir,
+ CONFIG_STRING, NULL, NULL/* deletion is not allowed */},
/* parameterizing schema dir */
{CONFIG_SCHEMADIR_ATTRIBUTE, config_set_schemadir,
NULL, 0,
- (void**)&global_slapdFrontendConfig.schemadir, CONFIG_STRING, NULL},
+ (void**)&global_slapdFrontendConfig.schemadir,
+ CONFIG_STRING, NULL, NULL/* deletion is not allowed */},
/* parameterizing lock dir */
{CONFIG_LOCKDIR_ATTRIBUTE, config_set_lockdir,
NULL, 0,
- (void**)&global_slapdFrontendConfig.lockdir, CONFIG_STRING, (ConfigGetFunc)config_get_lockdir},
+ (void**)&global_slapdFrontendConfig.lockdir,
+ CONFIG_STRING, (ConfigGetFunc)config_get_lockdir,
+ NULL/* deletion is not allowed */},
/* parameterizing tmp dir */
{CONFIG_TMPDIR_ATTRIBUTE, config_set_tmpdir,
NULL, 0,
- (void**)&global_slapdFrontendConfig.tmpdir, CONFIG_STRING, (ConfigGetFunc)config_get_tmpdir},
+ (void**)&global_slapdFrontendConfig.tmpdir,
+ CONFIG_STRING, (ConfigGetFunc)config_get_tmpdir,
+ NULL/* deletion is not allowed */},
/* parameterizing cert dir */
{CONFIG_CERTDIR_ATTRIBUTE, config_set_certdir,
NULL, 0,
- (void**)&global_slapdFrontendConfig.certdir, CONFIG_STRING, (ConfigGetFunc)config_get_certdir},
+ (void**)&global_slapdFrontendConfig.certdir,
+ CONFIG_STRING, (ConfigGetFunc)config_get_certdir,
+ NULL/* deletion is not allowed */},
/* parameterizing ldif dir */
{CONFIG_LDIFDIR_ATTRIBUTE, config_set_ldifdir,
NULL, 0,
- (void**)&global_slapdFrontendConfig.ldifdir, CONFIG_STRING, (ConfigGetFunc)config_get_ldifdir},
+ (void**)&global_slapdFrontendConfig.ldifdir,
+ CONFIG_STRING, (ConfigGetFunc)config_get_ldifdir,
+ NULL/* deletion is not allowed */},
/* parameterizing bak dir */
{CONFIG_BAKDIR_ATTRIBUTE, config_set_bakdir,
NULL, 0,
- (void**)&global_slapdFrontendConfig.bakdir, CONFIG_STRING, (ConfigGetFunc)config_get_bakdir},
+ (void**)&global_slapdFrontendConfig.bakdir,
+ CONFIG_STRING, (ConfigGetFunc)config_get_bakdir,
+ NULL/* deletion is not allowed */},
/* parameterizing sasl plugin path */
{CONFIG_SASLPATH_ATTRIBUTE, config_set_saslpath,
NULL, 0,
- (void**)&global_slapdFrontendConfig.saslpath, CONFIG_STRING, (ConfigGetFunc)config_get_saslpath},
+ (void**)&global_slapdFrontendConfig.saslpath,
+ CONFIG_STRING, (ConfigGetFunc)config_get_saslpath,
+ NULL/* deletion is not allowed */},
/* parameterizing run dir */
{CONFIG_RUNDIR_ATTRIBUTE, config_set_rundir,
NULL, 0,
- (void**)&global_slapdFrontendConfig.rundir, CONFIG_STRING, (ConfigGetFunc)config_get_rundir},
+ (void**)&global_slapdFrontendConfig.rundir,
+ CONFIG_STRING, (ConfigGetFunc)config_get_rundir,
+ NULL/* deletion is not allowed */},
{CONFIG_REWRITE_RFC1274_ATTRIBUTE, config_set_rewrite_rfc1274,
NULL, 0,
- (void**)&global_slapdFrontendConfig.rewrite_rfc1274, CONFIG_ON_OFF, NULL},
+ (void**)&global_slapdFrontendConfig.rewrite_rfc1274,
+ CONFIG_ON_OFF, NULL, &init_rewrite_rfc1274},
{CONFIG_OUTBOUND_LDAP_IO_TIMEOUT_ATTRIBUTE,
config_set_outbound_ldap_io_timeout,
NULL, 0,
(void **)&global_slapdFrontendConfig.outbound_ldap_io_timeout,
- CONFIG_INT, NULL},
+ CONFIG_INT, NULL, DEFAULT_OUTBOUND_LDAP_IO_TIMEOUT},
{CONFIG_UNAUTH_BINDS_ATTRIBUTE, config_set_unauth_binds_switch,
NULL, 0,
- (void**)&global_slapdFrontendConfig.allow_unauth_binds, CONFIG_ON_OFF,
- (ConfigGetFunc)config_get_unauth_binds_switch},
+ (void**)&global_slapdFrontendConfig.allow_unauth_binds,
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_unauth_binds_switch,
+ &init_allow_unauth_binds},
{CONFIG_REQUIRE_SECURE_BINDS_ATTRIBUTE, config_set_require_secure_binds,
NULL, 0,
- (void**)&global_slapdFrontendConfig.require_secure_binds, CONFIG_ON_OFF,
- (ConfigGetFunc)config_get_require_secure_binds},
+ (void**)&global_slapdFrontendConfig.require_secure_binds,
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_require_secure_binds,
+ &init_require_secure_binds},
{CONFIG_ANON_ACCESS_ATTRIBUTE, config_set_anon_access_switch,
NULL, 0,
- (void**)&global_slapdFrontendConfig.allow_anon_access, CONFIG_SPECIAL_ANON_ACCESS_SWITCH,
- (ConfigGetFunc)config_get_anon_access_switch},
+ (void**)&global_slapdFrontendConfig.allow_anon_access,
+ CONFIG_SPECIAL_ANON_ACCESS_SWITCH,
+ (ConfigGetFunc)config_get_anon_access_switch,
+ DEFAULT_ALLOW_ANON_ACCESS},
{CONFIG_LOCALSSF_ATTRIBUTE, config_set_localssf,
NULL, 0,
- (void**)&global_slapdFrontendConfig.localssf, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.localssf,
+ CONFIG_INT, NULL, DEFAULT_LOCAL_SSF},
{CONFIG_MINSSF_ATTRIBUTE, config_set_minssf,
NULL, 0,
- (void**)&global_slapdFrontendConfig.minssf, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.minssf,
+ CONFIG_INT, NULL, DEFAULT_MIN_SSF},
{CONFIG_MINSSF_EXCLUDE_ROOTDSE, config_set_minssf_exclude_rootdse,
NULL, 0,
(void**)&global_slapdFrontendConfig.minssf_exclude_rootdse,
- CONFIG_ON_OFF,
- (ConfigGetFunc)config_get_minssf_exclude_rootdse},
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_minssf_exclude_rootdse,
+ &init_minssf_exclude_rootdse},
{CONFIG_FORCE_SASL_EXTERNAL_ATTRIBUTE, config_set_force_sasl_external,
NULL, 0,
- (void**)&global_slapdFrontendConfig.force_sasl_external, CONFIG_ON_OFF,
- (ConfigGetFunc)config_get_force_sasl_external},
+ (void**)&global_slapdFrontendConfig.force_sasl_external,
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_force_sasl_external,
+ &init_force_sasl_external},
{CONFIG_ENTRYUSN_GLOBAL, config_set_entryusn_global,
NULL, 0,
- (void**)&global_slapdFrontendConfig.entryusn_global, CONFIG_ON_OFF,
- (ConfigGetFunc)config_get_entryusn_global},
+ (void**)&global_slapdFrontendConfig.entryusn_global,
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_entryusn_global,
+ &init_entryusn_global},
{CONFIG_ENTRYUSN_IMPORT_INITVAL, config_set_entryusn_import_init,
NULL, 0,
(void**)&global_slapdFrontendConfig.entryusn_import_init,
- CONFIG_STRING, (ConfigGetFunc)config_get_entryusn_import_init},
+ CONFIG_STRING, (ConfigGetFunc)config_get_entryusn_import_init,
+ ENTRYUSN_IMPORT_INIT},
{CONFIG_ALLOWED_TO_DELETE_ATTRIBUTE, config_set_allowed_to_delete_attrs,
NULL, 0,
(void**)&global_slapdFrontendConfig.allowed_to_delete_attrs,
- CONFIG_STRING, (ConfigGetFunc)config_get_allowed_to_delete_attrs},
+ CONFIG_STRING, (ConfigGetFunc)config_get_allowed_to_delete_attrs,
+ DEFAULT_ALLOWED_TO_DELETE_ATTRS },
{CONFIG_VALIDATE_CERT_ATTRIBUTE, config_set_validate_cert_switch,
NULL, 0,
(void**)&global_slapdFrontendConfig.validate_cert,
CONFIG_SPECIAL_VALIDATE_CERT_SWITCH,
- (ConfigGetFunc)config_get_validate_cert_switch},
+ (ConfigGetFunc)config_get_validate_cert_switch, DEFAULT_VALIDATE_CERT},
{CONFIG_PAGEDSIZELIMIT_ATTRIBUTE, config_set_pagedsizelimit,
NULL, 0,
- (void**)&global_slapdFrontendConfig.pagedsizelimit, CONFIG_INT, NULL},
+ (void**)&global_slapdFrontendConfig.pagedsizelimit,
+ CONFIG_INT, NULL, DEFAULT_PAGEDSIZELIMIT},
{CONFIG_DEFAULT_NAMING_CONTEXT, config_set_default_naming_context,
NULL, 0,
(void**)&global_slapdFrontendConfig.default_naming_context,
- CONFIG_STRING, (ConfigGetFunc)config_get_default_naming_context},
+ CONFIG_STRING, (ConfigGetFunc)config_get_default_naming_context, NULL},
{CONFIG_DISK_MONITORING, config_set_disk_monitoring,
NULL, 0,
- (void**)&global_slapdFrontendConfig.disk_monitoring, CONFIG_ON_OFF,
- (ConfigGetFunc)config_get_disk_monitoring},
+ (void**)&global_slapdFrontendConfig.disk_monitoring,
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_disk_monitoring,
+ &init_disk_monitoring},
{CONFIG_DISK_THRESHOLD, config_set_disk_threshold,
NULL, 0,
- (void**)&global_slapdFrontendConfig.disk_threshold, CONFIG_INT,
- (ConfigGetFunc)config_get_disk_threshold},
+ (void**)&global_slapdFrontendConfig.disk_threshold,
+ CONFIG_INT, (ConfigGetFunc)config_get_disk_threshold,
+ DEFAULT_DISK_THRESHOLD},
{CONFIG_DISK_GRACE_PERIOD, config_set_disk_grace_period,
NULL, 0,
(void**)&global_slapdFrontendConfig.disk_grace_period,
- CONFIG_INT, (ConfigGetFunc)config_get_disk_grace_period},
+ CONFIG_INT, (ConfigGetFunc)config_get_disk_grace_period,
+ DEFAULT_DISK_GRACE_PERIOD},
{CONFIG_DISK_LOGGING_CRITICAL, config_set_disk_logging_critical,
NULL, 0,
(void**)&global_slapdFrontendConfig.disk_logging_critical,
- CONFIG_ON_OFF, (ConfigGetFunc)config_get_disk_logging_critical},
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_disk_logging_critical,
+ &init_disk_logging_critical},
{CONFIG_DISK_PRESERVE_LOGGING, config_set_disk_preserve_logging,
NULL, 0,
(void**)&global_slapdFrontendConfig.disk_preserve_logging,
- CONFIG_ON_OFF, (ConfigGetFunc)config_get_disk_preserve_logging},
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_disk_preserve_logging,
+ &init_disk_preserve_logging},
{CONFIG_NDN_CACHE, config_set_ndn_cache_enabled,
NULL, 0,
- (void**)&global_slapdFrontendConfig.ndn_cache_enabled, CONFIG_INT,
- (ConfigGetFunc)config_get_ndn_cache_enabled},
+ (void**)&global_slapdFrontendConfig.ndn_cache_enabled,
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_ndn_cache_enabled,
+ &init_ndn_cache_enabled},
{CONFIG_NDN_CACHE_SIZE, config_set_ndn_cache_max_size,
NULL, 0,
(void**)&global_slapdFrontendConfig.ndn_cache_max_size,
- CONFIG_INT, (ConfigGetFunc)config_get_ndn_cache_size},
+ CONFIG_INT, (ConfigGetFunc)config_get_ndn_cache_size, DEFAULT_NDN_SIZE},
#ifdef MEMPOOL_EXPERIMENTAL
,{CONFIG_MEMPOOL_SWITCH_ATTRIBUTE, config_set_mempool_switch,
NULL, 0,
- (void**)&global_slapdFrontendConfig.mempool_switch, CONFIG_ON_OFF, (ConfigGetFunc)config_get_mempool_switch},
+ (void**)&global_slapdFrontendConfig.mempool_switch,
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_mempool_switch,
+ &init_mempool_switch},
{CONFIG_MEMPOOL_MAXFREELIST_ATTRIBUTE, config_set_mempool_maxfreelist,
NULL, 0,
- (void**)&global_slapdFrontendConfig.mempool_maxfreelist, CONFIG_INT, (ConfigGetFunc)config_get_mempool_maxfreelist}
+ (void**)&global_slapdFrontendConfig.mempool_maxfreelist,
+ CONFIG_INT, (ConfigGetFunc)config_get_mempool_maxfreelist,
+ DEFAULT_MEMPOOL_MAXFREELIST}
#endif /* MEMPOOL_EXPERIMENTAL */
};
@@ -943,21 +1249,21 @@ FrontendConfig_init () {
cfg->port = LDAP_PORT;
cfg->secureport = LDAPS_PORT;
cfg->ldapi_filename = slapi_ch_strdup(SLAPD_LDAPI_DEFAULT_FILENAME);
- cfg->ldapi_switch = LDAP_OFF;
- cfg->ldapi_bind_switch = LDAP_OFF;
- cfg->ldapi_root_dn = slapi_ch_strdup("cn=Directory Manager");
- cfg->ldapi_map_entries = LDAP_OFF;
- cfg->ldapi_uidnumber_type = slapi_ch_strdup("uidNumber");
- cfg->ldapi_gidnumber_type = slapi_ch_strdup("gidNumber");
+ init_ldapi_switch = cfg->ldapi_switch = LDAP_OFF;
+ init_ldapi_bind_switch = cfg->ldapi_bind_switch = LDAP_OFF;
+ cfg->ldapi_root_dn = slapi_ch_strdup(DEFAULT_DIRECTORY_MANAGER);
+ init_ldapi_map_entries = cfg->ldapi_map_entries = LDAP_OFF;
+ cfg->ldapi_uidnumber_type = slapi_ch_strdup(DEFAULT_UIDNUM_TYPE);
+ cfg->ldapi_gidnumber_type = slapi_ch_strdup(DEFAULT_GIDNUM_TYPE);
/* These DNs are no need to be normalized. */
- cfg->ldapi_search_base_dn = slapi_ch_strdup("dc=example,dc=com");
+ cfg->ldapi_search_base_dn = slapi_ch_strdup(DEFAULT_LDAPI_SEARCH_BASE);
#if defined(ENABLE_AUTO_DN_SUFFIX)
- cfg->ldapi_auto_dn_suffix = slapi_ch_strdup("cn=peercred,cn=external,cn=auth");
+ cfg->ldapi_auto_dn_suffix = slapi_ch_strdup(DEFAULT_LDAPI_AUTO_DN);
#endif
- cfg->allow_unauth_binds = LDAP_OFF;
- cfg->require_secure_binds = LDAP_OFF;
+ init_allow_unauth_binds = cfg->allow_unauth_binds = LDAP_OFF;
+ init_require_secure_binds = cfg->require_secure_binds = LDAP_OFF;
cfg->allow_anon_access = SLAPD_ANON_ACCESS_ON;
- cfg->slapi_counters = LDAP_ON;
+ init_slapi_counters = cfg->slapi_counters = LDAP_ON;
cfg->threadnumber = SLAPD_DEFAULT_MAX_THREADS;
cfg->maxthreadsperconn = SLAPD_DEFAULT_MAX_THREADS_PER_CONN;
cfg->reservedescriptors = SLAPD_DEFAULT_RESERVE_FDS;
@@ -968,8 +1274,8 @@ FrontendConfig_init () {
cfg->maxsasliosize = SLAPD_DEFAULT_MAX_SASLIO_SIZE;
cfg->localssf = SLAPD_DEFAULT_LOCAL_SSF;
cfg->minssf = SLAPD_DEFAULT_MIN_SSF;
- cfg->minssf_exclude_rootdse = LDAP_OFF; /* minssf is applied to rootdse,
- by default */
+ /* minssf is applied to rootdse, by default */
+ init_minssf_exclude_rootdse = cfg->minssf_exclude_rootdse = LDAP_OFF;
cfg->validate_cert = SLAPD_VALIDATE_CERT_WARN;
#ifdef _WIN32
@@ -982,17 +1288,19 @@ FrontendConfig_init () {
#endif /* USE_SYSCONF */
#endif /* _WIN32 */
- cfg->accesscontrol = LDAP_ON;
- cfg->security = LDAP_OFF;
- cfg->ssl_check_hostname = LDAP_ON;
- cfg->return_exact_case = LDAP_ON;
- cfg->result_tweak = LDAP_OFF;
+ init_accesscontrol = cfg->accesscontrol = LDAP_ON;
+ init_nagle = cfg->nagle = LDAP_OFF;
+ init_security = cfg->security = LDAP_OFF;
+ init_ssl_check_hostname = cfg->ssl_check_hostname = LDAP_ON;
+ init_return_exact_case = cfg->return_exact_case = LDAP_ON;
+ init_result_tweak = cfg->result_tweak = LDAP_OFF;
+ init_attrname_exceptions = cfg->attrname_exceptions = LDAP_OFF;
cfg->reservedescriptors = SLAPD_DEFAULT_RESERVE_FDS;
cfg->useroc = slapi_ch_strdup ( "" );
cfg->userat = slapi_ch_strdup ( "" );
/* kexcoff: should not be initialized by default here
- cfg->rootpwstoragescheme = pw_name2scheme( SHA1_SCHEME_NAME );
- cfg->pw_storagescheme = pw_name2scheme( SHA1_SCHEME_NAME );
+ cfg->rootpwstoragescheme = pw_name2scheme( SALTED_SHA1_SCHEME_NAME );
+ cfg->pw_storagescheme = pw_name2scheme( SALTED_SHA1_SCHEME_NAME );
*/
cfg->slapd_type = 0;
cfg->versionstring = SLAPD_VERSION_STR;
@@ -1000,24 +1308,29 @@ FrontendConfig_init () {
cfg->pagedsizelimit = 0;
cfg->timelimit = SLAPD_DEFAULT_TIMELIMIT;
cfg->anon_limits_dn = slapi_ch_strdup("");
- cfg->schemacheck = LDAP_ON;
- cfg->syntaxcheck = LDAP_OFF;
- cfg->plugin_track = LDAP_OFF;
- cfg->syntaxlogging = LDAP_OFF;
- cfg->dn_validate_strict = LDAP_OFF;
- cfg->ds4_compatible_schema = LDAP_OFF;
- cfg->enquote_sup_oc = LDAP_OFF;
- cfg->lastmod = LDAP_ON;
- cfg->rewrite_rfc1274 = LDAP_OFF;
+ init_schemacheck = cfg->schemacheck = LDAP_ON;
+ init_syntaxcheck = cfg->syntaxcheck = LDAP_OFF;
+ init_plugin_track = cfg->plugin_track = LDAP_OFF;
+ init_syntaxlogging = cfg->syntaxlogging = LDAP_OFF;
+ init_dn_validate_strict = cfg->dn_validate_strict = LDAP_OFF;
+ init_ds4_compatible_schema = cfg->ds4_compatible_schema = LDAP_OFF;
+ init_enquote_sup_oc = cfg->enquote_sup_oc = LDAP_OFF;
+ init_lastmod = cfg->lastmod = LDAP_ON;
+ init_rewrite_rfc1274 = cfg->rewrite_rfc1274 = LDAP_OFF;
cfg->schemareplace = slapi_ch_strdup( CONFIG_SCHEMAREPLACE_STR_REPLICATION_ONLY );
- cfg->schema_ignore_trailing_spaces = SLAPD_DEFAULT_SCHEMA_IGNORE_TRAILING_SPACES;
- cfg->force_sasl_external = LDAP_OFF; /* do not force sasl external by default - let clients abide by the LDAP standards and send us a SASL/EXTERNAL bind if that's what they want to do */
-
- cfg->pwpolicy_local = LDAP_OFF;
- cfg->pw_policy.pw_change = LDAP_ON;
- cfg->pw_policy.pw_must_change = LDAP_OFF;
- cfg->pw_policy.pw_syntax = LDAP_OFF;
- cfg->pw_policy.pw_exp = LDAP_OFF;
+ init_schema_ignore_trailing_spaces = cfg->schema_ignore_trailing_spaces =
+ SLAPD_DEFAULT_SCHEMA_IGNORE_TRAILING_SPACES;
+ /* do not force sasl external by default -
+ * let clients abide by the LDAP standards and send us a SASL/EXTERNAL bind
+ * if that's what they want to do */
+ init_force_sasl_external = cfg->force_sasl_external = LDAP_OFF;
+
+ init_readonly = cfg->readonly = LDAP_OFF;
+ init_pwpolicy_local = cfg->pwpolicy_local = LDAP_OFF;
+ init_pw_change = cfg->pw_policy.pw_change = LDAP_ON;
+ init_pw_must_change = cfg->pw_policy.pw_must_change = LDAP_OFF;
+ init_pw_syntax = cfg->pw_policy.pw_syntax = LDAP_OFF;
+ init_pw_exp = cfg->pw_policy.pw_exp = LDAP_OFF;
cfg->pw_policy.pw_minlength = 8;
cfg->pw_policy.pw_mindigits = 0;
cfg->pw_policy.pw_minalphas = 0;
@@ -1031,80 +1344,84 @@ FrontendConfig_init () {
cfg->pw_policy.pw_maxage = 8640000; /* 100 days */
cfg->pw_policy.pw_minage = 0;
cfg->pw_policy.pw_warning = 86400; /* 1 day */
- cfg->pw_policy.pw_history = LDAP_OFF;
+ init_pw_history = cfg->pw_policy.pw_history = LDAP_OFF;
cfg->pw_policy.pw_inhistory = 6;
- cfg->pw_policy.pw_lockout = LDAP_OFF;
+ init_pw_lockout = cfg->pw_policy.pw_lockout = LDAP_OFF;
cfg->pw_policy.pw_maxfailure = 3;
- cfg->pw_policy.pw_unlock = LDAP_ON;
+ init_pw_unlock = cfg->pw_policy.pw_unlock = LDAP_ON;
cfg->pw_policy.pw_lockduration = 3600; /* 60 minutes */
cfg->pw_policy.pw_resetfailurecount = 600; /* 10 minutes */
cfg->pw_policy.pw_gracelimit = 0;
- cfg->pw_policy.pw_is_legacy = LDAP_ON;
- cfg->pw_policy.pw_track_update_time = LDAP_OFF;
- cfg->pw_is_global_policy = LDAP_OFF;
+ init_pw_is_legacy = cfg->pw_policy.pw_is_legacy = LDAP_ON;
+ init_pw_track_update_time = cfg->pw_policy.pw_track_update_time = LDAP_OFF;
+ init_pw_is_global_policy = cfg->pw_is_global_policy = LDAP_OFF;
- cfg->accesslog_logging_enabled = LDAP_ON;
- cfg->accesslog_mode = slapi_ch_strdup("600");
+ init_accesslog_logging_enabled = cfg->accesslog_logging_enabled = LDAP_ON;
+ cfg->accesslog_mode = slapi_ch_strdup(INIT_ACCESSLOG_MODE);
cfg->accesslog_maxnumlogs = 10;
cfg->accesslog_maxlogsize = 100;
cfg->accesslog_rotationtime = 1;
- cfg->accesslog_rotationunit = slapi_ch_strdup("day");
- cfg->accesslog_rotationsync_enabled = LDAP_OFF;
+ cfg->accesslog_rotationunit = slapi_ch_strdup(INIT_ACCESSLOG_ROTATIONUNIT);
+ init_accesslog_rotationsync_enabled =
+ cfg->accesslog_rotationsync_enabled = LDAP_OFF;
cfg->accesslog_rotationsynchour = 0;
cfg->accesslog_rotationsyncmin = 0;
cfg->accesslog_maxdiskspace = 500;
cfg->accesslog_minfreespace = 5;
cfg->accesslog_exptime = 1;
- cfg->accesslog_exptimeunit = slapi_ch_strdup("month");
+ cfg->accesslog_exptimeunit = slapi_ch_strdup(INIT_ACCESSLOG_EXPTIMEUNIT);
cfg->accessloglevel = 256;
- cfg->accesslogbuffering = LDAP_ON;
- cfg->csnlogging = LDAP_ON;
+ init_accesslogbuffering = cfg->accesslogbuffering = LDAP_ON;
+ init_csnlogging = cfg->csnlogging = LDAP_ON;
- cfg->errorlog_logging_enabled = LDAP_ON;
- cfg->errorlog_mode = slapi_ch_strdup("600");
+ init_errorlog_logging_enabled = cfg->errorlog_logging_enabled = LDAP_ON;
+ cfg->errorlog_mode = slapi_ch_strdup(INIT_ERRORLOG_MODE);
cfg->errorlog_maxnumlogs = 1;
cfg->errorlog_maxlogsize = 100;
cfg->errorlog_rotationtime = 1;
- cfg->errorlog_rotationunit = slapi_ch_strdup ("week");
- cfg->errorlog_rotationsync_enabled = LDAP_OFF;
+ cfg->errorlog_rotationunit = slapi_ch_strdup (INIT_ERRORLOG_ROTATIONUNIT);
+ init_errorlog_rotationsync_enabled =
+ cfg->errorlog_rotationsync_enabled = LDAP_OFF;
cfg->errorlog_rotationsynchour = 0;
cfg->errorlog_rotationsyncmin = 0;
cfg->errorlog_maxdiskspace = 100;
cfg->errorlog_minfreespace = 5;
cfg->errorlog_exptime = 1;
- cfg->errorlog_exptimeunit = slapi_ch_strdup("month");
+ cfg->errorlog_exptimeunit = slapi_ch_strdup(INIT_ERRORLOG_EXPTIMEUNIT);
cfg->errorloglevel = 0;
- cfg->auditlog_logging_enabled = LDAP_OFF;
- cfg->auditlog_mode = slapi_ch_strdup("600");
+ init_auditlog_logging_enabled = cfg->auditlog_logging_enabled = LDAP_OFF;
+ cfg->auditlog_mode = slapi_ch_strdup(INIT_AUDITLOG_MODE);
cfg->auditlog_maxnumlogs = 1;
cfg->auditlog_maxlogsize = 100;
cfg->auditlog_rotationtime = 1;
- cfg->auditlog_rotationunit = slapi_ch_strdup ("week");
- cfg->auditlog_rotationsync_enabled = LDAP_OFF;
+ cfg->auditlog_rotationunit = slapi_ch_strdup(INIT_AUDITLOG_ROTATIONUNIT);
+ init_auditlog_rotationsync_enabled =
+ cfg->auditlog_rotationsync_enabled = LDAP_OFF;
cfg->auditlog_rotationsynchour = 0;
cfg->auditlog_rotationsyncmin = 0;
cfg->auditlog_maxdiskspace = 100;
cfg->auditlog_minfreespace = 5;
cfg->auditlog_exptime = 1;
- cfg->auditlog_exptimeunit = slapi_ch_strdup("month");
- cfg->auditlog_logging_hide_unhashed_pw = LDAP_ON;
+ cfg->auditlog_exptimeunit = slapi_ch_strdup(INIT_AUDITLOG_EXPTIMEUNIT);
+ init_auditlog_logging_hide_unhashed_pw =
+ cfg->auditlog_logging_hide_unhashed_pw = LDAP_ON;
- cfg->entryusn_global = LDAP_OFF;
- cfg->entryusn_import_init = slapi_ch_strdup("0");
+ init_entryusn_global = cfg->entryusn_global = LDAP_OFF;
+ cfg->entryusn_import_init = slapi_ch_strdup(ENTRYUSN_IMPORT_INIT);
cfg->allowed_to_delete_attrs = slapi_ch_strdup("nsslapd-listenhost nsslapd-securelistenhost nsslapd-defaultnamingcontext");
cfg->default_naming_context = NULL; /* store normalized dn */
- cfg->disk_monitoring = LDAP_OFF;
+ init_disk_monitoring = cfg->disk_monitoring = LDAP_OFF;
cfg->disk_threshold = 2097152; /* 2 mb */
cfg->disk_grace_period = 60; /* 1 hour */
- cfg->disk_preserve_logging = LDAP_OFF;
- cfg->disk_logging_critical = LDAP_OFF;
- cfg->ndn_cache_enabled = LDAP_OFF;
+ init_disk_preserve_logging = cfg->disk_preserve_logging = LDAP_OFF;
+ init_disk_logging_critical = cfg->disk_logging_critical = LDAP_OFF;
+ init_ndn_cache_enabled = cfg->ndn_cache_enabled = LDAP_OFF;
cfg->ndn_cache_max_size = NDN_DEFAULT_SIZE;
#ifdef MEMPOOL_EXPERIMENTAL
- cfg->mempool_switch = LDAP_ON;
+ init_mempool_switch = cfg->mempool_switch = LDAP_ON;
cfg->mempool_maxfreelist = 1024;
cfg->system_page_size = sysconf(_SC_PAGE_SIZE); /* not to get every time; no set, get only */
{
@@ -1219,8 +1536,8 @@ config_value_is_null( const char *attrname, const char *value, char *errorbuf,
int or_zero_length )
{
if ( NULL == value || ( or_zero_length && *value == '\0' )) {
- PR_snprintf( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: NULL value",
- attrname );
+ PR_snprintf( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE,
+ "%s: deleting the value is not allowed.", attrname );
return 1;
}
@@ -2721,7 +3038,6 @@ config_set_security( const char *attrname, char *value, char *errorbuf, int appl
return retVal;
}
-
static int
config_set_onoff ( const char *attrname, char *value, int *configvalue,
char *errorbuf, int apply )
@@ -2734,7 +3050,10 @@ config_set_onoff ( const char *attrname, char *value, int *configvalue,
}
if ( strcasecmp ( value, "on" ) != 0 &&
- strcasecmp ( value, "off") != 0 ) {
+ strcasecmp ( value, "off") != 0 &&
+ /* initializing the value */
+ (*(int *)value != LDAP_ON) &&
+ (*(int *)value != LDAP_OFF)) {
PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE,
"%s: invalid value \"%s\". Valid values are \"on\" or \"off\".",
attrname, value );
@@ -2750,9 +3069,10 @@ config_set_onoff ( const char *attrname, char *value, int *configvalue,
if ( strcasecmp ( value, "on" ) == 0 ) {
*configvalue = LDAP_ON;
- }
- else if ( strcasecmp ( value, "off" ) == 0 ) {
+ } else if ( strcasecmp ( value, "off" ) == 0 ) {
*configvalue = LDAP_OFF;
+ } else {
+ *configvalue = *(int *)value;
}
CFG_UNLOCK_WRITE(slapdFrontendConfig);
@@ -3691,7 +4011,8 @@ config_set_errorlog_level( const char *attrname, char *value, char *errorbuf, in
int
-config_set_accesslog_level( const char *attrname, char *value, char *errorbuf, int apply ) {
+config_set_accesslog_level( const char *attrname, char *value, char *errorbuf, int apply )
+{
int retVal = LDAP_SUCCESS;
long level = 0;
char *endp = NULL;
@@ -4805,7 +5126,7 @@ config_get_accesslog(){
}
char *
-config_get_errorlog( ){
+config_get_errorlog(){
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
char *retVal;
@@ -6284,10 +6605,10 @@ config_set(const char *attr, struct berval **values, char *errorbuf, int apply)
if ((NULL == values) &&
config_allowed_to_delete_attrs(cgas->attr_name)) {
if (cgas->setfunc) {
- retval = (cgas->setfunc)(cgas->attr_name, NULL,
+ retval = (cgas->setfunc)(cgas->attr_name, cgas->initvalue,
errorbuf, apply);
} else if (cgas->logsetfunc) {
- retval = (cgas->logsetfunc)(cgas->attr_name, NULL,
+ retval = (cgas->logsetfunc)(cgas->attr_name, cgas->initvalue,
cgas->whichlog, errorbuf, apply);
} else {
LDAPDebug1Arg(LDAP_DEBUG_ANY,
1
0
ldap/servers/plugins/replication/windows_connection.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 98b809ba580530d9418e7bbf857e1ff2b79f75c8
Author: Nathan Kinder <nkinder(a)redhat.com>
Date: Tue Nov 6 07:58:58 2012 -0800
Ticket #503 - Improve AD version in winsync log message
When enabling replication level logging, winsync prints out what
version of Windows/AD it detects. If it detects win2k3 or later, it
prints out "detected win2k3 peer". This can be confusing if you are
running a later version, such as win2k8. The code is really trying
to detect if we can use certain operations that only started being
supported in win2k3. This patch changes the message to match this
logic by printing "detected win2k3 or later peer".
diff --git a/ldap/servers/plugins/replication/windows_connection.c b/ldap/servers/plugins/replication/windows_connection.c
index 0393627..105c205 100644
--- a/ldap/servers/plugins/replication/windows_connection.c
+++ b/ldap/servers/plugins/replication/windows_connection.c
@@ -1333,7 +1333,7 @@ windows_conn_connect(Repl_Connection *conn)
if (CONN_IS_WIN2K3 == supports)
{
windows_private_set_iswin2k3(conn->agmt,1);
- LDAPDebug( LDAP_DEBUG_REPL, "windows_conn_connect : detected Win2k3 peer\n", 0, 0, 0 );
+ LDAPDebug( LDAP_DEBUG_REPL, "windows_conn_connect : detected Win2k3 or later peer\n", 0, 0, 0 );
} else
{
windows_private_set_iswin2k3(conn->agmt,0);
1
0
ldap/servers/plugins/replication/windows_connection.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e3357b44187acf3f43ad52a62c78911bea620b88
Author: Nathan Kinder <nkinder(a)redhat.com>
Date: Tue Nov 6 07:58:58 2012 -0800
Ticket #503 - Improve AD version in winsync log message
When enabling replication level logging, winsync prints out what
version of Windows/AD it detects. If it detects win2k3 or later, it
prints out "detected win2k3 peer". This can be confusing if you are
running a later version, such as win2k8. The code is really trying
to detect if we can use certain operations that only started being
supported in win2k3. This patch changes the message to match this
logic by printing "detected win2k3 or later peer".
diff --git a/ldap/servers/plugins/replication/windows_connection.c b/ldap/servers/plugins/replication/windows_connection.c
index 0393627..105c205 100644
--- a/ldap/servers/plugins/replication/windows_connection.c
+++ b/ldap/servers/plugins/replication/windows_connection.c
@@ -1333,7 +1333,7 @@ windows_conn_connect(Repl_Connection *conn)
if (CONN_IS_WIN2K3 == supports)
{
windows_private_set_iswin2k3(conn->agmt,1);
- LDAPDebug( LDAP_DEBUG_REPL, "windows_conn_connect : detected Win2k3 peer\n", 0, 0, 0 );
+ LDAPDebug( LDAP_DEBUG_REPL, "windows_conn_connect : detected Win2k3 or later peer\n", 0, 0, 0 );
} else
{
windows_private_set_iswin2k3(conn->agmt,0);
1
0
ldap/servers/slapd/ldaputil.c | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
New commits:
commit 996034bc98d0f2ef33bdf70ae226fd4410b88075
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Nov 2 16:43:48 2012 -0700
Trac Ticket #190 - Un-resolvable server in replication
agreement produces unclear error message
https://fedorahosted.org/389/ticket/190
Fix description: This patch retrieves more info such as hostname
and error code from getaddrinfo in case ldap_sasl_bind does not
return any useful information about the failure. E.g.,
Error: could not send bind request for id [(anon)] mech [EXTERNAL]:
error -1 (Can't contact LDAP server)
-5987 (Invalid function argument.)
-2 (Name or service not known "your_host_name")
Error: could not send bind request for id [<binddn>] mech [SIMPLE]:
error -1 (Can't contact LDAP server)
-5987 (Invalid function argument.)
107 (Transport endpoint is not connected "your_host_name")
diff --git a/ldap/servers/slapd/ldaputil.c b/ldap/servers/slapd/ldaputil.c
index 7d77644..1c67e51 100644
--- a/ldap/servers/slapd/ldaputil.c
+++ b/ldap/servers/slapd/ldaputil.c
@@ -1083,15 +1083,42 @@ slapi_ldap_bind(
mech ? mech : "SIMPLE",
bindid, creds);
if ((rc = ldap_sasl_bind(ld, bindid, mech, &bvcreds, serverctrls,
- NULL /* clientctrls */, &mymsgid))) {
+ NULL /* clientctrls */, &mymsgid))) {
+ char *myhostname = NULL;
+ char *copy = NULL;
+ char *ptr = NULL;
+ int myerrno = errno;
+ int gaierr;
+
+ ldap_get_option(ld, LDAP_OPT_HOST_NAME, &myhostname);
+ if (myhostname) {
+ ptr = strchr(myhostname, ':');
+ if (ptr) {
+ copy = slapi_ch_strdup(myhostname);
+ *(copy + (ptr - myhostname)) = '\0';
+ myhostname = copy;
+ }
+ }
+
+ if (0 == myerrno) {
+ struct addrinfo *result = NULL;
+ gaierr = getaddrinfo(myhostname, NULL, NULL, &result);
+ myerrno = errno;
+ if (result) {
+ freeaddrinfo(result);
+ }
+ }
slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_bind",
"Error: could not send bind request for id "
- "[%s] mech [%s]: error %d (%s) %d (%s) %d (%s)\n",
+ "[%s] mech [%s]: error %d (%s) %d (%s) %d (%s \"%s\")\n",
bindid ? bindid : "(anon)",
mech ? mech : "SIMPLE",
rc, ldap_err2string(rc),
PR_GetError(), slapd_pr_strerror(PR_GetError()),
- errno, slapd_system_strerror(errno));
+ myerrno ? myerrno : gaierr,
+ myerrno ? slapd_system_strerror(myerrno) : gai_strerror(gaierr),
+ myhostname ? myhostname : "unknown host");
+ slapi_ch_free_string(©);
goto done;
}
1
0
ldap/servers/slapd/back-ldbm/ldbm_add.c | 74 ++++++++++++++--------------
ldap/servers/slapd/back-ldbm/ldbm_compare.c | 6 +-
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 20 +++----
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 24 ++++-----
ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 26 ++++-----
ldap/servers/slapd/back-ldbm/ldbm_search.c | 9 +--
6 files changed, 82 insertions(+), 77 deletions(-)
New commits:
commit e229bb45b418371d83af302f3d24f881ca32bd41
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Fri Nov 2 14:36:38 2012 -0700
Coverity fixes
13107,13108: Explicit null deferenced
Bug description: "Explicit null dereferenced" error was introduced
by commit 7f81635990fa340e2db5c1b14a8d1ba10fa53887
Trac Ticket #391 - Slapd crashes when deleting backends
while operations are still in progress
Fix description: Added codes to check if the inst variable is NULL
or not. If NULL, skip accessing the instance variable and return
an error.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c b/ldap/servers/slapd/back-ldbm/ldbm_add.c
index cf2676e..1fd2240 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_add.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c
@@ -78,7 +78,7 @@ ldbm_back_add( Slapi_PBlock *pb )
{
backend *be;
struct ldbminfo *li;
- ldbm_instance *inst;
+ ldbm_instance *inst = NULL;
const char *dn = NULL;
Slapi_Entry *e = NULL;
struct backentry *tombstoneentry = NULL;
@@ -102,7 +102,7 @@ ldbm_back_add( Slapi_PBlock *pb )
modify_context ruv_c = {0};
int parent_found = 0;
int ruv_c_init = 0;
- int rc;
+ int rc = 0;
int addingentry_id_assigned= 0;
int addingentry_in_cache= 0;
int tombstone_in_cache= 0;
@@ -132,12 +132,12 @@ ldbm_back_add( Slapi_PBlock *pb )
is_ruv = operation_is_flag_set(operation, OP_FLAG_REPL_RUV);
inst = (ldbm_instance *) be->be_instance_info;
- if (inst->inst_ref_count) {
+ if (inst && inst->inst_ref_count) {
slapi_counter_increment(inst->inst_ref_count);
} else {
LDAPDebug1Arg(LDAP_DEBUG_ANY,
- "ldbm_add: instance %s does not exist.\n",
- inst->inst_name);
+ "ldbm_add: instance \"%s\" does not exist.\n",
+ inst ? inst->inst_name : "null instance");
goto error_return;
}
@@ -1060,13 +1060,15 @@ error_return:
{
if ( addingentry_in_cache )
{
- CACHE_REMOVE(&inst->inst_cache, addingentry);
+ if (inst) {
+ CACHE_REMOVE(&inst->inst_cache, addingentry);
+ }
addingentry_in_cache = 0;
}
backentry_clear_entry(addingentry); /* e is released in the frontend */
backentry_free( &addingentry ); /* release the backend wrapper, here */
}
- if(tombstone_in_cache)
+ if(tombstone_in_cache && inst)
{
CACHE_RETURN(&inst->inst_cache, &tombstoneentry);
}
@@ -1075,8 +1077,9 @@ error_return:
dblayer_remember_disk_filled(li);
ldbm_nasty("Add",80,rc);
disk_full = 1;
+ } else if (0 == rc) {
+ rc = SLAPI_FAIL_GENERAL;
}
-
diskfull_return:
if (disk_full) {
rc= return_on_disk_full(li);
@@ -1121,33 +1124,34 @@ diskfull_return:
}
common_return:
- if (addingentry_in_cache && addingentry)
- {
- if (entryrdn_get_switch()) { /* subtree-rename: on */
- /* since adding the entry to the entry cache was successful,
- * let's add the dn to dncache, if not yet done. */
- struct backdn *bdn = dncache_find_id(&inst->inst_dncache,
- addingentry->ep_id);
- if (bdn) { /* already in the dncache */
- CACHE_RETURN(&inst->inst_dncache, &bdn);
- } else { /* not in the dncache yet */
- Slapi_DN *addingsdn =
- slapi_sdn_dup(slapi_entry_get_sdn(addingentry->ep_entry));
- if (addingsdn) {
- bdn = backdn_init(addingsdn, addingentry->ep_id, 0);
- if (bdn) {
- CACHE_ADD( &inst->inst_dncache, bdn, NULL );
- CACHE_RETURN(&inst->inst_dncache, &bdn);
- slapi_log_error(SLAPI_LOG_CACHE, "ldbm_back_add",
- "set %s to dn cache\n", dn);
- }
- }
- }
- }
- CACHE_RETURN( &inst->inst_cache, &addingentry );
- }
- if (inst->inst_ref_count) {
- slapi_counter_decrement(inst->inst_ref_count);
+ if (inst) {
+ if (addingentry_in_cache && addingentry) {
+ if (entryrdn_get_switch()) { /* subtree-rename: on */
+ /* since adding the entry to the entry cache was successful,
+ * let's add the dn to dncache, if not yet done. */
+ struct backdn *bdn = dncache_find_id(&inst->inst_dncache,
+ addingentry->ep_id);
+ if (bdn) { /* already in the dncache */
+ CACHE_RETURN(&inst->inst_dncache, &bdn);
+ } else { /* not in the dncache yet */
+ Slapi_DN *addingsdn =
+ slapi_sdn_dup(slapi_entry_get_sdn(addingentry->ep_entry));
+ if (addingsdn) {
+ bdn = backdn_init(addingsdn, addingentry->ep_id, 0);
+ if (bdn) {
+ CACHE_ADD( &inst->inst_dncache, bdn, NULL );
+ CACHE_RETURN(&inst->inst_dncache, &bdn);
+ slapi_log_error(SLAPI_LOG_CACHE, "ldbm_back_add",
+ "set %s to dn cache\n", dn);
+ }
+ }
+ }
+ }
+ CACHE_RETURN( &inst->inst_cache, &addingentry );
+ }
+ if (inst->inst_ref_count) {
+ slapi_counter_decrement(inst->inst_ref_count);
+ }
}
/* bepost op needs to know this result */
slapi_pblock_set(pb, SLAPI_RESULT_CODE, &ldap_result_code);
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_compare.c b/ldap/servers/slapd/back-ldbm/ldbm_compare.c
index e201ca6..12b6aa5 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_compare.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_compare.c
@@ -74,12 +74,12 @@ ldbm_back_compare( Slapi_PBlock *pb )
}
inst = (ldbm_instance *) be->be_instance_info;
- if (inst->inst_ref_count) {
+ if (inst && inst->inst_ref_count) {
slapi_counter_increment(inst->inst_ref_count);
} else {
LDAPDebug1Arg(LDAP_DEBUG_ANY,
- "ldbm_compare: instance %s does not exist.\n",
- inst->inst_name);
+ "ldbm_compare: instance \"%s\" does not exist.\n",
+ inst ? inst->inst_name : "null instance");
return -1;
}
/* get the namespace dn */
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
index 5661bfa..683d324 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
@@ -146,12 +146,12 @@ ldbm_back_delete( Slapi_PBlock *pb )
delete_tombstone_entry = operation_is_flag_set(operation, OP_FLAG_TOMBSTONE_ENTRY);
inst = (ldbm_instance *) be->be_instance_info;
- if (inst->inst_ref_count) {
+ if (inst && inst->inst_ref_count) {
slapi_counter_increment(inst->inst_ref_count);
} else {
LDAPDebug1Arg(LDAP_DEBUG_ANY,
- "ldbm_delete: instance %s does not exist.\n",
- inst->inst_name);
+ "ldbm_delete: instance \"%s\" does not exist.\n",
+ inst ? inst->inst_name : "null instance");
goto error_return;
}
@@ -1116,7 +1116,7 @@ ldbm_back_delete( Slapi_PBlock *pb )
goto common_return;
error_return:
- if (tombstone_in_cache)
+ if (inst && tombstone_in_cache)
{
CACHE_REMOVE( &inst->inst_cache, tombstone );
CACHE_RETURN( &inst->inst_cache, &tombstone );
@@ -1186,7 +1186,7 @@ common_return:
for the post op plugins */
slapi_pblock_set( pb, SLAPI_DELETE_BEPREOP_ENTRY, orig_entry );
}
- if (tombstone_in_cache)
+ if (inst && tombstone_in_cache)
{
CACHE_RETURN( &inst->inst_cache, &tombstone );
tombstone = NULL;
@@ -1208,14 +1208,14 @@ common_return:
}
/* Need to return to cache after post op plugins are called */
- if (retval) { /* error case */
- if (e) {
+ if (inst) {
+ if (retval && e) { /* error case */
cache_unlock_entry( &inst->inst_cache, e );
CACHE_RETURN( &inst->inst_cache, &e );
}
- }
- if (inst->inst_ref_count) {
- slapi_counter_decrement(inst->inst_ref_count);
+ if (inst->inst_ref_count) {
+ slapi_counter_decrement(inst->inst_ref_count);
+ }
}
if (ruv_c_init) {
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
index 9cb872a..0db1f87 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
@@ -368,12 +368,12 @@ ldbm_back_modify( Slapi_PBlock *pb )
{
goto error_return;
}
- if (inst->inst_ref_count) {
+ if (inst && inst->inst_ref_count) {
slapi_counter_increment(inst->inst_ref_count);
} else {
LDAPDebug1Arg(LDAP_DEBUG_ANY,
- "ldbm_modify: instance %s does not exist.\n",
- inst->inst_name);
+ "ldbm_modify: instance \"%s\" does not exist.\n",
+ inst ? inst->inst_name : "null instance");
goto error_return;
}
@@ -795,7 +795,7 @@ error_return:
}
/* if ec is in cache, remove it, then add back e if we still have it */
- if (ec_in_cache) {
+ if (inst && ec_in_cache) {
CACHE_REMOVE( &inst->inst_cache, ec );
/* if ec was in cache, e was not - add back e */
if (e) {
@@ -807,7 +807,7 @@ error_return:
common_return:
slapi_mods_done(&smods);
- if (ec_in_cache)
+ if (inst && ec_in_cache)
{
cache_unlock_entry( &inst->inst_cache, ec);
CACHE_RETURN( &inst->inst_cache, &ec );
@@ -817,12 +817,14 @@ common_return:
backentry_free(&ec);
}
- if (e!=NULL) {
- cache_unlock_entry( &inst->inst_cache, e);
- CACHE_RETURN( &inst->inst_cache, &e);
- }
- if (inst->inst_ref_count) {
- slapi_counter_decrement(inst->inst_ref_count);
+ if (inst) {
+ if (e) {
+ cache_unlock_entry( &inst->inst_cache, e);
+ CACHE_RETURN( &inst->inst_cache, &e);
+ }
+ if (inst->inst_ref_count) {
+ slapi_counter_decrement(inst->inst_ref_count);
+ }
}
/* result code could be used in the bepost plugin functions. */
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
index ef73904..98b30dc 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
@@ -63,7 +63,7 @@ int
ldbm_back_modrdn( Slapi_PBlock *pb )
{
backend *be;
- ldbm_instance *inst;
+ ldbm_instance *inst = NULL;
struct ldbminfo *li;
struct backentry *e= NULL;
struct backentry *ec= NULL;
@@ -191,12 +191,12 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
return( -1 );
}
- if (inst->inst_ref_count) {
+ if (inst && inst->inst_ref_count) {
slapi_counter_increment(inst->inst_ref_count);
} else {
LDAPDebug1Arg(LDAP_DEBUG_ANY,
- "ldbm_modrdn: instance %s does not exist.\n",
- inst->inst_name);
+ "ldbm_modrdn: instance \"%s\" does not exist.\n",
+ inst ? inst->inst_name : "null instance");
return( -1 );
}
@@ -1177,7 +1177,7 @@ error_return:
/* make sure caller doesn't attempt to free this */
slapi_pblock_set( pb, SLAPI_ENTRY_POST_OP, postentry );
}
- if (e && entryrdn_get_switch())
+ if (e && entryrdn_get_switch() && inst)
{
struct backdn *bdn = dncache_find_id(&inst->inst_dncache, e->ep_id);
CACHE_REMOVE(&inst->inst_dncache, bdn);
@@ -1186,7 +1186,7 @@ error_return:
if(children)
{
int i = 0;
- if (child_entries && *child_entries)
+ if (child_entries && *child_entries && inst)
{
if (entryrdn_get_switch()) /* subtree-rename: on */
{
@@ -1208,7 +1208,7 @@ error_return:
}
}
}
- if (entryrdn_get_switch() && child_dns && *child_dns)
+ if (entryrdn_get_switch() && child_dns && *child_dns && inst)
{
for (i = 0; child_dns[i] != NULL; i++) {
CACHE_REMOVE( &inst->inst_dncache, child_dns[i] );
@@ -1282,10 +1282,10 @@ common_return:
if (ec) {
/* remove the new entry from the cache if the op failed -
otherwise, leave it in */
- if (ec_in_cache && retval) {
- CACHE_REMOVE( &inst->inst_cache, ec );
- }
- if (ec_in_cache) {
+ if (ec_in_cache && inst) {
+ if (retval) {
+ CACHE_REMOVE( &inst->inst_cache, ec );
+ }
CACHE_RETURN( &inst->inst_cache, &ec );
} else {
backentry_free( &ec );
@@ -1296,12 +1296,12 @@ common_return:
/* put e back in the cache if the modrdn failed */
if (e) {
- if (!e_in_cache && retval) {
+ if (!e_in_cache && retval && inst) {
CACHE_ADD(&inst->inst_cache, e, NULL);
e_in_cache = 1;
}
}
- if (inst->inst_ref_count) {
+ if (inst && inst->inst_ref_count) {
slapi_counter_decrement(inst->inst_ref_count);
}
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c
index 652424e..5f085f9 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_search.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c
@@ -363,19 +363,18 @@ ldbm_back_search( Slapi_PBlock *pb )
slapi_pblock_set( pb, SLAPI_TXN, txn.back_txn_txn );
}
- inst = (ldbm_instance *) be->be_instance_info;
-
if (NULL == basesdn) {
slapi_send_ldap_result( pb, LDAP_INVALID_DN_SYNTAX, NULL,
"Null target DN", 0, NULL );
return( -1 );
}
- if (inst->inst_ref_count) {
+ inst = (ldbm_instance *) be->be_instance_info;
+ if (inst && inst->inst_ref_count) {
slapi_counter_increment(inst->inst_ref_count);
} else {
LDAPDebug1Arg(LDAP_DEBUG_ANY,
- "ldbm_search: instance %s does not exist.\n",
- inst->inst_name);
+ "ldbm_search: instance \"%s\" does not exist.\n",
+ inst ? inst->inst_name : "null instance");
return( -1 );
}
base = slapi_sdn_get_dn(basesdn);
1
0
ldap/servers/slapd/back-ldbm/back-ldbm.h | 4 --
ldap/servers/slapd/back-ldbm/dblayer.c | 22 +++++++----
ldap/servers/slapd/back-ldbm/id2entry.c | 6 +++
ldap/servers/slapd/back-ldbm/import-merge.c | 4 +-
ldap/servers/slapd/back-ldbm/instance.c | 4 ++
ldap/servers/slapd/back-ldbm/ldbm_add.c | 18 +++++++--
ldap/servers/slapd/back-ldbm/ldbm_bind.c | 33 ++++++++++++----
ldap/servers/slapd/back-ldbm/ldbm_compare.c | 18 +++++++--
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 13 ++++++
ldap/servers/slapd/back-ldbm/ldbm_index_config.c | 8 +++-
ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 3 +
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 11 +++++
ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 12 ++++++
ldap/servers/slapd/back-ldbm/ldbm_search.c | 39 +++++++++++---------
ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 3 +
ldap/servers/slapd/back-ldbm/misc.c | 10 ++++-
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 3 +
ldap/servers/slapd/back-ldbm/vlv.c | 2 -
18 files changed, 163 insertions(+), 50 deletions(-)
New commits:
commit 7f81635990fa340e2db5c1b14a8d1ba10fa53887
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Fri Oct 26 12:09:18 2012 -0700
Trac Ticket #391 - Slapd crashes when deleting backends
while operations are still in progress
https://fedorahosted.org/389/ticket/391
Bug Description: Deleting backend code ldbm_instance_delete_instance_
entry_callback had no checking for the ordinary operations accessing
the backend instance. Even if some operations are still in progress,
the backend instance could be deleted and it crashes the server.
Fix Description: Backend struct ldbm_instance had a member inst_ref_
count, which was not used. This patch converts the type PRInt32 to
Slapi_Counter and increments it when the backend instance is in use.
The delete code checks the counter and if it is greater than 0, it
returns SLAPI_DSE_CALLBACK_ERROR.
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h
index fb45a9f..39fd950 100644
--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h
@@ -735,10 +735,8 @@ typedef struct ldbm_instance {
int inst_flags; /* see above */
PRLock *inst_config_mutex;
-
- PRInt32 *inst_ref_count; /* Keeps track of how many operations
+ Slapi_Counter *inst_ref_count; /* Keeps track of how many operations
* are currently using this instance */
-
char *inst_dir_name; /* The name of the directory in the db
* directory that holds the index files
* for this instance. Relative to the
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
index ed7d770..26007f4 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -3103,14 +3103,20 @@ out:
slapi_ch_free((void**)&rel_path);
/* close the database handle to avoid handle leak */
if (dbp && (return_value != 0)) {
- dblayer_close_file(dbp);
+ dblayer_close_file(&dbp);
}
return return_value;
}
-int dblayer_close_file(DB *db)
+int
+dblayer_close_file(DB **db)
{
- return db->close(db,0);
+ if (db) {
+ DB *dbp = *db;
+ *db = NULL; /* To avoid to leave stale DB, set NULL before closing. */
+ return dbp->close(dbp, 0);
+ }
+ return 1;
}
/*
@@ -3163,7 +3169,7 @@ int dblayer_get_index_file(backend *be, struct attrinfo *a, DB** ppDB, int open_
*/
PR_AtomicIncrement(&a->ai_dblayer_count);
- if (NULL != a->ai_dblayer) {
+ if (a->ai_dblayer && ((dblayer_handle*)(a->ai_dblayer))->dblayer_dbp) {
/* This means that the pointer is valid, so we should return it. */
*ppDB = ((dblayer_handle*)(a->ai_dblayer))->dblayer_dbp;
return 0;
@@ -3173,7 +3179,7 @@ int dblayer_get_index_file(backend *be, struct attrinfo *a, DB** ppDB, int open_
* again.
*/
PR_Lock(inst->inst_handle_list_mutex);
- if (NULL != a->ai_dblayer) {
+ if (a->ai_dblayer && ((dblayer_handle*)(a->ai_dblayer))->dblayer_dbp) {
/* another thread set the handle while we were waiting on the lock */
*ppDB = ((dblayer_handle*)(a->ai_dblayer))->dblayer_dbp;
PR_Unlock(inst->inst_handle_list_mutex);
@@ -3316,6 +3322,7 @@ int dblayer_erase_index_file_ex(backend *be, struct attrinfo *a,
if (0 == dblayer_get_index_file(be, a, &db, 0 /* Don't create an index file
if it does not exist. */)) {
+ if(use_lock) slapi_rwlock_wrlock(pEnv->dblayer_env_lock); /* We will be causing logging activity */
/* first, remove the file handle for this index, if we have it open */
PR_Lock(inst->inst_handle_list_mutex);
if (a->ai_dblayer) {
@@ -3340,7 +3347,7 @@ int dblayer_erase_index_file_ex(backend *be, struct attrinfo *a,
DS_Sleep(DBLAYER_CACHE_DELAY);
PR_Lock(inst->inst_handle_list_mutex);
}
- dblayer_close_file(handle->dblayer_dbp);
+ dblayer_close_file(&(handle->dblayer_dbp));
/* remove handle from handle-list */
if (inst->inst_handle_head == handle) {
@@ -3372,7 +3379,7 @@ int dblayer_erase_index_file_ex(backend *be, struct attrinfo *a,
p = dbNamep + dbbasenamelen;
sprintf(p, "%c%s%s",
get_sep(dbNamep), a->ai_type, LDBM_FILENAME_SUFFIX);
- rc = dblayer_db_remove_ex(pEnv, dbNamep, 0, use_lock);
+ rc = dblayer_db_remove_ex(pEnv, dbNamep, 0, 0);
a->ai_dblayer = NULL;
if (dbNamep != dbName)
slapi_ch_free_string(&dbNamep);
@@ -3386,6 +3393,7 @@ int dblayer_erase_index_file_ex(backend *be, struct attrinfo *a,
/* no handle to close */
}
PR_Unlock(inst->inst_handle_list_mutex);
+ if(use_lock) slapi_rwlock_unlock(pEnv->dblayer_env_lock);
}
diff --git a/ldap/servers/slapd/back-ldbm/id2entry.c b/ldap/servers/slapd/back-ldbm/id2entry.c
index e278a2a..4d9c111 100644
--- a/ldap/servers/slapd/back-ldbm/id2entry.c
+++ b/ldap/servers/slapd/back-ldbm/id2entry.c
@@ -382,6 +382,12 @@ id2entry( backend *be, ID id, back_txn *txn, int *err )
"(rdn=%s, ID=%d)\n", rdn, id);
/* Try rdn as dn. Could be RUV. */
normdn = slapi_ch_strdup(rdn);
+ } else if (NULL == normdn) {
+ slapi_log_error(SLAPI_LOG_FATAL, ID2ENTRY,
+ "<= id2entry( %lu ) entryrdn_lookup_dn returned NULL. "
+ "Index file may be deleted or corrupted.\n",
+ (u_long)id);
+ goto bail;
}
sdn = slapi_sdn_new_normdn_byval((const char *)normdn);
bdn = backdn_init(sdn, id, 0);
diff --git a/ldap/servers/slapd/back-ldbm/import-merge.c b/ldap/servers/slapd/back-ldbm/import-merge.c
index 9d7af3e..d5be665 100644
--- a/ldap/servers/slapd/back-ldbm/import-merge.c
+++ b/ldap/servers/slapd/back-ldbm/import-merge.c
@@ -593,7 +593,7 @@ static int import_merge_one_file(ImportWorkerInfo *worker, int passes,
}
preclose_ret = ret;
/* Now close the files */
- dblayer_close_file(output_file);
+ dblayer_close_file(&output_file);
/* Close the cursors */
/* Close and delete the files */
for (i = 0; i < passes; i++) {
@@ -605,7 +605,7 @@ static int import_merge_one_file(ImportWorkerInfo *worker, int passes,
if (0 != ret) {
import_log_notice(worker->job, "MERGE FAIL 4");
}
- ret = dblayer_close_file(db);
+ ret = dblayer_close_file(&db);
if (0 != ret) {
import_log_notice(worker->job, "MERGE FAIL 5");
}
diff --git a/ldap/servers/slapd/back-ldbm/instance.c b/ldap/servers/slapd/back-ldbm/instance.c
index 6aa8212..e172279 100644
--- a/ldap/servers/slapd/back-ldbm/instance.c
+++ b/ldap/servers/slapd/back-ldbm/instance.c
@@ -123,6 +123,9 @@ int ldbm_instance_create(backend *be, char *name)
goto error;
}
+ /* Keeps track of how many operations are currently using this instance */
+ inst->inst_ref_count = slapi_counter_new();
+
inst->inst_be = be;
inst->inst_li = li;
be->be_instance_info = inst;
@@ -411,6 +414,7 @@ ldbm_instance_destructor(void **arg)
LDAPDebug(LDAP_DEBUG_ANY, "Destructor for instance %s called\n",
inst->inst_name, 0, 0);
+ slapi_counter_destroy(&(inst->inst_ref_count));
slapi_ch_free_string(&inst->inst_name);
PR_DestroyLock(inst->inst_config_mutex);
slapi_ch_free_string(&inst->inst_dir_name);
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c b/ldap/servers/slapd/back-ldbm/ldbm_add.c
index b8989fc..cf2676e 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_add.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c
@@ -132,7 +132,15 @@ ldbm_back_add( Slapi_PBlock *pb )
is_ruv = operation_is_flag_set(operation, OP_FLAG_REPL_RUV);
inst = (ldbm_instance *) be->be_instance_info;
-
+ if (inst->inst_ref_count) {
+ slapi_counter_increment(inst->inst_ref_count);
+ } else {
+ LDAPDebug1Arg(LDAP_DEBUG_ANY,
+ "ldbm_add: instance %s does not exist.\n",
+ inst->inst_name);
+ goto error_return;
+ }
+
/* sdn & parentsdn need to be initialized before "goto *_return" */
slapi_sdn_init(&parentsdn);
@@ -878,8 +886,9 @@ ldbm_back_add( Slapi_PBlock *pb )
continue;
}
if (retval != 0) {
- LDAPDebug( LDAP_DEBUG_ANY, "add: attempt to index %lu failed\n",
- (u_long)addingentry->ep_id, 0, 0 );
+ LDAPDebug2Args(LDAP_DEBUG_ANY,
+ "add: attempt to index %lu failed (rc=%d)\n",
+ (u_long)addingentry->ep_id, retval);
ADD_SET_ERROR(ldap_result_code, LDAP_OPERATIONS_ERROR, retry_count);
if (LDBM_OS_ERR_IS_DISKFULL(retval)) {
disk_full = 1;
@@ -1137,6 +1146,9 @@ common_return:
}
CACHE_RETURN( &inst->inst_cache, &addingentry );
}
+ if (inst->inst_ref_count) {
+ slapi_counter_decrement(inst->inst_ref_count);
+ }
/* bepost op needs to know this result */
slapi_pblock_set(pb, SLAPI_RESULT_CODE, &ldap_result_code);
/* JCMREPL - The bepostop is called even if the operation fails. */
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_bind.c b/ldap/servers/slapd/back-ldbm/ldbm_bind.c
index 24c0b4f..f1dad38 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_bind.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_bind.c
@@ -50,7 +50,7 @@ typedef enum LDAPWAEnum {
LDAPWA_NoDomainAttr = -3,
LDAPWA_InvalidCredentials = -2,
LDAPWA_Failure = -1,
- LDAPWA_Success= 0
+ LDAPWA_Success= 0
} LDAPWAStatus;
int
@@ -211,6 +211,7 @@ ldbm_back_bind( Slapi_PBlock *pb )
Slapi_Value **bvals;
entry_address *addr;
back_txn txn = {NULL};
+ int rc = SLAPI_BIND_SUCCESS;
/* get parameters */
slapi_pblock_get( pb, SLAPI_BACKEND, &be );
@@ -226,10 +227,19 @@ ldbm_back_bind( Slapi_PBlock *pb )
}
inst = (ldbm_instance *) be->be_instance_info;
+ if (inst->inst_ref_count) {
+ slapi_counter_increment(inst->inst_ref_count);
+ } else {
+ LDAPDebug1Arg(LDAP_DEBUG_ANY,
+ "ldbm_bind: instance %s does not exist.\n",
+ inst->inst_name);
+ return( SLAPI_BIND_FAIL );
+ }
/* always allow noauth simple binds (front end will send the result) */
if ( method == LDAP_AUTH_SIMPLE && cred->bv_len == 0 ) {
- return( SLAPI_BIND_ANONYMOUS );
+ rc = SLAPI_BIND_ANONYMOUS;
+ goto bail;
}
/*
@@ -237,7 +247,8 @@ ldbm_back_bind( Slapi_PBlock *pb )
* and sending errors if the entry does not exist.
*/
if (( e = find_entry( pb, be, addr, &txn )) == NULL ) {
- return( SLAPI_BIND_FAIL );
+ rc = SLAPI_BIND_FAIL;
+ goto bail;
}
switch ( method ) {
@@ -253,7 +264,8 @@ ldbm_back_bind( Slapi_PBlock *pb )
slapi_send_ldap_result( pb, LDAP_INAPPROPRIATE_AUTH, NULL,
NULL, 0, NULL );
CACHE_RETURN( &inst->inst_cache, &e );
- return( SLAPI_BIND_FAIL );
+ rc = SLAPI_BIND_FAIL;
+ goto bail;
}
bvals= attr_get_present_values(attr);
slapi_value_init_berval(&cv,cred);
@@ -269,7 +281,8 @@ ldbm_back_bind( Slapi_PBlock *pb )
NULL, 0, NULL );
CACHE_RETURN( &inst->inst_cache, &e );
value_done(&cv);
- return( SLAPI_BIND_FAIL );
+ rc = SLAPI_BIND_FAIL;
+ goto bail;
}
value_done(&cv);
}
@@ -279,11 +292,15 @@ ldbm_back_bind( Slapi_PBlock *pb )
slapi_send_ldap_result( pb, LDAP_STRONG_AUTH_NOT_SUPPORTED, NULL,
"auth method not supported", 0, NULL );
CACHE_RETURN( &inst->inst_cache, &e );
- return( SLAPI_BIND_FAIL );
+ rc = SLAPI_BIND_FAIL;
+ goto bail;
}
CACHE_RETURN( &inst->inst_cache, &e );
-
+bail:
+ if (inst->inst_ref_count) {
+ slapi_counter_decrement(inst->inst_ref_count);
+ }
/* success: front end will send result */
- return( SLAPI_BIND_SUCCESS );
+ return rc;
}
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_compare.c b/ldap/servers/slapd/back-ldbm/ldbm_compare.c
index e9761ec..e201ca6 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_compare.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_compare.c
@@ -61,7 +61,6 @@ ldbm_back_compare( Slapi_PBlock *pb )
Slapi_DN *namespace_dn;
back_txn txn = {NULL};
-
slapi_pblock_get( pb, SLAPI_BACKEND, &be );
slapi_pblock_get( pb, SLAPI_PLUGIN_PRIVATE, &li );
slapi_pblock_get( pb, SLAPI_TARGET_ADDRESS, &addr);
@@ -75,16 +74,25 @@ ldbm_back_compare( Slapi_PBlock *pb )
}
inst = (ldbm_instance *) be->be_instance_info;
+ if (inst->inst_ref_count) {
+ slapi_counter_increment(inst->inst_ref_count);
+ } else {
+ LDAPDebug1Arg(LDAP_DEBUG_ANY,
+ "ldbm_compare: instance %s does not exist.\n",
+ inst->inst_name);
+ return -1;
+ }
/* get the namespace dn */
namespace_dn = (Slapi_DN*)slapi_be_getsuffix(be, 0);
if ( (e = find_entry( pb, be, addr, &txn )) == NULL ) {
- return( -1 ); /* error result sent by find_entry() */
+ ret = -1; /* error result sent by find_entry() */
+ goto bail;
}
err = slapi_access_allowed (pb, e->ep_entry, type, bval, SLAPI_ACL_COMPARE);
if ( err != LDAP_SUCCESS ) {
- slapi_send_ldap_result( pb, err, NULL, NULL, 0, NULL );
+ slapi_send_ldap_result( pb, err, NULL, NULL, 0, NULL );
ret = 1;
} else {
@@ -117,5 +125,9 @@ ldbm_back_compare( Slapi_PBlock *pb )
}
CACHE_RETURN( &inst->inst_cache, &e );
+bail:
+ if (inst->inst_ref_count) {
+ slapi_counter_decrement(inst->inst_ref_count);
+ }
return( ret );
}
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
index 57cc3b7..5661bfa 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
@@ -146,6 +146,14 @@ ldbm_back_delete( Slapi_PBlock *pb )
delete_tombstone_entry = operation_is_flag_set(operation, OP_FLAG_TOMBSTONE_ENTRY);
inst = (ldbm_instance *) be->be_instance_info;
+ if (inst->inst_ref_count) {
+ slapi_counter_increment(inst->inst_ref_count);
+ } else {
+ LDAPDebug1Arg(LDAP_DEBUG_ANY,
+ "ldbm_delete: instance %s does not exist.\n",
+ inst->inst_name);
+ goto error_return;
+ }
/* The dblock serializes writes to the database,
* which reduces deadlocking in the db code,
@@ -1206,6 +1214,9 @@ common_return:
CACHE_RETURN( &inst->inst_cache, &e );
}
}
+ if (inst->inst_ref_count) {
+ slapi_counter_decrement(inst->inst_ref_count);
+ }
if (ruv_c_init) {
modify_term(&ruv_c, be);
@@ -1214,7 +1225,7 @@ common_return:
diskfull_return:
if(ldap_result_code!=-1)
{
- slapi_send_ldap_result( pb, ldap_result_code, NULL, ldap_result_message, 0, NULL );
+ slapi_send_ldap_result( pb, ldap_result_code, NULL, ldap_result_message, 0, NULL );
}
modify_term(&parent_modify_c,be);
if (rc == 0 && opcsn && !is_fixup_operation && !delete_tombstone_entry)
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_index_config.c b/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
index 2775785..e2bec79 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
@@ -167,6 +167,13 @@ ldbm_instance_index_config_delete_callback(Slapi_PBlock *pb, Slapi_Entry* e, Sla
returntext[0] = '\0';
*returncode = LDAP_SUCCESS;
+
+ if (slapi_counter_get_value(inst->inst_ref_count) > 0) {
+ *returncode = LDAP_UNAVAILABLE;
+ rc = SLAPI_DSE_CALLBACK_ERROR;
+ }
+
+ *returncode = LDAP_SUCCESS;
slapi_entry_attr_find(e, "cn", &attr);
slapi_attr_first_value(attr, &sval);
@@ -184,7 +191,6 @@ ldbm_instance_index_config_delete_callback(Slapi_PBlock *pb, Slapi_Entry* e, Sla
rc = SLAPI_DSE_CALLBACK_ERROR;
}
}
-
return rc;
}
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
index f41bd88..34d9bf5 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
@@ -1194,7 +1194,8 @@ ldbm_instance_delete_instance_entry_callback(Slapi_PBlock *pb, Slapi_Entry* entr
}
/* check if some online task is happening */
- if (instance_set_busy(inst) != 0) {
+ if ((instance_set_busy(inst) != 0) ||
+ (slapi_counter_get_value(inst->inst_ref_count) > 0)) {
LDAPDebug(LDAP_DEBUG_ANY, "ldbm: '%s' is in the middle of a task. "
"Cancel the task or wait for it to finish, "
"then try again.\n", instance_name, 0, 0);
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
index 1eaaaae..9cb872a 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
@@ -368,6 +368,14 @@ ldbm_back_modify( Slapi_PBlock *pb )
{
goto error_return;
}
+ if (inst->inst_ref_count) {
+ slapi_counter_increment(inst->inst_ref_count);
+ } else {
+ LDAPDebug1Arg(LDAP_DEBUG_ANY,
+ "ldbm_modify: instance %s does not exist.\n",
+ inst->inst_name);
+ goto error_return;
+ }
/* no need to check the dn syntax as this is a replicated op */
if(!repl_op){
@@ -813,6 +821,9 @@ common_return:
cache_unlock_entry( &inst->inst_cache, e);
CACHE_RETURN( &inst->inst_cache, &e);
}
+ if (inst->inst_ref_count) {
+ slapi_counter_decrement(inst->inst_ref_count);
+ }
/* result code could be used in the bepost plugin functions. */
slapi_pblock_set(pb, SLAPI_RESULT_CODE, &ldap_result_code);
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
index 00e0d61..ef73904 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
@@ -191,6 +191,15 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
return( -1 );
}
+ if (inst->inst_ref_count) {
+ slapi_counter_increment(inst->inst_ref_count);
+ } else {
+ LDAPDebug1Arg(LDAP_DEBUG_ANY,
+ "ldbm_modrdn: instance %s does not exist.\n",
+ inst->inst_name);
+ return( -1 );
+ }
+
/* The dblock serializes writes to the database,
* which reduces deadlocking in the db code,
* which means that we run faster.
@@ -1292,6 +1301,9 @@ common_return:
e_in_cache = 1;
}
}
+ if (inst->inst_ref_count) {
+ slapi_counter_decrement(inst->inst_ref_count);
+ }
moddn_unlock_and_return_entry(be,&e);
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c
index 5fbea24..652424e 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_search.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c
@@ -169,6 +169,9 @@ ldbm_back_search_cleanup(Slapi_PBlock *pb,
slapi_pblock_get( pb, SLAPI_BACKEND, &be );
inst = (ldbm_instance *) be->be_instance_info;
CACHE_RETURN(&inst->inst_cache, &e); /* NULL e is handled correctly */
+ if (inst->inst_ref_count) {
+ slapi_counter_decrement(inst->inst_ref_count);
+ }
if(sort_control!=NULL)
{
@@ -343,6 +346,7 @@ ldbm_back_search( Slapi_PBlock *pb )
int backend_count = 1;
static int print_once = 1;
back_txn txn = {NULL};
+ int rc = 0;
slapi_pblock_get( pb, SLAPI_BACKEND, &be );
slapi_pblock_get( pb, SLAPI_OPERATION, &operation);
@@ -366,6 +370,14 @@ ldbm_back_search( Slapi_PBlock *pb )
"Null target DN", 0, NULL );
return( -1 );
}
+ if (inst->inst_ref_count) {
+ slapi_counter_increment(inst->inst_ref_count);
+ } else {
+ LDAPDebug1Arg(LDAP_DEBUG_ANY,
+ "ldbm_search: instance %s does not exist.\n",
+ inst->inst_name);
+ return( -1 );
+ }
base = slapi_sdn_get_dn(basesdn);
/* Initialize the result set structure here because we need to use it during search processing */
@@ -383,9 +395,8 @@ ldbm_back_search( Slapi_PBlock *pb )
sort = slapi_control_present( controls, LDAP_CONTROL_SORTREQUEST, &sort_spec, &is_sorting_critical_orig );
if(sort)
{
- int r= parse_sort_spec(sort_spec, &sort_control);
- if(r!=0)
- {
+ rc = parse_sort_spec(sort_spec, &sort_control);
+ if (rc) {
/* Badly formed SORT control */
return ldbm_back_search_cleanup(pb, li, sort_control,
LDAP_PROTOCOL_ERROR, "Sort Control",
@@ -401,12 +412,11 @@ ldbm_back_search( Slapi_PBlock *pb )
{
if(sort)
{
- int r = vlv_parse_request_control( be, vlv_spec, &vlv_request_control );
- if(r!=LDAP_SUCCESS)
- {
+ rc = vlv_parse_request_control( be, vlv_spec, &vlv_request_control );
+ if (rc != LDAP_SUCCESS) {
/* Badly formed VLV control */
return ldbm_back_search_cleanup(pb, li, sort_control,
- r, "VLV Control", SLAPI_FAIL_GENERAL,
+ rc, "VLV Control", SLAPI_FAIL_GENERAL,
&vlv_request_control, NULL);
}
{
@@ -421,13 +431,12 @@ ldbm_back_search( Slapi_PBlock *pb )
/* This dn is normalized. */
PR_snprintf(dn,sizeof(dn),"dn: oid=%s,cn=features,cn=config",LDAP_CONTROL_VLVREQUEST);
feature= slapi_str2entry(dn,0);
- r= plugin_call_acl_plugin (pb, feature, dummyAttrs, NULL, SLAPI_ACL_READ, ACLPLUGIN_ACCESS_DEFAULT, NULL);
+ rc = plugin_call_acl_plugin (pb, feature, dummyAttrs, NULL, SLAPI_ACL_READ, ACLPLUGIN_ACCESS_DEFAULT, NULL);
slapi_entry_free(feature);
- if(r!=LDAP_SUCCESS)
- {
+ if (rc != LDAP_SUCCESS) {
/* Client isn't allowed to do this. */
return ldbm_back_search_cleanup(pb, li, sort_control,
- r, "VLV Control", SLAPI_FAIL_GENERAL,
+ rc, "VLV Control", SLAPI_FAIL_GENERAL,
&vlv_request_control, NULL);
}
}
@@ -650,22 +659,20 @@ ldbm_back_search( Slapi_PBlock *pb )
*/
if (virtual_list_view && (NULL != candidates))
{
- int r = 0;
IDList *idl = NULL;
Slapi_Filter *filter = NULL;
slapi_pblock_get( pb, SLAPI_SEARCH_FILTER, &filter );
- r = vlv_filter_candidates(be, pb, candidates, basesdn,
+ rc = vlv_filter_candidates(be, pb, candidates, basesdn,
scope, filter, &idl,
lookthrough_limit, time_up);
- if(r == 0)
- {
+ if (rc == 0) {
idl_free(candidates);
candidates= idl;
}
else
{
return ldbm_back_search_cleanup(pb, li, sort_control,
- r, NULL, -1,
+ rc, NULL, -1,
&vlv_request_control, e);
}
}
diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
index 9c024ca..578701a 100644
--- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
+++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
@@ -684,7 +684,8 @@ int ldbm_back_ldif2ldbm( Slapi_PBlock *pb )
}
/* check if an import/restore is already ongoing... */
- if (instance_set_busy(inst) != 0) {
+ if ((instance_set_busy(inst) != 0) ||
+ (slapi_counter_get_value(inst->inst_ref_count) > 0)) {
LDAPDebug(LDAP_DEBUG_ANY, "ldbm: '%s' is already in the middle of "
"another task and cannot be disturbed.\n",
inst->inst_name, 0, 0);
diff --git a/ldap/servers/slapd/back-ldbm/misc.c b/ldap/servers/slapd/back-ldbm/misc.c
index a56069b..cfc5e5c 100644
--- a/ldap/servers/slapd/back-ldbm/misc.c
+++ b/ldap/servers/slapd/back-ldbm/misc.c
@@ -174,7 +174,7 @@ compute_entry_tombstone_rdn(const char *entryrdn, const char *uniqueid)
int instance_set_busy(ldbm_instance *inst)
{
PR_Lock(inst->inst_config_mutex);
- if (inst->inst_flags & INST_FLAG_BUSY) {
+ if (is_instance_busy(inst)) {
PR_Unlock(inst->inst_config_mutex);
return -1;
}
@@ -187,7 +187,7 @@ int instance_set_busy(ldbm_instance *inst)
int instance_set_busy_and_readonly(ldbm_instance *inst)
{
PR_Lock(inst->inst_config_mutex);
- if (inst->inst_flags & INST_FLAG_BUSY) {
+ if (is_instance_busy(inst)) {
PR_Unlock(inst->inst_config_mutex);
return -1;
}
@@ -280,6 +280,12 @@ is_anyinstance_busy(struct ldbminfo *li)
return rval;
}
+int
+is_instance_busy(ldbm_instance *inst)
+{
+ return inst->inst_flags & INST_FLAG_BUSY;
+}
+
/*
* delete the given file/directory and its sub files/directories
*/
diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
index 80bf329..daf6d05 100644
--- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -150,7 +150,7 @@ int dblayer_database_size(struct ldbminfo *li, unsigned int *size);
int dblayer_terminate(struct ldbminfo *li);
int dblayer_close_indexes(backend *be);
int dblayer_open_file(backend *be, char* indexname, int create, struct attrinfo *ai, DB **ppDB);
-int dblayer_close_file(DB *db);
+int dblayer_close_file(DB **db);
void dblayer_sys_pages(size_t *pagesize, size_t *pages, size_t *procpages, size_t *availpages);
int dblayer_is_cachesize_sane(size_t *cachesize);
void dblayer_remember_disk_filled(struct ldbminfo *li);
@@ -375,6 +375,7 @@ void instance_set_not_busy(ldbm_instance *inst);
void allinstance_set_busy(struct ldbminfo *li);
void allinstance_set_not_busy(struct ldbminfo *li);
int is_anyinstance_busy(struct ldbminfo *li);
+int is_instance_busy(ldbm_instance *inst);
int ldbm_delete_dirs(char *path);
int mkdir_p(char *dir, unsigned int mode);
int is_fullpath(char *path);
diff --git a/ldap/servers/slapd/back-ldbm/vlv.c b/ldap/servers/slapd/back-ldbm/vlv.c
index 7172104..cf68bb3 100644
--- a/ldap/servers/slapd/back-ldbm/vlv.c
+++ b/ldap/servers/slapd/back-ldbm/vlv.c
@@ -159,7 +159,7 @@ int vlv_DeleteSearchEntry(Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entr
int vlv_DeleteIndexEntry(Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg)
{
ldbm_instance *inst = (ldbm_instance*)arg;
- if (inst && (inst->inst_flags & INST_FLAG_BUSY)) {
+ if (inst && is_instance_busy(inst)) {
LDAPDebug( LDAP_DEBUG_ANY,
"Backend instance: '%s' is already in the middle of "
"another task and cannot be disturbed.\n",
1
0
ldap/servers/plugins/acl/aclparse.c | 74 +++++++++++++++++++++---------------
1 file changed, 45 insertions(+), 29 deletions(-)
New commits:
commit caf2febf0d8c9f31e1cc2ca9404465eaf10eaf63
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Tue Oct 30 13:03:22 2012 -0700
Trac Ticket #448 - Possible to set invalid macros in Macro ACIs
https://fedorahosted.org/389/ticket/448
Bug description: Syntax checking code in acl did not check the
macro syntax. Thus, invalide macro such as ($bogus.description)
could have been unexpectedly added.
Fix description: This patch adds the checking code: If acl contains
a keyword starting with "($" or "[$", only one of "($dn)", "[$dn]",
or "($attr." is allowed.
diff --git a/ldap/servers/plugins/acl/aclparse.c b/ldap/servers/plugins/acl/aclparse.c
index 39d9f6c..28c01b9 100644
--- a/ldap/servers/plugins/acl/aclparse.c
+++ b/ldap/servers/plugins/acl/aclparse.c
@@ -141,15 +141,16 @@ acl_parse(char * str, aci_t *aci_item, char **errbuf)
*/
f = aci_item->target;
if (aci_item->aci_type & ACI_TARGET_DN) {
- char *avaType;
- struct berval *avaValue;
- const char *dn;
+ char *avaType;
+ struct berval *avaValue;
+ const char *dn;
- dn = slapi_sdn_get_ndn ( aci_item->aci_sdn );
- slapi_filter_get_ava ( f, &avaType, &avaValue );
+ dn = slapi_sdn_get_ndn(aci_item->aci_sdn);
+ slapi_filter_get_ava(f, &avaType, &avaValue);
- if (!slapi_dn_issuffix( avaValue->bv_val, dn))
- return ACL_INVALID_TARGET;
+ if (!slapi_dn_issuffix(avaValue->bv_val, dn)) {
+ return ACL_INVALID_TARGET;
+ }
}
}
@@ -159,9 +160,9 @@ acl_parse(char * str, aci_t *aci_item, char **errbuf)
** We need to keep it for macros too as it needs to be expnaded at eval time.
**
*/
- if ( (aci_item->aci_elevel != ACI_ELEVEL_USERDN_ANYONE) &&
- !(aci_item->aci_type & ACI_TARGET_MACRO_DN) ) {
- slapi_ch_free ( (void **) & aci_item->targetFilterStr );
+ if ((aci_item->aci_elevel != ACI_ELEVEL_USERDN_ANYONE) &&
+ !(aci_item->aci_type & ACI_TARGET_MACRO_DN)) {
+ slapi_ch_free((void **)&aci_item->targetFilterStr);
}
/*
@@ -176,7 +177,7 @@ acl_parse(char * str, aci_t *aci_item, char **errbuf)
"acl_parse: A macro in a subject ($dn) must have a macro in the target.\n");
return(ACL_INVALID_TARGET);
}
-
+
return 0;
}
@@ -225,15 +226,14 @@ __aclp__parse_aci(char *str, aci_t *aci_item, char **errbuf)
switch(*str) {
case 'v':
type = ACI_ACLTXT;
-
- if ( 0 != (rv= __aclp__sanity_check_acltxt(aci_item, str ) ) ) {
-
+ rv = __aclp__sanity_check_acltxt(aci_item, str);
+ if (rv) {
return rv;
}
break;
case 't':
- if (strncmp(str, aci_targetattrfilters,targetattrfilterslen ) == 0) {
+ if (strncmp(str, aci_targetattrfilters,targetattrfilterslen ) == 0) {
type = ACI_TARGET_ATTR;
@@ -245,7 +245,7 @@ __aclp__parse_aci(char *str, aci_t *aci_item, char **errbuf)
if (0 != (rv = __acl__init_targetattrfilters(aci_item, str))) {
return rv;
}
- } else if (strncmp(str, aci_targetattr,targetattrlen ) == 0) {
+ } else if (strncmp(str, aci_targetattr,targetattrlen ) == 0) {
type = ACI_TARGET_ATTR;
if ( (s = strstr( str, "!=" )) != NULL ) {
@@ -459,12 +459,14 @@ __aclp__parse_aci(char *str, aci_t *aci_item, char **errbuf)
static int
__aclp__sanity_check_acltxt (aci_t *aci_item, char *str)
{
- NSErr_t errp;
- char *s;
- ACLListHandle_t *handle = NULL;
- char *newstr = NULL;
- char *word;
- char *next;
+ NSErr_t errp;
+ char *s;
+ ACLListHandle_t *handle = NULL;
+ char *newstr = NULL;
+ char *word;
+ char *next;
+ const char *brkstr = " ;";
+ int checkversion = 0;
memset (&errp, 0, sizeof(NSErr_t));
newstr = str;
@@ -484,14 +486,28 @@ __aclp__sanity_check_acltxt (aci_t *aci_item, char *str)
}
newstr = slapi_ch_strdup (str);
- word = ldap_utf8strtok_r(newstr, " ", &next);
- if (strcasecmp (word, "version") == 0) {
- word = ldap_utf8strtok_r(NULL, " ", &next);
- if (atoi(word) != 3) {
- slapi_ch_free ( (void **) &newstr );
- return ACL_INCORRECT_ACI_VERSION;
+ for (word = ldap_utf8strtok_r(newstr, brkstr, &next); word;
+ word = ldap_utf8strtok_r(NULL, brkstr, &next)) {
+ if (0 == strcasecmp(word, "version")) {
+ checkversion = 1;
+ } else if (checkversion) {
+ checkversion = 0;
+ if ('3' != *word) {
+ slapi_ch_free ( (void **) &newstr );
+ return ACL_INCORRECT_ACI_VERSION;
+ }
+ } else if ((s = strstr(word, "($")) || (s = strstr(word, "[$"))) {
+ if ((0 != strncasecmp(s, ACL_RULE_MACRO_DN_KEY,
+ sizeof(ACL_RULE_MACRO_DN_KEY) - 1)) &&
+ (0 != strncasecmp(s, ACL_RULE_MACRO_DN_LEVELS_KEY,
+ sizeof(ACL_RULE_MACRO_DN_LEVELS_KEY) - 1)) &&
+ (0 != strncasecmp(s, ACL_RULE_MACRO_ATTR_KEY,
+ sizeof(ACL_RULE_MACRO_ATTR_KEY) - 1))) {
+ slapi_ch_free ( (void **) &newstr );
+ return ACL_SYNTAX_ERR;
+ }
}
- }
+ }
slapi_ch_free ( (void **) &newstr );
/* We need to normalize the DNs in the userdn and group dn
1
0