389-commits December 2013

389-commits@lists.fedoraproject.org

6 participants
107 discussions

Branch '389-ds-base-1.3.0' - ldap/servers
by Mark Reynolds 05 Dec '13

05 Dec '13

ldap/servers/plugins/replication/cl5_clcache.c | 22 +++++++++++++++++----- ldap/servers/plugins/replication/repl5.h | 6 ++++-- ldap/servers/plugins/replication/repl5_agmt.c | 18 ++++++++++++++---- 3 files changed, 35 insertions(+), 11 deletions(-) New commits: commit 63e919f816ef9833b3e58daf9a75edfc8201d831 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Thu Dec 5 11:58:56 2013 -0500 Ticket 47587 - hard coded limit of 64 masters in agreement and changelog code Bug Description: Need to remove hardcoded limit of 64 masters. Fix Description: Changed the default limit to 256, and then we resize the array as needed. https://fedorahosted.org/389/ticket/47587 Reviewed by: richm & tbordaz(Thanks!!) diff --git a/ldap/servers/plugins/replication/cl5_clcache.c b/ldap/servers/plugins/replication/cl5_clcache.c index 8218312..d86620f 100644 --- a/ldap/servers/plugins/replication/cl5_clcache.c +++ b/ldap/servers/plugins/replication/cl5_clcache.c @@ -113,8 +113,9 @@ struct clc_buffer { CSN *buf_missing_csn; /* used to detect persistent missing of CSN */ /* fields for control the CSN sequence sent to the consumer */ - struct csn_seq_ctrl_block *buf_cscbs [MAX_NUM_OF_MASTERS]; + struct csn_seq_ctrl_block **buf_cscbs; int buf_num_cscbs; /* number of csn sequence ctrl blocks */ + int buf_max_cscbs; /* fields for debugging stat */ int buf_load_cnt; /* number of loads for session */ @@ -256,12 +257,15 @@ clcache_get_buffer ( CLC_Buffer **buf, DB *db, ReplicaId consumer_rid, const RUV (*buf)->buf_record_cnt = 0; (*buf)->buf_record_skipped = 0; (*buf)->buf_cursor = NULL; - (*buf)->buf_num_cscbs = 0; (*buf)->buf_skipped_new_rid = 0; (*buf)->buf_skipped_csn_gt_cons_maxcsn = 0; (*buf)->buf_skipped_up_to_date = 0; (*buf)->buf_skipped_csn_gt_ruv = 0; (*buf)->buf_skipped_csn_covered = 0; + (*buf)->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct csn_seq_ctrl_block *)); + (*buf)->buf_num_cscbs = 0; + (*buf)->buf_max_cscbs = MAX_NUM_OF_MASTERS; } else { *buf = clcache_new_buffer ( consumer_rid ); @@ -311,7 +315,7 @@ clcache_return_buffer ( CLC_Buffer **buf ) for ( i = 0; i < (*buf)->buf_num_cscbs; i++ ) { clcache_free_cscb ( &(*buf)->buf_cscbs[i] ); } - (*buf)->buf_num_cscbs = 0; + slapi_ch_free((void **)&(*buf)->buf_cscbs); if ( (*buf)->buf_cursor ) { @@ -554,7 +558,7 @@ clcache_refresh_consumer_maxcsns ( CLC_Buffer *buf ) static int clcache_refresh_local_maxcsn ( const ruv_enum_data *rid_data, void *data ) { - CLC_Buffer *buf = (CLC_Buffer*) data; + struct clc_buffer *buf = (struct clc_buffer*) data; ReplicaId rid; int rc = 0; int i; @@ -575,7 +579,12 @@ clcache_refresh_local_maxcsn ( const ruv_enum_data *rid_data, void *data ) break; } if ( i >= buf->buf_num_cscbs ) { - buf->buf_cscbs[i] = clcache_new_cscb (); + if( i + 1 > buf->buf_max_cscbs){ + buf->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_realloc((char *)buf->buf_cscbs, + (i + 2) * sizeof(struct csn_seq_ctrl_block *)); + buf->buf_max_cscbs = i + 1; + } + buf->buf_cscbs[i] = clcache_new_cscb(); if ( buf->buf_cscbs[i] == NULL ) { return -1; } @@ -878,6 +887,9 @@ clcache_new_buffer ( ReplicaId consumer_rid ) buf->buf_agmt_name = get_thread_private_agmtname(); buf->buf_consumer_rid = consumer_rid; buf->buf_num_cscbs = 0; + buf->buf_max_cscbs = MAX_NUM_OF_MASTERS; + buf->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct csn_seq_ctrl_block *)); welldone = 1; diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h index 5d2a421..a14e2d7 100644 --- a/ldap/servers/plugins/replication/repl5.h +++ b/ldap/servers/plugins/replication/repl5.h @@ -137,11 +137,13 @@ #define PROTOCOL_STATUS_TOTAL_RELEASING_REPLICA 710 #define PROTOCOL_STATUS_TOTAL_SENDING_DATA 711 -/* To Allow Consumer Initialisation when adding an agreement - */ +#define DEFAULT_PROTOCOL_TIMEOUT 120 + +/* To Allow Consumer Initialization when adding an agreement - */ #define STATE_PERFORMING_TOTAL_UPDATE 501 #define STATE_PERFORMING_INCREMENTAL_UPDATE 502 -#define MAX_NUM_OF_MASTERS 64 +#define MAX_NUM_OF_MASTERS 256 #define REPL_SESSION_ID_SIZE 64 #define REPL_GET_DN(addrp) slapi_sdn_get_dn((addrp)->sdn) diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c index da68e16..7049656 100644 --- a/ldap/servers/plugins/replication/repl5_agmt.c +++ b/ldap/servers/plugins/replication/repl5_agmt.c @@ -111,8 +111,9 @@ typedef struct repl5agmt { const Slapi_RDN *rdn; /* RDN of replication agreement entry */ char *long_name; /* Long name (rdn + host, port) of entry, for logging */ Repl_Protocol *protocol; /* Protocol object - manages protocol */ - struct changecounter *changecounters[MAX_NUM_OF_MASTERS]; /* changes sent/skipped since server start up */ + struct changecounter **changecounters; /* changes sent/skipped since server start up */ int num_changecounters; + int max_changecounters; time_t last_update_start_time; /* Local start time of last update session */ time_t last_update_end_time; /* Local end time of last update session */ char last_update_status[STATUS_LEN]; /* Status of last update. Format = numeric code <space> textual description */ @@ -421,14 +422,17 @@ agmt_new_from_entry(Slapi_Entry *e) /* Initialize status information */ ra->last_update_start_time = 0UL; ra->last_update_end_time = 0UL; - ra->num_changecounters = 0; ra->last_update_status[0] = '\0'; ra->update_in_progress = PR_FALSE; ra->stop_in_progress = PR_FALSE; ra->last_init_end_time = 0UL; ra->last_init_start_time = 0UL; ra->last_init_status[0] = '\0'; - + ra->changecounters = (struct changecounter**) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct changecounter *)); + ra->num_changecounters = 0; + ra->max_changecounters = MAX_NUM_OF_MASTERS; + /* Fractional attributes */ slapi_entry_attr_find(e, type_nsds5ReplicatedAttributeList, &sattr); @@ -585,6 +589,7 @@ agmt_delete(void **rap) { slapi_ch_free((void **)&ra->changecounters[ra->num_changecounters]); } + slapi_ch_free((void **)&ra->changecounters); if (ra->agreement_type == REPLICA_TYPE_WINDOWS) { @@ -2283,7 +2288,12 @@ agmt_inc_last_update_changecount (Repl_Agmt *ra, ReplicaId rid, int skipped) } else { - ra->num_changecounters ++; + ra->num_changecounters++; + if(ra->num_changecounters > ra->max_changecounters){ + ra->changecounters = (struct changecounter**) slapi_ch_realloc((char *)ra->changecounters, + (ra->num_changecounters + 1) * sizeof(struct changecounter*)); + ra->max_changecounters = ra->num_changecounters; + } ra->changecounters[i] = (struct changecounter*) slapi_ch_calloc(1, sizeof(struct changecounter)); ra->changecounters[i]->rid = rid; if ( skipped )

1 0

Branch '389-ds-base-1.2.11' - ldap/servers
by Mark Reynolds 05 Dec '13

05 Dec '13

ldap/servers/plugins/replication/cl5_clcache.c | 22 +++++++++++++++++----- ldap/servers/plugins/replication/repl5.h | 6 ++++-- ldap/servers/plugins/replication/repl5_agmt.c | 18 ++++++++++++++---- 3 files changed, 35 insertions(+), 11 deletions(-) New commits: commit b5622fb8d54fbcd9596894483cc324369b7f78fa Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Thu Dec 5 11:58:56 2013 -0500 Ticket 47587 - hard coded limit of 64 masters in agreement and changelog code Bug Description: Need to remove hardcoded limit of 64 masters. Fix Description: Changed the default limit to 256, and then we resize the array as needed. https://fedorahosted.org/389/ticket/47587 Reviewed by: richm & tbordaz(Thanks!!) diff --git a/ldap/servers/plugins/replication/cl5_clcache.c b/ldap/servers/plugins/replication/cl5_clcache.c index 8218312..d86620f 100644 --- a/ldap/servers/plugins/replication/cl5_clcache.c +++ b/ldap/servers/plugins/replication/cl5_clcache.c @@ -113,8 +113,9 @@ struct clc_buffer { CSN *buf_missing_csn; /* used to detect persistent missing of CSN */ /* fields for control the CSN sequence sent to the consumer */ - struct csn_seq_ctrl_block *buf_cscbs [MAX_NUM_OF_MASTERS]; + struct csn_seq_ctrl_block **buf_cscbs; int buf_num_cscbs; /* number of csn sequence ctrl blocks */ + int buf_max_cscbs; /* fields for debugging stat */ int buf_load_cnt; /* number of loads for session */ @@ -256,12 +257,15 @@ clcache_get_buffer ( CLC_Buffer **buf, DB *db, ReplicaId consumer_rid, const RUV (*buf)->buf_record_cnt = 0; (*buf)->buf_record_skipped = 0; (*buf)->buf_cursor = NULL; - (*buf)->buf_num_cscbs = 0; (*buf)->buf_skipped_new_rid = 0; (*buf)->buf_skipped_csn_gt_cons_maxcsn = 0; (*buf)->buf_skipped_up_to_date = 0; (*buf)->buf_skipped_csn_gt_ruv = 0; (*buf)->buf_skipped_csn_covered = 0; + (*buf)->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct csn_seq_ctrl_block *)); + (*buf)->buf_num_cscbs = 0; + (*buf)->buf_max_cscbs = MAX_NUM_OF_MASTERS; } else { *buf = clcache_new_buffer ( consumer_rid ); @@ -311,7 +315,7 @@ clcache_return_buffer ( CLC_Buffer **buf ) for ( i = 0; i < (*buf)->buf_num_cscbs; i++ ) { clcache_free_cscb ( &(*buf)->buf_cscbs[i] ); } - (*buf)->buf_num_cscbs = 0; + slapi_ch_free((void **)&(*buf)->buf_cscbs); if ( (*buf)->buf_cursor ) { @@ -554,7 +558,7 @@ clcache_refresh_consumer_maxcsns ( CLC_Buffer *buf ) static int clcache_refresh_local_maxcsn ( const ruv_enum_data *rid_data, void *data ) { - CLC_Buffer *buf = (CLC_Buffer*) data; + struct clc_buffer *buf = (struct clc_buffer*) data; ReplicaId rid; int rc = 0; int i; @@ -575,7 +579,12 @@ clcache_refresh_local_maxcsn ( const ruv_enum_data *rid_data, void *data ) break; } if ( i >= buf->buf_num_cscbs ) { - buf->buf_cscbs[i] = clcache_new_cscb (); + if( i + 1 > buf->buf_max_cscbs){ + buf->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_realloc((char *)buf->buf_cscbs, + (i + 2) * sizeof(struct csn_seq_ctrl_block *)); + buf->buf_max_cscbs = i + 1; + } + buf->buf_cscbs[i] = clcache_new_cscb(); if ( buf->buf_cscbs[i] == NULL ) { return -1; } @@ -878,6 +887,9 @@ clcache_new_buffer ( ReplicaId consumer_rid ) buf->buf_agmt_name = get_thread_private_agmtname(); buf->buf_consumer_rid = consumer_rid; buf->buf_num_cscbs = 0; + buf->buf_max_cscbs = MAX_NUM_OF_MASTERS; + buf->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct csn_seq_ctrl_block *)); welldone = 1; diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h index 8219103..b10b358 100644 --- a/ldap/servers/plugins/replication/repl5.h +++ b/ldap/servers/plugins/replication/repl5.h @@ -137,11 +137,13 @@ #define PROTOCOL_STATUS_TOTAL_RELEASING_REPLICA 710 #define PROTOCOL_STATUS_TOTAL_SENDING_DATA 711 -/* To Allow Consumer Initialisation when adding an agreement - */ +#define DEFAULT_PROTOCOL_TIMEOUT 120 + +/* To Allow Consumer Initialization when adding an agreement - */ #define STATE_PERFORMING_TOTAL_UPDATE 501 #define STATE_PERFORMING_INCREMENTAL_UPDATE 502 -#define MAX_NUM_OF_MASTERS 64 +#define MAX_NUM_OF_MASTERS 256 #define REPL_SESSION_ID_SIZE 64 #define REPL_GET_DN(addrp) slapi_sdn_get_dn((addrp)->sdn) diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c index 935fb37..fec0f8e 100644 --- a/ldap/servers/plugins/replication/repl5_agmt.c +++ b/ldap/servers/plugins/replication/repl5_agmt.c @@ -111,8 +111,9 @@ typedef struct repl5agmt { const Slapi_RDN *rdn; /* RDN of replication agreement entry */ char *long_name; /* Long name (rdn + host, port) of entry, for logging */ Repl_Protocol *protocol; /* Protocol object - manages protocol */ - struct changecounter *changecounters[MAX_NUM_OF_MASTERS]; /* changes sent/skipped since server start up */ + struct changecounter **changecounters; /* changes sent/skipped since server start up */ int num_changecounters; + int max_changecounters; time_t last_update_start_time; /* Local start time of last update session */ time_t last_update_end_time; /* Local end time of last update session */ char last_update_status[STATUS_LEN]; /* Status of last update. Format = numeric code <space> textual description */ @@ -421,14 +422,17 @@ agmt_new_from_entry(Slapi_Entry *e) /* Initialize status information */ ra->last_update_start_time = 0UL; ra->last_update_end_time = 0UL; - ra->num_changecounters = 0; ra->last_update_status[0] = '\0'; ra->update_in_progress = PR_FALSE; ra->stop_in_progress = PR_FALSE; ra->last_init_end_time = 0UL; ra->last_init_start_time = 0UL; ra->last_init_status[0] = '\0'; - + ra->changecounters = (struct changecounter**) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct changecounter *)); + ra->num_changecounters = 0; + ra->max_changecounters = MAX_NUM_OF_MASTERS; + /* Fractional attributes */ slapi_entry_attr_find(e, type_nsds5ReplicatedAttributeList, &sattr); @@ -585,6 +589,7 @@ agmt_delete(void **rap) { slapi_ch_free((void **)&ra->changecounters[ra->num_changecounters]); } + slapi_ch_free((void **)&ra->changecounters); if (ra->agreement_type == REPLICA_TYPE_WINDOWS) { @@ -2283,7 +2288,12 @@ agmt_inc_last_update_changecount (Repl_Agmt *ra, ReplicaId rid, int skipped) } else { - ra->num_changecounters ++; + ra->num_changecounters++; + if(ra->num_changecounters > ra->max_changecounters){ + ra->changecounters = (struct changecounter**) slapi_ch_realloc((char *)ra->changecounters, + (ra->num_changecounters + 1) * sizeof(struct changecounter*)); + ra->max_changecounters = ra->num_changecounters; + } ra->changecounters[i] = (struct changecounter*) slapi_ch_calloc(1, sizeof(struct changecounter)); ra->changecounters[i]->rid = rid; if ( skipped )

1 0

Branch '389-ds-base-1.3.1' - ldap/servers
by Mark Reynolds 05 Dec '13

05 Dec '13

ldap/servers/plugins/replication/cl5_clcache.c | 22 +++++++++++++++++----- ldap/servers/plugins/replication/repl5.h | 4 ++-- ldap/servers/plugins/replication/repl5_agmt.c | 18 ++++++++++++++---- 3 files changed, 33 insertions(+), 11 deletions(-) New commits: commit 457cd16908071f3faddb021c12c792d22f64ab5c Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Thu Dec 5 11:58:56 2013 -0500 Ticket 47587 - hard coded limit of 64 masters in agreement and changelog code Bug Description: Need to remove hardcoded limit of 64 masters. Fix Description: Changed the default limit to 256, and then we resize the array as needed. https://fedorahosted.org/389/ticket/47587 Reviewed by: richm & tbordaz(Thanks!!) (cherry picked from commit bae797c94207d15025e763cfea0634f42eeb1210) diff --git a/ldap/servers/plugins/replication/cl5_clcache.c b/ldap/servers/plugins/replication/cl5_clcache.c index 8218312..d86620f 100644 --- a/ldap/servers/plugins/replication/cl5_clcache.c +++ b/ldap/servers/plugins/replication/cl5_clcache.c @@ -113,8 +113,9 @@ struct clc_buffer { CSN *buf_missing_csn; /* used to detect persistent missing of CSN */ /* fields for control the CSN sequence sent to the consumer */ - struct csn_seq_ctrl_block *buf_cscbs [MAX_NUM_OF_MASTERS]; + struct csn_seq_ctrl_block **buf_cscbs; int buf_num_cscbs; /* number of csn sequence ctrl blocks */ + int buf_max_cscbs; /* fields for debugging stat */ int buf_load_cnt; /* number of loads for session */ @@ -256,12 +257,15 @@ clcache_get_buffer ( CLC_Buffer **buf, DB *db, ReplicaId consumer_rid, const RUV (*buf)->buf_record_cnt = 0; (*buf)->buf_record_skipped = 0; (*buf)->buf_cursor = NULL; - (*buf)->buf_num_cscbs = 0; (*buf)->buf_skipped_new_rid = 0; (*buf)->buf_skipped_csn_gt_cons_maxcsn = 0; (*buf)->buf_skipped_up_to_date = 0; (*buf)->buf_skipped_csn_gt_ruv = 0; (*buf)->buf_skipped_csn_covered = 0; + (*buf)->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct csn_seq_ctrl_block *)); + (*buf)->buf_num_cscbs = 0; + (*buf)->buf_max_cscbs = MAX_NUM_OF_MASTERS; } else { *buf = clcache_new_buffer ( consumer_rid ); @@ -311,7 +315,7 @@ clcache_return_buffer ( CLC_Buffer **buf ) for ( i = 0; i < (*buf)->buf_num_cscbs; i++ ) { clcache_free_cscb ( &(*buf)->buf_cscbs[i] ); } - (*buf)->buf_num_cscbs = 0; + slapi_ch_free((void **)&(*buf)->buf_cscbs); if ( (*buf)->buf_cursor ) { @@ -554,7 +558,7 @@ clcache_refresh_consumer_maxcsns ( CLC_Buffer *buf ) static int clcache_refresh_local_maxcsn ( const ruv_enum_data *rid_data, void *data ) { - CLC_Buffer *buf = (CLC_Buffer*) data; + struct clc_buffer *buf = (struct clc_buffer*) data; ReplicaId rid; int rc = 0; int i; @@ -575,7 +579,12 @@ clcache_refresh_local_maxcsn ( const ruv_enum_data *rid_data, void *data ) break; } if ( i >= buf->buf_num_cscbs ) { - buf->buf_cscbs[i] = clcache_new_cscb (); + if( i + 1 > buf->buf_max_cscbs){ + buf->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_realloc((char *)buf->buf_cscbs, + (i + 2) * sizeof(struct csn_seq_ctrl_block *)); + buf->buf_max_cscbs = i + 1; + } + buf->buf_cscbs[i] = clcache_new_cscb(); if ( buf->buf_cscbs[i] == NULL ) { return -1; } @@ -878,6 +887,9 @@ clcache_new_buffer ( ReplicaId consumer_rid ) buf->buf_agmt_name = get_thread_private_agmtname(); buf->buf_consumer_rid = consumer_rid; buf->buf_num_cscbs = 0; + buf->buf_max_cscbs = MAX_NUM_OF_MASTERS; + buf->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct csn_seq_ctrl_block *)); welldone = 1; diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h index 5bec1c7..92a9229 100644 --- a/ldap/servers/plugins/replication/repl5.h +++ b/ldap/servers/plugins/replication/repl5.h @@ -140,11 +140,11 @@ #define DEFAULT_PROTOCOL_TIMEOUT 120 -/* To Allow Consumer Initialisation when adding an agreement - */ +/* To Allow Consumer Initialization when adding an agreement - */ #define STATE_PERFORMING_TOTAL_UPDATE 501 #define STATE_PERFORMING_INCREMENTAL_UPDATE 502 -#define MAX_NUM_OF_MASTERS 64 +#define MAX_NUM_OF_MASTERS 256 #define REPL_SESSION_ID_SIZE 64 #define REPL_GET_DN(addrp) slapi_sdn_get_dn((addrp)->sdn) diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c index b7d107e..90d94f8 100644 --- a/ldap/servers/plugins/replication/repl5_agmt.c +++ b/ldap/servers/plugins/replication/repl5_agmt.c @@ -111,8 +111,9 @@ typedef struct repl5agmt { const Slapi_RDN *rdn; /* RDN of replication agreement entry */ char *long_name; /* Long name (rdn + host, port) of entry, for logging */ Repl_Protocol *protocol; /* Protocol object - manages protocol */ - struct changecounter *changecounters[MAX_NUM_OF_MASTERS]; /* changes sent/skipped since server start up */ + struct changecounter **changecounters; /* changes sent/skipped since server start up */ int num_changecounters; + int max_changecounters; time_t last_update_start_time; /* Local start time of last update session */ time_t last_update_end_time; /* Local end time of last update session */ char last_update_status[STATUS_LEN]; /* Status of last update. Format = numeric code <space> textual description */ @@ -435,14 +436,17 @@ agmt_new_from_entry(Slapi_Entry *e) /* Initialize status information */ ra->last_update_start_time = 0UL; ra->last_update_end_time = 0UL; - ra->num_changecounters = 0; ra->last_update_status[0] = '\0'; ra->update_in_progress = PR_FALSE; ra->stop_in_progress = PR_FALSE; ra->last_init_end_time = 0UL; ra->last_init_start_time = 0UL; ra->last_init_status[0] = '\0'; - + ra->changecounters = (struct changecounter**) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct changecounter *)); + ra->num_changecounters = 0; + ra->max_changecounters = MAX_NUM_OF_MASTERS; + /* Fractional attributes */ slapi_entry_attr_find(e, type_nsds5ReplicatedAttributeList, &sattr); @@ -599,6 +603,7 @@ agmt_delete(void **rap) { slapi_ch_free((void **)&ra->changecounters[ra->num_changecounters]); } + slapi_ch_free((void **)&ra->changecounters); if (ra->agreement_type == REPLICA_TYPE_WINDOWS) { @@ -2305,7 +2310,12 @@ agmt_inc_last_update_changecount (Repl_Agmt *ra, ReplicaId rid, int skipped) } else { - ra->num_changecounters ++; + ra->num_changecounters++; + if(ra->num_changecounters > ra->max_changecounters){ + ra->changecounters = (struct changecounter**) slapi_ch_realloc((char *)ra->changecounters, + (ra->num_changecounters + 1) * sizeof(struct changecounter*)); + ra->max_changecounters = ra->num_changecounters; + } ra->changecounters[i] = (struct changecounter*) slapi_ch_calloc(1, sizeof(struct changecounter)); ra->changecounters[i]->rid = rid; if ( skipped )

1 0

Branch '389-ds-base-1.3.2' - ldap/servers
by Mark Reynolds 05 Dec '13

05 Dec '13

ldap/servers/plugins/replication/cl5_clcache.c | 22 +++++++++++++++++----- ldap/servers/plugins/replication/repl5.h | 4 ++-- ldap/servers/plugins/replication/repl5_agmt.c | 18 ++++++++++++++---- 3 files changed, 33 insertions(+), 11 deletions(-) New commits: commit df5a0618fce1678826318a7bfcb1b47d64b636a2 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Thu Dec 5 11:58:56 2013 -0500 Ticket 47587 - hard coded limit of 64 masters in agreement and changelog code Bug Description: Need to remove hardcoded limit of 64 masters. Fix Description: Changed the default limit to 256, and then we resize the array as needed. https://fedorahosted.org/389/ticket/47587 Reviewed by: richm & tbordaz(Thanks!!) (cherry picked from commit bae797c94207d15025e763cfea0634f42eeb1210) diff --git a/ldap/servers/plugins/replication/cl5_clcache.c b/ldap/servers/plugins/replication/cl5_clcache.c index 8218312..d86620f 100644 --- a/ldap/servers/plugins/replication/cl5_clcache.c +++ b/ldap/servers/plugins/replication/cl5_clcache.c @@ -113,8 +113,9 @@ struct clc_buffer { CSN *buf_missing_csn; /* used to detect persistent missing of CSN */ /* fields for control the CSN sequence sent to the consumer */ - struct csn_seq_ctrl_block *buf_cscbs [MAX_NUM_OF_MASTERS]; + struct csn_seq_ctrl_block **buf_cscbs; int buf_num_cscbs; /* number of csn sequence ctrl blocks */ + int buf_max_cscbs; /* fields for debugging stat */ int buf_load_cnt; /* number of loads for session */ @@ -256,12 +257,15 @@ clcache_get_buffer ( CLC_Buffer **buf, DB *db, ReplicaId consumer_rid, const RUV (*buf)->buf_record_cnt = 0; (*buf)->buf_record_skipped = 0; (*buf)->buf_cursor = NULL; - (*buf)->buf_num_cscbs = 0; (*buf)->buf_skipped_new_rid = 0; (*buf)->buf_skipped_csn_gt_cons_maxcsn = 0; (*buf)->buf_skipped_up_to_date = 0; (*buf)->buf_skipped_csn_gt_ruv = 0; (*buf)->buf_skipped_csn_covered = 0; + (*buf)->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct csn_seq_ctrl_block *)); + (*buf)->buf_num_cscbs = 0; + (*buf)->buf_max_cscbs = MAX_NUM_OF_MASTERS; } else { *buf = clcache_new_buffer ( consumer_rid ); @@ -311,7 +315,7 @@ clcache_return_buffer ( CLC_Buffer **buf ) for ( i = 0; i < (*buf)->buf_num_cscbs; i++ ) { clcache_free_cscb ( &(*buf)->buf_cscbs[i] ); } - (*buf)->buf_num_cscbs = 0; + slapi_ch_free((void **)&(*buf)->buf_cscbs); if ( (*buf)->buf_cursor ) { @@ -554,7 +558,7 @@ clcache_refresh_consumer_maxcsns ( CLC_Buffer *buf ) static int clcache_refresh_local_maxcsn ( const ruv_enum_data *rid_data, void *data ) { - CLC_Buffer *buf = (CLC_Buffer*) data; + struct clc_buffer *buf = (struct clc_buffer*) data; ReplicaId rid; int rc = 0; int i; @@ -575,7 +579,12 @@ clcache_refresh_local_maxcsn ( const ruv_enum_data *rid_data, void *data ) break; } if ( i >= buf->buf_num_cscbs ) { - buf->buf_cscbs[i] = clcache_new_cscb (); + if( i + 1 > buf->buf_max_cscbs){ + buf->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_realloc((char *)buf->buf_cscbs, + (i + 2) * sizeof(struct csn_seq_ctrl_block *)); + buf->buf_max_cscbs = i + 1; + } + buf->buf_cscbs[i] = clcache_new_cscb(); if ( buf->buf_cscbs[i] == NULL ) { return -1; } @@ -878,6 +887,9 @@ clcache_new_buffer ( ReplicaId consumer_rid ) buf->buf_agmt_name = get_thread_private_agmtname(); buf->buf_consumer_rid = consumer_rid; buf->buf_num_cscbs = 0; + buf->buf_max_cscbs = MAX_NUM_OF_MASTERS; + buf->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct csn_seq_ctrl_block *)); welldone = 1; diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h index 19fed0c..819abd9 100644 --- a/ldap/servers/plugins/replication/repl5.h +++ b/ldap/servers/plugins/replication/repl5.h @@ -140,11 +140,11 @@ #define DEFAULT_PROTOCOL_TIMEOUT 120 -/* To Allow Consumer Initialisation when adding an agreement - */ +/* To Allow Consumer Initialization when adding an agreement - */ #define STATE_PERFORMING_TOTAL_UPDATE 501 #define STATE_PERFORMING_INCREMENTAL_UPDATE 502 -#define MAX_NUM_OF_MASTERS 64 +#define MAX_NUM_OF_MASTERS 256 #define REPL_SESSION_ID_SIZE 64 #define REPL_GET_DN(addrp) slapi_sdn_get_dn((addrp)->sdn) diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c index d3ee568..afb7f54 100644 --- a/ldap/servers/plugins/replication/repl5_agmt.c +++ b/ldap/servers/plugins/replication/repl5_agmt.c @@ -111,8 +111,9 @@ typedef struct repl5agmt { const Slapi_RDN *rdn; /* RDN of replication agreement entry */ char *long_name; /* Long name (rdn + host, port) of entry, for logging */ Repl_Protocol *protocol; /* Protocol object - manages protocol */ - struct changecounter *changecounters[MAX_NUM_OF_MASTERS]; /* changes sent/skipped since server start up */ + struct changecounter **changecounters; /* changes sent/skipped since server start up */ int num_changecounters; + int max_changecounters; time_t last_update_start_time; /* Local start time of last update session */ time_t last_update_end_time; /* Local end time of last update session */ char last_update_status[STATUS_LEN]; /* Status of last update. Format = numeric code <space> textual description */ @@ -435,14 +436,17 @@ agmt_new_from_entry(Slapi_Entry *e) /* Initialize status information */ ra->last_update_start_time = 0UL; ra->last_update_end_time = 0UL; - ra->num_changecounters = 0; ra->last_update_status[0] = '\0'; ra->update_in_progress = PR_FALSE; ra->stop_in_progress = PR_FALSE; ra->last_init_end_time = 0UL; ra->last_init_start_time = 0UL; ra->last_init_status[0] = '\0'; - + ra->changecounters = (struct changecounter**) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct changecounter *)); + ra->num_changecounters = 0; + ra->max_changecounters = MAX_NUM_OF_MASTERS; + /* Fractional attributes */ slapi_entry_attr_find(e, type_nsds5ReplicatedAttributeList, &sattr); @@ -599,6 +603,7 @@ agmt_delete(void **rap) { slapi_ch_free((void **)&ra->changecounters[ra->num_changecounters]); } + slapi_ch_free((void **)&ra->changecounters); if (ra->agreement_type == REPLICA_TYPE_WINDOWS) { @@ -2305,7 +2310,12 @@ agmt_inc_last_update_changecount (Repl_Agmt *ra, ReplicaId rid, int skipped) } else { - ra->num_changecounters ++; + ra->num_changecounters++; + if(ra->num_changecounters > ra->max_changecounters){ + ra->changecounters = (struct changecounter**) slapi_ch_realloc((char *)ra->changecounters, + (ra->num_changecounters + 1) * sizeof(struct changecounter*)); + ra->max_changecounters = ra->num_changecounters; + } ra->changecounters[i] = (struct changecounter*) slapi_ch_calloc(1, sizeof(struct changecounter)); ra->changecounters[i]->rid = rid; if ( skipped )

1 0

ldap/servers
by Mark Reynolds 05 Dec '13

05 Dec '13

ldap/servers/plugins/replication/cl5_clcache.c | 22 +++++++++++++++++----- ldap/servers/plugins/replication/repl5.h | 4 ++-- ldap/servers/plugins/replication/repl5_agmt.c | 18 ++++++++++++++---- 3 files changed, 33 insertions(+), 11 deletions(-) New commits: commit bae797c94207d15025e763cfea0634f42eeb1210 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Thu Dec 5 11:58:56 2013 -0500 Ticket 47587 - hard coded limit of 64 masters in agreement and changelog code Bug Description: Need to remove hardcoded limit of 64 masters. Fix Description: Changed the default limit to 256, and then we resize the array as needed. https://fedorahosted.org/389/ticket/47587 Reviewed by: richm & tbordaz(Thanks!!) diff --git a/ldap/servers/plugins/replication/cl5_clcache.c b/ldap/servers/plugins/replication/cl5_clcache.c index 8218312..d86620f 100644 --- a/ldap/servers/plugins/replication/cl5_clcache.c +++ b/ldap/servers/plugins/replication/cl5_clcache.c @@ -113,8 +113,9 @@ struct clc_buffer { CSN *buf_missing_csn; /* used to detect persistent missing of CSN */ /* fields for control the CSN sequence sent to the consumer */ - struct csn_seq_ctrl_block *buf_cscbs [MAX_NUM_OF_MASTERS]; + struct csn_seq_ctrl_block **buf_cscbs; int buf_num_cscbs; /* number of csn sequence ctrl blocks */ + int buf_max_cscbs; /* fields for debugging stat */ int buf_load_cnt; /* number of loads for session */ @@ -256,12 +257,15 @@ clcache_get_buffer ( CLC_Buffer **buf, DB *db, ReplicaId consumer_rid, const RUV (*buf)->buf_record_cnt = 0; (*buf)->buf_record_skipped = 0; (*buf)->buf_cursor = NULL; - (*buf)->buf_num_cscbs = 0; (*buf)->buf_skipped_new_rid = 0; (*buf)->buf_skipped_csn_gt_cons_maxcsn = 0; (*buf)->buf_skipped_up_to_date = 0; (*buf)->buf_skipped_csn_gt_ruv = 0; (*buf)->buf_skipped_csn_covered = 0; + (*buf)->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct csn_seq_ctrl_block *)); + (*buf)->buf_num_cscbs = 0; + (*buf)->buf_max_cscbs = MAX_NUM_OF_MASTERS; } else { *buf = clcache_new_buffer ( consumer_rid ); @@ -311,7 +315,7 @@ clcache_return_buffer ( CLC_Buffer **buf ) for ( i = 0; i < (*buf)->buf_num_cscbs; i++ ) { clcache_free_cscb ( &(*buf)->buf_cscbs[i] ); } - (*buf)->buf_num_cscbs = 0; + slapi_ch_free((void **)&(*buf)->buf_cscbs); if ( (*buf)->buf_cursor ) { @@ -554,7 +558,7 @@ clcache_refresh_consumer_maxcsns ( CLC_Buffer *buf ) static int clcache_refresh_local_maxcsn ( const ruv_enum_data *rid_data, void *data ) { - CLC_Buffer *buf = (CLC_Buffer*) data; + struct clc_buffer *buf = (struct clc_buffer*) data; ReplicaId rid; int rc = 0; int i; @@ -575,7 +579,12 @@ clcache_refresh_local_maxcsn ( const ruv_enum_data *rid_data, void *data ) break; } if ( i >= buf->buf_num_cscbs ) { - buf->buf_cscbs[i] = clcache_new_cscb (); + if( i + 1 > buf->buf_max_cscbs){ + buf->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_realloc((char *)buf->buf_cscbs, + (i + 2) * sizeof(struct csn_seq_ctrl_block *)); + buf->buf_max_cscbs = i + 1; + } + buf->buf_cscbs[i] = clcache_new_cscb(); if ( buf->buf_cscbs[i] == NULL ) { return -1; } @@ -878,6 +887,9 @@ clcache_new_buffer ( ReplicaId consumer_rid ) buf->buf_agmt_name = get_thread_private_agmtname(); buf->buf_consumer_rid = consumer_rid; buf->buf_num_cscbs = 0; + buf->buf_max_cscbs = MAX_NUM_OF_MASTERS; + buf->buf_cscbs = (struct csn_seq_ctrl_block **) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct csn_seq_ctrl_block *)); welldone = 1; diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h index eb646e3..9bed558 100644 --- a/ldap/servers/plugins/replication/repl5.h +++ b/ldap/servers/plugins/replication/repl5.h @@ -140,11 +140,11 @@ #define DEFAULT_PROTOCOL_TIMEOUT 120 -/* To Allow Consumer Initialisation when adding an agreement - */ +/* To Allow Consumer Initialization when adding an agreement - */ #define STATE_PERFORMING_TOTAL_UPDATE 501 #define STATE_PERFORMING_INCREMENTAL_UPDATE 502 -#define MAX_NUM_OF_MASTERS 64 +#define MAX_NUM_OF_MASTERS 256 #define REPL_SESSION_ID_SIZE 64 #define REPL_GET_DN(addrp) slapi_sdn_get_dn((addrp)->sdn) diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c index 6a9f8ad..55a74c8 100644 --- a/ldap/servers/plugins/replication/repl5_agmt.c +++ b/ldap/servers/plugins/replication/repl5_agmt.c @@ -111,8 +111,9 @@ typedef struct repl5agmt { const Slapi_RDN *rdn; /* RDN of replication agreement entry */ char *long_name; /* Long name (rdn + host, port) of entry, for logging */ Repl_Protocol *protocol; /* Protocol object - manages protocol */ - struct changecounter *changecounters[MAX_NUM_OF_MASTERS]; /* changes sent/skipped since server start up */ + struct changecounter **changecounters; /* changes sent/skipped since server start up */ int num_changecounters; + int max_changecounters; time_t last_update_start_time; /* Local start time of last update session */ time_t last_update_end_time; /* Local end time of last update session */ char last_update_status[STATUS_LEN]; /* Status of last update. Format = numeric code <space> textual description */ @@ -455,14 +456,17 @@ agmt_new_from_entry(Slapi_Entry *e) /* Initialize status information */ ra->last_update_start_time = 0UL; ra->last_update_end_time = 0UL; - ra->num_changecounters = 0; ra->last_update_status[0] = '\0'; ra->update_in_progress = PR_FALSE; ra->stop_in_progress = PR_FALSE; ra->last_init_end_time = 0UL; ra->last_init_start_time = 0UL; ra->last_init_status[0] = '\0'; - + ra->changecounters = (struct changecounter**) slapi_ch_calloc(MAX_NUM_OF_MASTERS + 1, + sizeof(struct changecounter *)); + ra->num_changecounters = 0; + ra->max_changecounters = MAX_NUM_OF_MASTERS; + /* Fractional attributes */ slapi_entry_attr_find(e, type_nsds5ReplicatedAttributeList, &sattr); @@ -629,6 +633,7 @@ agmt_delete(void **rap) { slapi_ch_free((void **)&ra->changecounters[ra->num_changecounters]); } + slapi_ch_free((void **)&ra->changecounters); if (ra->agreement_type == REPLICA_TYPE_WINDOWS) { @@ -2345,7 +2350,12 @@ agmt_inc_last_update_changecount (Repl_Agmt *ra, ReplicaId rid, int skipped) } else { - ra->num_changecounters ++; + ra->num_changecounters++; + if(ra->num_changecounters > ra->max_changecounters){ + ra->changecounters = (struct changecounter**) slapi_ch_realloc((char *)ra->changecounters, + (ra->num_changecounters + 1) * sizeof(struct changecounter*)); + ra->max_changecounters = ra->num_changecounters; + } ra->changecounters[i] = (struct changecounter*) slapi_ch_calloc(1, sizeof(struct changecounter)); ra->changecounters[i]->rid = rid; if ( skipped )

1 0

ldap/servers
by Ludwig Krispenz 05 Dec '13

05 Dec '13

ldap/servers/slapd/entrywsi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 3155bbb508812de2e6c8cc315fb7315a8c96ba15 Author: Ludwig Krispenz <lkrispen(a)redhat.com> Date: Thu Dec 5 16:32:39 2013 +0100 simplify fix for 47612 diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c index afaf019..f4f6481 100644 --- a/ldap/servers/slapd/entrywsi.c +++ b/ldap/servers/slapd/entrywsi.c @@ -785,9 +785,7 @@ entry_delete_present_values_wsi_multi_valued(Slapi_Entry *e, const char *type, s { int retVal= LDAP_SUCCESS; Slapi_Attr *a= NULL; - int attr_state; - entry_attr_find_wsi(e, type, &a); - attr_state = entry_attr_find_wsi(e, type, &a); + int attr_state = entry_attr_find_wsi(e, type, &a); /* The attribute is on the present list, or the deleted list and we're doing URP */ if ( vals == NULL || vals[0] == NULL ) {

1 0

ldap/servers
by Ludwig Krispenz 05 Dec '13

05 Dec '13

ldap/servers/slapd/entrywsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 2cc32e62b6890860d4abe74cd88ee382b9c3bb54 Author: Ludwig Krispenz <lkrispen(a)redhat.com> Date: Thu Dec 5 13:52:27 2013 +0100 Ticket 47612 - ns-slapd eats all the memory Bug Description: slpad process quickly grows and runs out of memory The reason is that an entry is copied and one of teh attributes has a next reference to itself, so that it will try to copy it infinitely. The state is an effect of moving an attribute to the deleted attributes if the present valueset is empty, but in urp this is also called for deleted attributes and so ti will be added again. Fix Description: check if attribute is present before moving to deleted https://fedorahosted.org/389/ticket/47612 Reviewed by: richm, thanks diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c index a725ddb..afaf019 100644 --- a/ldap/servers/slapd/entrywsi.c +++ b/ldap/servers/slapd/entrywsi.c @@ -785,7 +785,9 @@ entry_delete_present_values_wsi_multi_valued(Slapi_Entry *e, const char *type, s { int retVal= LDAP_SUCCESS; Slapi_Attr *a= NULL; + int attr_state; entry_attr_find_wsi(e, type, &a); + attr_state = entry_attr_find_wsi(e, type, &a); /* The attribute is on the present list, or the deleted list and we're doing URP */ if ( vals == NULL || vals[0] == NULL ) { @@ -800,7 +802,7 @@ entry_delete_present_values_wsi_multi_valued(Slapi_Entry *e, const char *type, s */ valueset_purge(&a->a_present_values, csn); valueset_purge(&a->a_deleted_values, csn); - if(valueset_isempty(&a->a_present_values)) + if(attr_state==ATTRIBUTE_PRESENT && valueset_isempty(&a->a_present_values)) entry_present_attribute_to_deleted_attribute(e, a); } else @@ -842,7 +844,7 @@ entry_delete_present_values_wsi_multi_valued(Slapi_Entry *e, const char *type, s valuearray_update_csn(valuestodelete,CSN_TYPE_VALUE_DELETED,csn); slapi_valueset_add_attr_valuearray_ext (a, &a->a_deleted_values, valuestodelete, valuearray_count(valuestodelete), SLAPI_VALUE_FLAG_PASSIN, NULL); - if(valueset_isempty(&a->a_present_values)) + if(attr_state==ATTRIBUTE_PRESENT && valueset_isempty(&a->a_present_values)) entry_present_attribute_to_deleted_attribute(e, a); /* all the elements in valuestodelete are passed; * should free valuestodelete only (don't call valuearray_free)

1 0

ldap/servers
by Ludwig Krispenz 05 Dec '13

05 Dec '13

ldap/servers/plugins/memberof/memberof.c | 29 +++++++++++++++++++++ ldap/servers/plugins/memberof/memberof.h | 3 ++ ldap/servers/plugins/memberof/memberof_config.c | 32 +++++++++++++++++++++++- 3 files changed, 62 insertions(+), 2 deletions(-) New commits: commit 11898c30caa7e648b654f002834793dad70c0580 Author: Ludwig Krispenz <lkrispen(a)redhat.com> Date: Thu Dec 5 14:50:46 2013 +0100 Ticket 47526 - Allow memberof suffixes to be configurable Bug Description: Request to apply referential memberof operations to specific subtrees only Fix Description: The fix adds a configuration parameters to the memberof plugin: nsslapd-memberofScope: <dn> The logic implemented is: If a member is added top group only if member and group are in the defined memberof scope the memberof attribute is updated. If an entry is deleted and it is inside the scope, its member references will be purged (like befoer, only apply scope) If an entry is renamed and moved out of scope it will be handled like a deletie and in addition its memberof attribute is removed. https://fedorahosted.org/389/ticket/47526 Reviewed by: Thierry,Rich,Noriko -Thanks diff --git a/ldap/servers/plugins/memberof/memberof.c b/ldap/servers/plugins/memberof/memberof.c index 67ef860..4796644 100644 --- a/ldap/servers/plugins/memberof/memberof.c +++ b/ldap/servers/plugins/memberof/memberof.c @@ -666,6 +666,7 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, Slapi_DN *sdn, char *filter_str = NULL; char *cookie = NULL; int all_backends = memberof_config_get_all_backends(); + Slapi_DN *entry_scope = memberof_config_get_entry_scope(); int types_name_len = 0; int num_types = 0; int dn_len = slapi_sdn_get_ndn_len(sdn); @@ -673,6 +674,10 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, Slapi_DN *sdn, int rc = 0; int i = 0; + if (entry_scope && !slapi_sdn_issuffix(sdn, entry_scope)) { + return (rc); + } + /* Count the number of types. */ for (num_types = 0; types && types[num_types]; num_types++) { @@ -741,6 +746,21 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, Slapi_DN *sdn, continue; } } + if (entry_scope) { + if (slapi_sdn_issuffix(base_sdn, entry_scope)) { + /* do nothing, entry scope is spanning + * multiple suffixes, start at suffix */ + } else if (slapi_sdn_issuffix(entry_scope, base_sdn)) { + /* scope is below suffix, set search base */ + base_sdn = entry_scope; + } else if(!all_backends){ + break; + } else { + /* its ok, goto the next backend */ + be = slapi_get_next_backend(cookie); + continue; + } + } slapi_search_internal_set_pb(search_pb, slapi_sdn_get_dn(base_sdn), LDAP_SCOPE_SUBTREE, filter_str, 0, 0, 0, 0, memberof_get_plugin_id(), 0); @@ -770,6 +790,7 @@ int memberof_postop_modrdn(Slapi_PBlock *pb) { int ret = SLAPI_PLUGIN_SUCCESS; void *caller_id = NULL; + Slapi_DN *entry_scope = memberof_config_get_entry_scope(); slapi_log_error( SLAPI_LOG_TRACE, MEMBEROF_PLUGIN_SUBSYSTEM, "--> memberof_postop_modrdn\n" ); @@ -833,7 +854,13 @@ int memberof_postop_modrdn(Slapi_PBlock *pb) * of other group entries. We need to update any member * attributes to refer to the new name. */ if (pre_sdn && post_sdn) { - memberof_replace_dn_from_groups(pb, &configCopy, pre_sdn, post_sdn); + if (entry_scope && !slapi_sdn_issuffix(post_sdn, entry_scope)) { + memberof_del_dn_data del_data = {0, configCopy.memberof_attr}; + memberof_del_dn_from_groups(pb, &configCopy, pre_sdn); + memberof_del_dn_type_callback(post_e, &del_data); + } else { + memberof_replace_dn_from_groups(pb, &configCopy, pre_sdn, post_sdn); + } } memberof_unlock(); diff --git a/ldap/servers/plugins/memberof/memberof.h b/ldap/servers/plugins/memberof/memberof.h index d308022..46da1c3 100644 --- a/ldap/servers/plugins/memberof/memberof.h +++ b/ldap/servers/plugins/memberof/memberof.h @@ -67,6 +67,7 @@ #define MEMBEROF_GROUP_ATTR "memberOfGroupAttr" #define MEMBEROF_ATTR "memberOfAttr" #define MEMBEROF_BACKEND_ATTR "memberOfAllBackends" +#define MEMBEROF_ENTRY_SCOPE_ATTR "memberOfEntryScope" #define DN_SYNTAX_OID "1.3.6.1.4.1.1466.115.121.1.12" #define NAME_OPT_UID_SYNTAX_OID "1.3.6.1.4.1.1466.115.121.1.34" @@ -78,6 +79,7 @@ typedef struct memberofconfig { char **groupattrs; char *memberof_attr; int allBackends; + Slapi_DN *entryScope; Slapi_Filter *group_filter; Slapi_Attr **group_slapiattrs; } MemberOfConfig; @@ -96,6 +98,7 @@ void memberof_rlock_config(); void memberof_wlock_config(); void memberof_unlock_config(); int memberof_config_get_all_backends(); +Slapi_DN * memberof_config_get_entry_scope(); void memberof_set_config_area(Slapi_DN *sdn); Slapi_DN * memberof_get_config_area(); void memberof_set_plugin_area(Slapi_DN *sdn); diff --git a/ldap/servers/plugins/memberof/memberof_config.c b/ldap/servers/plugins/memberof/memberof_config.c index e7e807b..58b35f6 100644 --- a/ldap/servers/plugins/memberof/memberof_config.c +++ b/ldap/servers/plugins/memberof/memberof_config.c @@ -77,7 +77,7 @@ static int memberof_search (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_En /* This is the main configuration which is updated from dse.ldif. The * config will be copied when it is used by the plug-in to prevent it * being changed out from under a running memberOf operation. */ -static MemberOfConfig theConfig; +static MemberOfConfig theConfig = {NULL, NULL,0, NULL, NULL, NULL}; static Slapi_RWLock *memberof_config_lock = 0; static int inited = 0; @@ -310,6 +310,7 @@ memberof_apply_config (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry* int num_groupattrs = 0; int groupattr_name_len = 0; char *allBackends = NULL; + char *entryScope = NULL; char *sharedcfg = NULL; *returncode = LDAP_SUCCESS; @@ -360,6 +361,7 @@ memberof_apply_config (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry* groupattrs = slapi_entry_attr_get_charray(e, MEMBEROF_GROUP_ATTR); memberof_attr = slapi_entry_attr_get_charptr(e, MEMBEROF_ATTR); allBackends = slapi_entry_attr_get_charptr(e, MEMBEROF_BACKEND_ATTR); + entryScope = slapi_entry_attr_get_charptr(e, MEMBEROF_ENTRY_SCOPE_ATTR); /* We want to be sure we don't change the config in the middle of * a memberOf operation, so we obtain an exclusive lock here */ @@ -469,6 +471,22 @@ memberof_apply_config (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry* theConfig.allBackends = 0; } + slapi_sdn_free(&theConfig.entryScope); + if (entryScope) + { + if (slapi_dn_syntax_check(NULL, entryScope, 1) == 1) { + slapi_log_error(SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM, + "Error: Ignoring invalid DN used as plugin entry scope: [%s]\n", + entryScope); + theConfig.entryScope = NULL; + slapi_ch_free_string(&entryScope); + } else { + theConfig.entryScope = slapi_sdn_new_dn_passin(entryScope); + } + } else { + theConfig.entryScope = NULL; + } + /* release the lock */ memberof_unlock_config(); @@ -648,6 +666,18 @@ memberof_config_get_all_backends() return all_backends; } +Slapi_DN * +memberof_config_get_entry_scope() +{ + Slapi_DN *entry_scope; + + slapi_rwlock_rdlock(memberof_config_lock); + entry_scope = theConfig.entryScope; + slapi_rwlock_unlock(memberof_config_lock); + + return entry_scope; +} + /* * Check if we are modifying the config, or changing the shared config entry */

1 0

ldap/servers
by Noriko Hosoi 04 Dec '13

04 Dec '13

ldap/servers/slapd/ssl.c | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) New commits: commit 5d60dab087712ac2a7d84613e49a0c110cdf8df1 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Wed Dec 4 10:41:53 2013 -0800 Ticket #605 - support TLS 1.1 - adding backward compatibility Description: commit 88d4beccb9d9f7bb89f5e24c47828d7516ba7ca8 always expected the NSS version supporting TLS 1.2. It broke the build on the system having the NSS version that only supports TLS 1.1 (and older). This patch checks the NSS version and switches the supported TLS in ssl.c based upon the version info. https://fedorahosted.org/389/ticket/605 Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!) diff --git a/ldap/servers/slapd/ssl.c b/ldap/servers/slapd/ssl.c index 7b9bf2a..95bfa5c 100644 --- a/ldap/servers/slapd/ssl.c +++ b/ldap/servers/slapd/ssl.c @@ -80,9 +80,19 @@ #define MAXPATHLEN 1024 #endif +#if NSS_VMAJOR * 100 + NSS_VMINOR >= 315 +#define NSS_TLS12 1 +#elif NSS_VMAJOR * 100 + NSS_VMINOR >= 314 +#define NSS_TLS11 1 +#else +#define NSS_TLS10 1 +#endif + extern char* slapd_SSL3ciphers; extern symbol_t supported_ciphers[]; +#if !defined(NSS_TLS10) /* NSS_TLS11 or newer */ static SSLVersionRange enabledNSSVersions; +#endif /* dongle_file_name is set in slapd_nss_init when we set the path for the key, cert, and secmod files - the dongle file must be in the same directory @@ -166,11 +176,12 @@ static cipherstruct _conf_ciphers[] = { /*{"TLS","tls_dhe_dss_1024_des_sha", TLS_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA}, */ {"TLS","tls_dhe_dss_1024_rc4_sha", TLS_RSA_EXPORT1024_WITH_RC4_56_SHA}, {"TLS","tls_dhe_dss_rc4_128_sha", TLS_DHE_DSS_WITH_RC4_128_SHA}, - /* New in NSS 3.14 */ +#if defined(NSS_TLS12) + /* New in NSS 3.15 */ {"TLS","tls_rsa_aes_128_gcm_sha", TLS_RSA_WITH_AES_128_GCM_SHA256}, {"TLS","tls_dhe_rsa_aes_128_gcm_sha", TLS_DHE_RSA_WITH_AES_128_GCM_SHA256}, {"TLS","tls_dhe_dss_aes_128_gcm_sha", TLS_DHE_DSS_WITH_AES_128_GCM_SHA256}, - +#endif {NULL, NULL, 0} }; @@ -523,6 +534,7 @@ warn_if_no_key_file(const char *dir, int no_log) return ret; } +#if !defined(NSS_TLS10) /* NSS_TLS11 or newer */ typedef struct _nss_version_list { PRUint16 vnum; char* vname; @@ -533,7 +545,9 @@ NSSVersion_list _NSSVersion_list[] = {SSL_LIBRARY_VERSION_3_0, "SSL3"}, {SSL_LIBRARY_VERSION_TLS_1_0, "TLS1.0"}, {SSL_LIBRARY_VERSION_TLS_1_1, "TLS1.1"}, +#if defined(NSS_TLS12) {SSL_LIBRARY_VERSION_TLS_1_2, "TLS1.2"}, +#endif {0, "unknown"} }; @@ -637,6 +651,7 @@ restrict_SSLVersionRange(SSLVersionRange *sslversion, PRBool enableSSL3, PRBool getNSSVersion_str(sslversion->max)); } } +#endif /* * slapd_nss_init() is always called from main(), even if we do not @@ -662,6 +677,7 @@ slapd_nss_init(int init_ssl, int config_available) char *certdb_file_name = NULL; char *keydb_file_name = NULL; char *secmoddb_file_name = NULL; +#if !defined(NSS_TLS10) /* NSS_TLS11 or newer */ /* Get the range of the supported SSL version */ SSL_VersionRangeGetSupported(ssl_variant_stream, &enabledNSSVersions); @@ -669,6 +685,7 @@ slapd_nss_init(int init_ssl, int config_available) "supported range: min: %s, max: %s\n", getNSSVersion_str(enabledNSSVersions.min), getNSSVersion_str(enabledNSSVersions.max)); +#endif /* set in slapd_bootstrap_config, thus certdir is available even if config_available is false */ @@ -982,6 +999,7 @@ slapd_ssl_init() { } +#if !defined(NSS_TLS10) /* NSS_TLS11 or newer */ /* * val: sslVersionMin/Max value set in cn=encription,cn=config (INPUT) * rval: Corresponding value to set SSLVersionRange (OUTPUT) @@ -1113,6 +1131,7 @@ set_NSS_version(char *val, PRUint16 *rval, int ismin) } } } else if (tlsv < 1.3) { /* TLS1.2 */ +#if defined(NSS_TLS12) if (ismin) { if (enabledNSSVersions.min > SSL_LIBRARY_VERSION_TLS_1_2) { slapd_SSL_warn("Security Initialization: The value of sslVersionMin " @@ -1135,17 +1154,18 @@ set_NSS_version(char *val, PRUint16 *rval, int ismin) (*rval) = SSL_LIBRARY_VERSION_TLS_1_2; } } - } else { /* TLS newer than 1.2 */ +#endif + } else { /* Specified TLS is newer than supported */ if (ismin) { slapd_SSL_warn("Security Initialization: The value of sslVersionMin " "\"%s\" is out of the range of the supported version; " - "the default value \"%s\" is used.\n", + "the default value \"%s\" is used.\n", val, getNSSVersion_str(enabledNSSVersions.min)); (*rval) = enabledNSSVersions.min; } else { slapd_SSL_warn("Security Initialization: The value of sslVersionMax " "\"%s\" is out of the range of the supported version; " - "the default value \"%s\" is used.\n", + "the default value \"%s\" is used.\n", val, getNSSVersion_str(enabledNSSVersions.min)); (*rval) = enabledNSSVersions.max; } @@ -1153,12 +1173,12 @@ set_NSS_version(char *val, PRUint16 *rval, int ismin) } else { if (ismin) { slapd_SSL_warn("Security Initialization: The value of sslVersionMin " - "\"%s\" is invalid; the default value \"%s\" is used.\n", + "\"%s\" is invalid; the default value \"%s\" is used.\n", val, getNSSVersion_str(enabledNSSVersions.min)); (*rval) = enabledNSSVersions.min; } else { slapd_SSL_warn("Security Initialization: The value of sslVersionMax " - "\"%s\" is invalid; the default value \"%s\" is used.\n", + "\"%s\" is invalid; the default value \"%s\" is used.\n", val, getNSSVersion_str(enabledNSSVersions.min)); (*rval) = enabledNSSVersions.max; } @@ -1169,6 +1189,7 @@ set_NSS_version(char *val, PRUint16 *rval, int ismin) #undef SSLLEN #undef TLSSTR #undef TLSLEN +#endif int slapd_ssl_init2(PRFileDesc **fd, int startTLS) @@ -1191,8 +1212,10 @@ slapd_ssl_init2(PRFileDesc **fd, int startTLS) PRBool enableSSL3 = PR_TRUE; PRBool enableTLS1 = PR_TRUE; PRBool fipsMode = PR_FALSE; +#if !defined(NSS_TLS10) /* NSS_TLS11 or newer */ PRUint16 NSSVersionMin = enabledNSSVersions.min; PRUint16 NSSVersionMax = enabledNSSVersions.max; +#endif /* turn off the PKCS11 pin interactive mode */ #ifndef _WIN32 @@ -1536,6 +1559,7 @@ slapd_ssl_init2(PRFileDesc **fd, int startTLS) } } slapi_ch_free_string( &val ); +#if !defined(NSS_TLS10) /* NSS_TLS11 or newer */ val = slapi_entry_attr_get_charptr( e, "sslVersionMin" ); if ( val ) { (void)set_NSS_version(val, &NSSVersionMin, 1); @@ -1557,7 +1581,9 @@ slapd_ssl_init2(PRFileDesc **fd, int startTLS) NSSVersionMin = enabledNSSVersions.min; NSSVersionMax = enabledNSSVersions.max; } +#endif } +#if !defined(NSS_TLS10) /* NSS_TLS11 or newer */ if (NSSVersionMin > 0) { /* Use new NSS API SSL_VersionRangeSet (NSS3.14 or newer) */ SSLVersionRange myNSSVersions; @@ -1574,6 +1600,7 @@ slapd_ssl_init2(PRFileDesc **fd, int startTLS) getNSSVersion_str(myNSSVersions.max)); } } else { +#endif /* deprecated code */ sslStatus = SSL_OptionSet(pr_sock, SSL_ENABLE_SSL3, enableSSL3); if (sslStatus != SECSuccess) { @@ -1592,7 +1619,9 @@ slapd_ssl_init2(PRFileDesc **fd, int startTLS) enableTLS1 ? "enable" : "disable", errorCode, slapd_pr_strerror(errorCode)); } +#if !defined(NSS_TLS10) /* NSS_TLS11 or newer */ } +#endif freeConfigEntry( &e ); if(( slapd_SSLclientAuth = config_get_SSLclientAuth()) != SLAPD_SSLCLIENTAUTH_OFF ) {

1 0

dirsrvtests/tickets
by thierry bordaz 03 Dec '13

03 Dec '13

dirsrvtests/tickets/constants.py | 20 -- dirsrvtests/tickets/finalizer.py | 73 +++++++ dirsrvtests/tickets/ticket47560_test.py | 310 ++++++++++++++++++++++++++++++++ 3 files changed, 392 insertions(+), 11 deletions(-) New commits: commit 9ec7b929b5a1e2fd17a41cc5eadba79d28933d0c Author: Thierry bordaz (tbordaz) <tbordaz(a)redhat.com> Date: Tue Nov 5 18:01:32 2013 +0100 Ticket 47575 - CI test: add test case for ticket47560 Bug Description: https://fedorahosted.org/389/ticket/47560 memberof plugins supports fixup tasks. A task can be created with the perl script /usr/lib64/dirsrv/slapd-<instance>/fixup-memberof.pl due to bug 47560, the task entry was not created Fix Description: The test case is to SETUP - Create entry cn=group,SUFFIX - Create entry cn=member,SUFFIX - Update 'cn=member,SUFFIX' to add "memberOf: cn=group,SUFFIX" - Enable Memberof Plugins # Here the cn=member entry has a 'memberOf' but # cn=group entry does not contain 'cn=member' in its member TEST CASE - start the fixupmemberof task - read the cn=member entry - check 'memberOf is now empty TEARDOWN - Delete entry cn=group,SUFFIX - Delete entry cn=member,SUFFIX - Disable Memberof Plugins The test ends with stopping the standalone instance https://fedorahosted.org/389/ticket/47575 Reviewed by: Rich, Jan, Roberto (thanks to you all !!) Platforms tested: F19 Flag Day: no Doc impact: no diff --git a/dirsrvtests/tickets/constants.py b/dirsrvtests/tickets/constants.py index 88fdea5..44b9b3a 100644 --- a/dirsrvtests/tickets/constants.py +++ b/dirsrvtests/tickets/constants.py @@ -44,17 +44,15 @@ HOST_CONSUMER_2 = LOCALHOST PORT_CONSUMER_2 = 55389 SERVERID_CONSUMER_2 = 'consumer_2' -args_standalone = { - 'prefix': os.environ.get('PREFIX', None), - 'backupdir': os.environ.get('BACKUPDIR', "/tmp"), - 'newrootdn': DN_DM, - 'newrootpw': PASSWORD, - 'newhost': HOST_STANDALONE, - 'newport': PORT_STANDALONE, - 'newinstance': SERVERID_STANDALONE, - 'newsuffix': SUFFIX, - 'no_admin': True} - +# Each defined instance above must be added in that list +ALL_INSTANCES = [ {'host': HOST_STANDALONE, 'port': PORT_STANDALONE, 'serverid': SERVERID_STANDALONE}, + {'host': HOST_MASTER, 'port': PORT_MASTER, 'serverid': SERVERID_MASTER}, + {'host': HOST_CONSUMER, 'port': PORT_CONSUMER, 'serverid': SERVERID_CONSUMER}, + {'host': HOST_MASTER_1, 'port': PORT_MASTER_1, 'serverid': SERVERID_MASTER_1}, + {'host': HOST_MASTER_2, 'port': PORT_MASTER_2, 'serverid': SERVERID_MASTER_2}, + {'host': HOST_CONSUMER_1, 'port': PORT_CONSUMER_1, 'serverid': SERVERID_CONSUMER_1}, + {'host': HOST_CONSUMER_2, 'port': PORT_CONSUMER_2, 'serverid': SERVERID_CONSUMER_2}, + ] # This is a template args_instance = { 'prefix': os.environ.get('PREFIX', None), diff --git a/dirsrvtests/tickets/finalizer.py b/dirsrvtests/tickets/finalizer.py new file mode 100644 index 0000000..23356dd --- /dev/null +++ b/dirsrvtests/tickets/finalizer.py @@ -0,0 +1,73 @@ +''' +Created on Nov 5, 2013 + +@author: tbordaz +''' +import os +import sys +import time +import ldap +import logging +import socket +import time +import logging +import pytest +from lib389 import DirSrv, Entry, tools +from lib389.tools import DirSrvTools +from lib389._constants import DN_DM +from constants import * + +log = logging.getLogger(__name__) + +global installation_prefix + + +def _remove_instance(args): + + # check the instance parameters + args_instance['newhost'] = args.get('host', None) + if not args_instance['newhost']: + raise ValueError("host not defined") + + args_instance['newport'] = args.get('port', None) + if not args_instance['newport']: + raise ValueError("port not defined") + + args_instance['newinstance'] = args.get('serverid', None) + if not args_instance['newinstance']: + raise ValueError("serverid not defined") + + args_instance['prefix'] = args.get('prefix', None) + + # Get the status of the instance and remove it if it exists + instance = DirSrvTools.existsInstance(args_instance) + if instance: + log.debug("_remove_instance %s %s:%d" % (instance.serverId, instance.host, instance.port)) + DirSrvTools.removeInstance(instance) + + +def test_finalizer(): + global installation_prefix + + # for each defined instance, remove it + for instance in ALL_INSTANCES: + if installation_prefix: + # overwrite the environment setting + instance['prefix'] = installation_prefix + _remove_instance(instance) + +def run_isolated(): + ''' + run_isolated is used to run these test cases independently of a test scheduler (xunit, py.test..) + To run isolated without py.test, you need to + - set the installation prefix + - run this program + ''' + global installation_prefix + installation_prefix = None + + test_finalizer() + +if __name__ == '__main__': + run_isolated() + diff --git a/dirsrvtests/tickets/ticket47560_test.py b/dirsrvtests/tickets/ticket47560_test.py new file mode 100644 index 0000000..1561f21 --- /dev/null +++ b/dirsrvtests/tickets/ticket47560_test.py @@ -0,0 +1,310 @@ +import os +import sys +import time +import ldap +import logging +import socket +import time +import logging +import pytest +from lib389 import DirSrv, Entry, tools +from lib389.tools import DirSrvTools +from lib389._constants import * +from constants import * + +log = logging.getLogger(__name__) + +installation_prefix = None + +def _ds_create_instance(args): + # create the standalone instance + return tools.DirSrvTools.createInstance(args, verbose=False) + +def _ds_rebind_instance(dirsrv): + args_instance['prefix'] = dirsrv.prefix + args_instance['backupdir'] = dirsrv.backupdir + args_instance['newrootdn'] = dirsrv.binddn + args_instance['newrootpw'] = dirsrv.bindpw + args_instance['newhost'] = dirsrv.host + args_instance['newport'] = dirsrv.port + args_instance['newinstance'] = dirsrv.serverId + args_instance['newsuffix'] = SUFFIX + args_instance['no_admin'] = True + + return tools.DirSrvTools.createInstance(args_instance) + +class TopologyStandalone(object): + def __init__(self, standalone): + self.standalone = _ds_rebind_instance(standalone) + + +(a)pytest.fixture(scope="module") +def topology(request): + ''' + This fixture is used to standalone topology for the 'module'. + At the beginning, It may exists a standalone instance. + It may also exists a backup for the standalone instance. + + Principle: + If standalone instance exists: + restart it + If backup of standalone exists: + create or rebind to standalone + + restore standalone instance from backup + else: + Cleanup everything + remove instance + remove backup + Create instance + Create backup + ''' + global installation_prefix + + if installation_prefix: + args_instance['prefix'] = installation_prefix + + # Args for the standalone instance + args_instance['newhost'] = HOST_STANDALONE + args_instance['newport'] = PORT_STANDALONE + args_instance['newinstance'] = SERVERID_STANDALONE + args_standalone = args_instance.copy() + + # Get the status of the backups + backup_standalone = DirSrvTools.existsBackup(args_standalone) + + # Get the status of the instance and restart it if it exists + instance_standalone = DirSrvTools.existsInstance(args_standalone) + if instance_standalone: + # assuming the instance is already stopped, just wait 5 sec max + DirSrvTools.stop(instance_standalone, timeout=5) + DirSrvTools.start(instance_standalone, timeout=10) + + if backup_standalone: + # The backup exist, assuming it is correct + # we just re-init the instance with it + standalone = _ds_create_instance(args_standalone) + + # restore standalone instance from backup + DirSrvTools.stop(standalone, timeout=10) + DirSrvTools.instanceRestoreFS(standalone, backup_standalone) + DirSrvTools.start(standalone, timeout=10) + + else: + # We should be here only in two conditions + # - This is the first time a test involve standalone instance + # - Something weird happened (instance/backup destroyed) + # so we discard everything and recreate all + + # Remove the backup. So even if we have a specific backup file + # (e.g backup_standalone) we clear backup that an instance may have created + if backup_standalone: + DirSrvTools.clearInstanceBackupFS(dirsrv=instance_standalone) + + # Remove the instance + if instance_standalone: + DirSrvTools.removeInstance(instance_standalone) + + # Create the instance + standalone = _ds_create_instance(args_standalone) + + # Time to create the backups + DirSrvTools.stop(standalone, timeout=10) + standalone.backupfile = DirSrvTools.instanceBackupFS(standalone) + DirSrvTools.start(standalone, timeout=10) + + # + # Here we have standalone instance up and running + # Either coming from a backup recovery + # or from a fresh (re)init + # Time to return the topology + return TopologyStandalone(standalone) + + +def test_ticket47560(topology): + """ + This test case does the following: + SETUP + - Create entry cn=group,SUFFIX + - Create entry cn=member,SUFFIX + - Update 'cn=member,SUFFIX' to add "memberOf: cn=group,SUFFIX" + - Enable Memberof Plugins + + # Here the cn=member entry has a 'memberOf' but + # cn=group entry does not contain 'cn=member' in its member + + TEST CASE + - start the fixupmemberof task + - read the cn=member entry + - check 'memberOf is now empty + + TEARDOWN + - Delete entry cn=group,SUFFIX + - Delete entry cn=member,SUFFIX + - Disable Memberof Plugins + """ + + def _enable_disable_mbo(value): + """ + Enable or disable mbo plugin depending on 'value' ('on'/'off') + """ + # enable/disable the mbo plugin + if value != 'on': + value = 'off' + log.debug("-------------> _enable_disable_mbo(%s)" % value) + MEMBEROF_PLUGIN_DN = 'cn=MemberOf Plugin,cn=plugins,cn=config' + replace = [(ldap.MOD_REPLACE, 'nsslapd-pluginEnabled', value)] + topology.standalone.modify_s(MEMBEROF_PLUGIN_DN, replace) + DirSrvTools.stop(topology.standalone, verbose=False, timeout=120) + time.sleep(1) + DirSrvTools.start(topology.standalone, verbose=False, timeout=120) + time.sleep(3) + + # need to reopen a connection toward the instance + topology.standalone = _ds_rebind_instance(topology.standalone) + + def _test_ticket47560_setup(): + """ + - Create entry cn=group,SUFFIX + - Create entry cn=member,SUFFIX + - Update 'cn=member,SUFFIX' to add "memberOf: cn=group,SUFFIX" + - Enable Memberof Plugins + """ + log.debug( "-------- > _test_ticket47560_setup\n") + + # + # By default the memberof plugin is disabled create + # - create a group entry + # - create a member entry + # - set the member entry as memberof the group entry + # + entry = Entry(group_DN) + entry.setValues('objectclass', 'top', 'groupOfNames', 'inetUser') + entry.setValues('cn', 'group') + try: + topology.standalone.add_s(entry) + except ldap.ALREADY_EXISTS: + log.debug( "Entry %s already exists" % (group_DN)) + + + entry = Entry(member_DN) + entry.setValues('objectclass', 'top', 'person', 'organizationalPerson', 'inetorgperson', 'inetUser') + entry.setValues('uid', 'member') + entry.setValues('cn', 'member') + entry.setValues('sn', 'member') + try: + topology.standalone.add_s(entry) + except ldap.ALREADY_EXISTS: + log.debug( "Entry %s already exists" % (member_DN)) + + replace = [(ldap.MOD_REPLACE, 'memberof', group_DN)] + topology.standalone.modify_s(member_DN, replace) + + + # + # enable the memberof plugin and restart the instance + # + _enable_disable_mbo('on') + + + # + # check memberof attribute is still present + # + filt = 'uid=member' + ents = topology.standalone.search_s(member_DN, ldap.SCOPE_BASE, filt) + assert len(ents) == 1 + ent = ents[0] + #print ent + value = ent.getValue('memberof') + #print "memberof: %s" % (value) + assert value == group_DN + + def _test_ticket47560_teardown(): + """ + - Delete entry cn=group,SUFFIX + - Delete entry cn=member,SUFFIX + - Disable Memberof Plugins + """ + log.debug( "-------- > _test_ticket47560_teardown\n") + # remove the entries group_DN and member_DN + try: + topology.standalone.delete_s(group_DN) + except: + log.warning("Entry %s fail to delete" % (group_DN)) + try: + topology.standalone.delete_s(member_DN) + except: + log.warning("Entry %s fail to delete" % (member_DN)) + # + # disable the memberof plugin and restart the instance + # + _enable_disable_mbo('off') + + + + group_DN = "cn=group,%s" % (SUFFIX) + member_DN = "uid=member,%s" % (SUFFIX) + + # + # Initialize the test case + # + _test_ticket47560_setup() + + # + # start the test + # - start the fixup task + # - check the entry is fixed (no longer memberof the group) + # + log.debug( "-------- > Start ticket tests\n") + + filt = 'uid=member' + ents = topology.standalone.search_s(member_DN, ldap.SCOPE_BASE, filt) + assert len(ents) == 1 + ent = ents[0] + log.debug( "Unfixed entry %r\n" % ent) + + # run the fixup task + topology.standalone.fixupMemberOf(SUFFIX, verbose=False) + + ents = topology.standalone.search_s(member_DN, ldap.SCOPE_BASE, filt) + assert len(ents) == 1 + ent = ents[0] + log.debug( "Fixed entry %r\n" % ent) + + if ent.getValue('memberof') == group_DN: + log.warning("Error the fixupMemberOf did not fix %s" % (member_DN)) + result_successful = False + else: + result_successful = True + + # + # cleanup up the test case + # + _test_ticket47560_teardown() + + assert result_successful == True + +def test_ticket47560_final(topology): + DirSrvTools.stop(topology.standalone, timeout=10) + + + +def run_isolated(): + ''' + run_isolated is used to run these test cases independently of a test scheduler (xunit, py.test..) + To run isolated without py.test, you need to + - edit this file and comment '@pytest.fixture' line before 'topology' function. + - set the installation prefix + - run this program + ''' + global installation_prefix + installation_prefix = None + + topo = topology(True) + test_ticket47560(topo) + test_ticket47560_final(topo) + + +if __name__ == '__main__': + run_isolated() +

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits December 2013