389-commits July 2012

389-commits@lists.fedoraproject.org

3 participants
22 discussions

Branch '389-ds-base-1.2.11' - ldap/servers
by Noriko Hosoi 25 Jul '12

25 Jul '12

ldap/servers/slapd/back-ldbm/dblayer.c | 39 ++++++++++++++++++++----- ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 1 ldap/servers/slapd/back-ldbm/start.c | 36 +++++++++++++++++++++-- 3 files changed, 66 insertions(+), 10 deletions(-) New commits: commit 43a71e34c9f916cecdcc371047ba5219478c5dd0 Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com> Date: Wed Jul 25 10:19:14 2012 -0700 Trac Ticket #409 - Report during startup if nsslapd-cachememsize is too small https://fedorahosted.org/389/ticket/409 Fix description: adding a code to compare the entry cache size with the main db file (id2entry.db) size. If the entry cache size is less than the db file size, it logs the warning in the error log. (cherry picked from commit 950c0c6bf7515e02f88543e8f477ec717725849f) diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c index ed90e2d..e6141d2 100644 --- a/ldap/servers/slapd/back-ldbm/dblayer.c +++ b/ldap/servers/slapd/back-ldbm/dblayer.c @@ -1892,6 +1892,30 @@ check_and_set_import_cache(struct ldbminfo *li) return 0; } +size_t +dblayer_get_id2entry_size(ldbm_instance *inst) +{ + struct ldbminfo *li = NULL; + char *id2entry_file = NULL; + PRFileInfo info; + int rc; + char inst_dir[MAXPATHLEN], *inst_dirp; + + if (NULL == inst) { + return 0; + } + li = inst->inst_li; + inst_dirp = dblayer_get_full_inst_dir(li, inst, inst_dir, MAXPATHLEN); + id2entry_file = slapi_ch_smprintf("%s/%s", inst_dirp, + ID2ENTRY LDBM_FILENAME_SUFFIX); + rc = PR_GetFileInfo(id2entry_file, &info); + slapi_ch_free_string(&id2entry_file); + if (rc) { + return 0; + } + return info.size; +} + /* mode is one of * DBLAYER_NORMAL_MODE, * DBLAYER_INDEX_MODE, @@ -2254,7 +2278,7 @@ int dblayer_instance_start(backend *be, int mode) dbp->set_cache_priority(dbp, DB_PRIORITY_LOW); #endif out: - slapi_ch_free((void**)&id2entry_file); + slapi_ch_free_string(&id2entry_file); } if (0 == return_value) { @@ -2511,16 +2535,17 @@ err: (*ppEnv)->close(*ppEnv, 0); *ppEnv = NULL; } - if (id2entry_file) { - slapi_ch_free_string(&id2entry_file); - } if (priv->dblayer_home_directory) { ldbm_delete_dirs(priv->dblayer_home_directory); } done: - if ((0 == rval) && path) { /* only when successfull */ - *path = slapi_ch_smprintf("%s/%s", - inst->inst_parent_dir_name, id2entry_file); + if (path) { + if (0 == rval) { /* return the path only when successfull */ + *path = slapi_ch_smprintf("%s/%s", inst->inst_parent_dir_name, + id2entry_file); + } else { + *path = NULL; + } } slapi_ch_free_string(&id2entry_file); if (priv) { diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h index 03e0b11..be4120a 100644 --- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h +++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h @@ -174,6 +174,7 @@ int dblayer_db_uses_mpool(DB_ENV *db_env); int dblayer_db_uses_logging(DB_ENV *db_env); int dblayer_bt_compare(DB *db, const DBT *dbt1, const DBT *dbt2); int dblayer_remove_env(struct ldbminfo *li); +size_t dblayer_get_id2entry_size(ldbm_instance *inst); int ldbm_back_get_info(Slapi_Backend *be, int cmd, void **info); int ldbm_back_set_info(Slapi_Backend *be, int cmd, void *info); diff --git a/ldap/servers/slapd/back-ldbm/start.c b/ldap/servers/slapd/back-ldbm/start.c index 61146fe..0f42bed 100644 --- a/ldap/servers/slapd/back-ldbm/start.c +++ b/ldap/servers/slapd/back-ldbm/start.c @@ -135,9 +135,7 @@ ldbm_back_start( Slapi_PBlock *pb ) (li->li_cache_autosize + li->li_import_cache_autosize > 100))) { LDAPDebug( LDAP_DEBUG_ANY, "cache autosizing: bad settings, " "value or sum of values can not larger than 100.\n", 0, 0, 0 ); - } else - /* if cache autosize was selected, select the cache sizes now */ - if ((li->li_cache_autosize > 0) || (li->li_import_cache_autosize > 0)) { + } else { size_t pagesize, pages, procpages, availpages; dblayer_sys_pages(&pagesize, &pages, &procpages, &availpages); @@ -147,6 +145,38 @@ ldbm_back_start( Slapi_PBlock *pb ) int zone_pages, db_pages, entry_pages, import_pages; Object *inst_obj; ldbm_instance *inst; + size_t cache_size; + size_t db_size; + size_t total_cache_size = 0; + size_t memsize = pages * pagesize; + size_t extra = 0; /* e.g., dncache size */ + + for (inst_obj = objset_first_obj(li->li_instance_set); inst_obj; + inst_obj = objset_next_obj(li->li_instance_set, inst_obj)) { + inst = (ldbm_instance *)object_get_data(inst_obj); + cache_size = cache_get_max_size(&(inst->inst_cache)); + db_size = dblayer_get_id2entry_size(inst); + if (cache_size < db_size) { + LDAPDebug(LDAP_DEBUG_ANY, + "WARNING: %s: entry cache size %luB is " + "less than db size %luB; " + "We recommend to increase the entry cache size " + "nsslapd-cachememsize.\n", + inst->inst_name, cache_size, db_size); + } else { + LDAPDebug(LDAP_DEBUG_BACKLDBM, + "%s: entry cache size: %luB; db size: %luB\n", + inst->inst_name, cache_size, db_size); + } + total_cache_size += cache_size; + /* estimated overhead: dncache size * 2 */ + extra += cache_get_max_size(&(inst->inst_dncache)) * 2; + } + LDAPDebug(LDAP_DEBUG_BACKLDBM, + "Total entry cache size: %luB; " + "dbcache size: %luB; " + "available memory size: %luB\n", + total_cache_size, li->li_dbcachesize, memsize - extra); /* autosizing dbCache and entryCache */ if (li->li_cache_autosize > 0) { zone_pages = (li->li_cache_autosize * pages) / 100;

1 0

ldap/servers
by Noriko Hosoi 25 Jul '12

25 Jul '12

ldap/servers/slapd/back-ldbm/dblayer.c | 39 ++++++++++++++++++++----- ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 1 ldap/servers/slapd/back-ldbm/start.c | 36 +++++++++++++++++++++-- 3 files changed, 66 insertions(+), 10 deletions(-) New commits: commit 950c0c6bf7515e02f88543e8f477ec717725849f Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com> Date: Wed Jul 25 10:19:14 2012 -0700 Trac Ticket #409 - Report during startup if nsslapd-cachememsize is too small https://fedorahosted.org/389/ticket/409 Fix description: adding a code to compare the entry cache size with the main db file (id2entry.db) size. If the entry cache size is less than the db file size, it logs the warning in the error log. diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c index eb32709..5452d6b 100644 --- a/ldap/servers/slapd/back-ldbm/dblayer.c +++ b/ldap/servers/slapd/back-ldbm/dblayer.c @@ -1892,6 +1892,30 @@ check_and_set_import_cache(struct ldbminfo *li) return 0; } +size_t +dblayer_get_id2entry_size(ldbm_instance *inst) +{ + struct ldbminfo *li = NULL; + char *id2entry_file = NULL; + PRFileInfo info; + int rc; + char inst_dir[MAXPATHLEN], *inst_dirp; + + if (NULL == inst) { + return 0; + } + li = inst->inst_li; + inst_dirp = dblayer_get_full_inst_dir(li, inst, inst_dir, MAXPATHLEN); + id2entry_file = slapi_ch_smprintf("%s/%s", inst_dirp, + ID2ENTRY LDBM_FILENAME_SUFFIX); + rc = PR_GetFileInfo(id2entry_file, &info); + slapi_ch_free_string(&id2entry_file); + if (rc) { + return 0; + } + return info.size; +} + /* mode is one of * DBLAYER_NORMAL_MODE, * DBLAYER_INDEX_MODE, @@ -2254,7 +2278,7 @@ int dblayer_instance_start(backend *be, int mode) dbp->set_cache_priority(dbp, DB_PRIORITY_LOW); #endif out: - slapi_ch_free((void**)&id2entry_file); + slapi_ch_free_string(&id2entry_file); } if (0 == return_value) { @@ -2511,16 +2535,17 @@ err: (*ppEnv)->close(*ppEnv, 0); *ppEnv = NULL; } - if (id2entry_file) { - slapi_ch_free_string(&id2entry_file); - } if (priv->dblayer_home_directory) { ldbm_delete_dirs(priv->dblayer_home_directory); } done: - if ((0 == rval) && path) { /* only when successfull */ - *path = slapi_ch_smprintf("%s/%s", - inst->inst_parent_dir_name, id2entry_file); + if (path) { + if (0 == rval) { /* return the path only when successfull */ + *path = slapi_ch_smprintf("%s/%s", inst->inst_parent_dir_name, + id2entry_file); + } else { + *path = NULL; + } } slapi_ch_free_string(&id2entry_file); if (priv) { diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h index 03e0b11..be4120a 100644 --- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h +++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h @@ -174,6 +174,7 @@ int dblayer_db_uses_mpool(DB_ENV *db_env); int dblayer_db_uses_logging(DB_ENV *db_env); int dblayer_bt_compare(DB *db, const DBT *dbt1, const DBT *dbt2); int dblayer_remove_env(struct ldbminfo *li); +size_t dblayer_get_id2entry_size(ldbm_instance *inst); int ldbm_back_get_info(Slapi_Backend *be, int cmd, void **info); int ldbm_back_set_info(Slapi_Backend *be, int cmd, void *info); diff --git a/ldap/servers/slapd/back-ldbm/start.c b/ldap/servers/slapd/back-ldbm/start.c index 61146fe..0f42bed 100644 --- a/ldap/servers/slapd/back-ldbm/start.c +++ b/ldap/servers/slapd/back-ldbm/start.c @@ -135,9 +135,7 @@ ldbm_back_start( Slapi_PBlock *pb ) (li->li_cache_autosize + li->li_import_cache_autosize > 100))) { LDAPDebug( LDAP_DEBUG_ANY, "cache autosizing: bad settings, " "value or sum of values can not larger than 100.\n", 0, 0, 0 ); - } else - /* if cache autosize was selected, select the cache sizes now */ - if ((li->li_cache_autosize > 0) || (li->li_import_cache_autosize > 0)) { + } else { size_t pagesize, pages, procpages, availpages; dblayer_sys_pages(&pagesize, &pages, &procpages, &availpages); @@ -147,6 +145,38 @@ ldbm_back_start( Slapi_PBlock *pb ) int zone_pages, db_pages, entry_pages, import_pages; Object *inst_obj; ldbm_instance *inst; + size_t cache_size; + size_t db_size; + size_t total_cache_size = 0; + size_t memsize = pages * pagesize; + size_t extra = 0; /* e.g., dncache size */ + + for (inst_obj = objset_first_obj(li->li_instance_set); inst_obj; + inst_obj = objset_next_obj(li->li_instance_set, inst_obj)) { + inst = (ldbm_instance *)object_get_data(inst_obj); + cache_size = cache_get_max_size(&(inst->inst_cache)); + db_size = dblayer_get_id2entry_size(inst); + if (cache_size < db_size) { + LDAPDebug(LDAP_DEBUG_ANY, + "WARNING: %s: entry cache size %luB is " + "less than db size %luB; " + "We recommend to increase the entry cache size " + "nsslapd-cachememsize.\n", + inst->inst_name, cache_size, db_size); + } else { + LDAPDebug(LDAP_DEBUG_BACKLDBM, + "%s: entry cache size: %luB; db size: %luB\n", + inst->inst_name, cache_size, db_size); + } + total_cache_size += cache_size; + /* estimated overhead: dncache size * 2 */ + extra += cache_get_max_size(&(inst->inst_dncache)) * 2; + } + LDAPDebug(LDAP_DEBUG_BACKLDBM, + "Total entry cache size: %luB; " + "dbcache size: %luB; " + "available memory size: %luB\n", + total_cache_size, li->li_dbcachesize, memsize - extra); /* autosizing dbCache and entryCache */ if (li->li_cache_autosize > 0) { zone_pages = (li->li_cache_autosize * pages) / 100;

1 0

Branch '389-ds-base-1.2.11' - ldap/servers
by Noriko Hosoi 23 Jul '12

23 Jul '12

ldap/servers/plugins/memberof/memberof.c | 342 ++++++++++++++++--------------- ldap/servers/slapd/attr.c | 69 ++++-- ldap/servers/slapd/slapi-plugin.h | 23 +- ldap/servers/slapd/value.c | 8 4 files changed, 263 insertions(+), 179 deletions(-) New commits: commit f16d3a03743bcf129e1cfd55c9717e0177f7cdec Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Tue Jul 17 17:26:09 2012 -0700 Trac Ticket #412 - memberof performance enhancement https://fedorahosted.org/389/ticket/412 Fix description: memberof.c: replaced DN strings with Slapi_DN and set the normalized info to Slapi_Value flags. It reduces the number of slaip_dn_normalize_ext call by ~25%. attr.c, slapi-plugin.h: introduced a new API slapi_attr_ value_cmp_ext which takes Slapi_Value instead of struct berval. By replacing with Slapi_Value, the value flag (e.g., normalized info) can be passed to the syntax plugin. value.c: changed slapi_value_compare to call slapi_attr_ value_cmp_ext instead of slapi_attr_value_cmp. (cherry picked from commit 6a21e8e9be90de76549b8fb37dc744ca48234e00) diff --git a/ldap/servers/plugins/memberof/memberof.c b/ldap/servers/plugins/memberof/memberof.c index c98d8ad..8deed0f 100644 --- a/ldap/servers/plugins/memberof/memberof.c +++ b/ldap/servers/plugins/memberof/memberof.c @@ -108,57 +108,60 @@ static int memberof_postop_close(Slapi_PBlock *pb); /* supporting cast */ static int memberof_oktodo(Slapi_PBlock *pb); -static char *memberof_getdn(Slapi_PBlock *pb); +static Slapi_DN *memberof_getsdn(Slapi_PBlock *pb); static int memberof_modop_one(Slapi_PBlock *pb, MemberOfConfig *config, int mod_op, - char *op_this, char *op_to); + Slapi_DN *op_this_sdn, Slapi_DN *op_to_sdn); static int memberof_modop_one_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod_op, - char *group_dn, char *op_this, char *op_to, memberofstringll *stack); -static int memberof_add_one(Slapi_PBlock *pb, MemberOfConfig *config, char *addthis, - char *addto); -static int memberof_del_one(Slapi_PBlock *pb, MemberOfConfig *config, char *delthis, - char *delfrom); -static int memberof_mod_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, int mod, - char *groupdn, Slapi_Mod *smod); + Slapi_DN *group_sdn, Slapi_DN *op_this_sdn, Slapi_DN *op_to_sdn, + memberofstringll *stack); +static int memberof_add_one(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *addthis_sdn, Slapi_DN *addto_sdn); +static int memberof_del_one(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *delthis_sdn, Slapi_DN *delfrom_sdn); +static int memberof_mod_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, + int mod, Slapi_DN *group_sdn, Slapi_Mod *smod); static int memberof_add_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *groupdn, Slapi_Mod *smod); + Slapi_DN *group_sdn, Slapi_Mod *smod); static int memberof_del_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *groupdn, Slapi_Mod *smod); + Slapi_DN *group_sdn, Slapi_Mod *smod); static int memberof_mod_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, int mod, - char *groupdn, Slapi_Attr *attr); + Slapi_DN *group_sdn, Slapi_Attr *attr); static int memberof_mod_attr_list_r(Slapi_PBlock *pb, MemberOfConfig *config, - int mod, char *group_dn, char *op_this, Slapi_Attr *attr, memberofstringll *stack); + int mod, Slapi_DN *group_sdn, Slapi_DN *op_this_sdn, Slapi_Attr *attr, + memberofstringll *stack); static int memberof_add_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *groupdn, Slapi_Attr *attr); + Slapi_DN *group_sdn, Slapi_Attr *attr); static int memberof_del_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *groupdn, Slapi_Attr *attr); + Slapi_DN *group_sdn, Slapi_Attr *attr); static int memberof_moddn_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *pre_dn, char *post_dn, Slapi_Attr *attr); -static int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group_dn); + Slapi_DN *pre_sdn, Slapi_DN *post_sdn, Slapi_Attr *attr); +static int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *group_sdn); static void memberof_set_plugin_id(void * plugin_id); static void *memberof_get_plugin_id(); static int memberof_compare(MemberOfConfig *config, const void *a, const void *b); static int memberof_qsort_compare(const void *a, const void *b); static void memberof_load_array(Slapi_Value **array, Slapi_Attr *attr); -static void memberof_del_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, char *dn); -static int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, +static void memberof_del_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, Slapi_DN *sdn); +static int memberof_call_foreach_dn(Slapi_PBlock *pb, Slapi_DN *sdn, char **types, plugin_search_entry_callback callback, void *callback_data); static int memberof_is_direct_member(MemberOfConfig *config, Slapi_Value *groupdn, Slapi_Value *memberdn); static int memberof_is_grouping_attr(char *type, MemberOfConfig *config); -static Slapi_ValueSet *memberof_get_groups(MemberOfConfig *config, char *memberdn); -static int memberof_get_groups_r(MemberOfConfig *config, char *memberdn, +static Slapi_ValueSet *memberof_get_groups(MemberOfConfig *config, Slapi_DN *member_sdn); +static int memberof_get_groups_r(MemberOfConfig *config, Slapi_DN *member_sdn, memberof_get_groups_data *data); static int memberof_get_groups_callback(Slapi_Entry *e, void *callback_data); static int memberof_test_membership(Slapi_PBlock *pb, MemberOfConfig *config, - char *group_dn); + Slapi_DN *group_sdn); static int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data); static int memberof_del_dn_type_callback(Slapi_Entry *e, void *callback_data); static int memberof_replace_dn_type_callback(Slapi_Entry *e, void *callback_data); static void memberof_replace_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, - char *pre_dn, char *post_dn); + Slapi_DN *pre_sdn, Slapi_DN *post_sdn); static int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, - int mod_op, char *group_dn, char *op_this, char *replace_with, char *op_to, - memberofstringll *stack); + int mod_op, Slapi_DN *group_sdn, Slapi_DN *op_this_sdn, + Slapi_DN *replace_with_sdn, Slapi_DN *op_to_sdn, memberofstringll *stack); static int memberof_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, char *returntext, void *arg); @@ -379,7 +382,7 @@ int memberof_postop_del(Slapi_PBlock *pb) { int ret = 0; MemberOfConfig configCopy = {0, 0, 0, 0}; - char *normdn; + Slapi_DN *sdn; void *caller_id = NULL; slapi_log_error( SLAPI_LOG_TRACE, MEMBEROF_PLUGIN_SUBSYSTEM, @@ -393,7 +396,7 @@ int memberof_postop_del(Slapi_PBlock *pb) return 0; } - if(memberof_oktodo(pb) && (normdn = memberof_getdn(pb))) + if(memberof_oktodo(pb) && (sdn = memberof_getsdn(pb))) { struct slapi_entry *e = NULL; @@ -413,7 +416,7 @@ int memberof_postop_del(Slapi_PBlock *pb) /* remove this DN from the * membership lists of groups */ - memberof_del_dn_from_groups(pb, &configCopy, normdn); + memberof_del_dn_from_groups(pb, &configCopy, sdn); /* is the entry of interest as a group? */ if(e && configCopy.group_filter && !slapi_filter_test_simple(e, configCopy.group_filter)) @@ -426,7 +429,7 @@ int memberof_postop_del(Slapi_PBlock *pb) { if (0 == slapi_entry_attr_find(e, configCopy.groupattrs[i], &attr)) { - memberof_del_attr_list(pb, &configCopy, normdn, attr); + memberof_del_attr_list(pb, &configCopy, sdn, attr); } } } @@ -449,7 +452,7 @@ typedef struct _memberof_del_dn_data /* Deletes a member dn from all groups that refer to it. */ static void -memberof_del_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, char *dn) +memberof_del_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, Slapi_DN *sdn) { int i = 0; char *groupattrs[2] = {0, 0}; @@ -459,12 +462,13 @@ memberof_del_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, char *dn) * same grouping attribute. */ for (i = 0; config->groupattrs[i]; i++) { - memberof_del_dn_data data = {dn, config->groupattrs[i]}; + memberof_del_dn_data data = {(char *)slapi_sdn_get_dn(sdn), + config->groupattrs[i]}; groupattrs[0] = config->groupattrs[i]; - memberof_call_foreach_dn(pb, dn, groupattrs, - memberof_del_dn_type_callback, &data); + memberof_call_foreach_dn(pb, sdn, groupattrs, + memberof_del_dn_type_callback, &data); } } @@ -510,19 +514,18 @@ int memberof_del_dn_type_callback(Slapi_Entry *e, void *callback_data) * is a user, you'd want "type" to be "member". If "dn" is a group, you * could want type to be either "member" or "memberOf" depending on the case. */ -int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, +int memberof_call_foreach_dn(Slapi_PBlock *pb, Slapi_DN *sdn, char **types, plugin_search_entry_callback callback, void *callback_data) { Slapi_PBlock *search_pb = NULL; Slapi_DN *base_sdn = NULL; Slapi_Backend *be = NULL; - Slapi_DN *sdn = NULL; char *filter_str = NULL; char *cookie = NULL; int all_backends = memberof_config_get_all_backends(); int types_name_len = 0; int num_types = 0; - int dn_len = strlen(dn); + int dn_len = slapi_sdn_get_ndn_len(sdn); int rc = 0; int i = 0; @@ -550,7 +553,7 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, for (i = 0; types[i]; i++) { bytes_out += snprintf(filter_str + bytes_out, filter_str_len - bytes_out, - "(%s=%s)", types[i], dn); + "(%s=%s)", types[i], slapi_sdn_get_ndn(sdn)); } /* Add end of filter. */ @@ -558,7 +561,8 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, } else if (num_types == 1) { - filter_str = slapi_ch_smprintf("(%s=%s)", types[0], dn); + filter_str = + slapi_ch_smprintf("(%s=%s)", types[0], slapi_sdn_get_ndn(sdn)); } if(filter_str == NULL){ @@ -569,7 +573,6 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, be = slapi_get_first_backend(&cookie); while(be){ if(!all_backends){ - sdn = slapi_sdn_new_normdn_byref(dn); be = slapi_be_select(sdn); if(be == NULL){ break; @@ -596,7 +599,6 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, be = slapi_get_next_backend(cookie); } - slapi_sdn_free(&sdn); slapi_pblock_destroy(search_pb); slapi_ch_free((void **)&cookie); slapi_ch_free_string(&filter_str); @@ -632,16 +634,16 @@ int memberof_postop_modrdn(Slapi_PBlock *pb) MemberOfConfig configCopy = {0, 0, 0, 0}; struct slapi_entry *pre_e = NULL; struct slapi_entry *post_e = NULL; - char *pre_dn = 0; - char *post_dn = 0; + Slapi_DN *pre_sdn = 0; + Slapi_DN *post_sdn = 0; slapi_pblock_get( pb, SLAPI_ENTRY_PRE_OP, &pre_e ); slapi_pblock_get( pb, SLAPI_ENTRY_POST_OP, &post_e ); if(pre_e && post_e) { - pre_dn = slapi_entry_get_ndn(pre_e); - post_dn = slapi_entry_get_ndn(post_e); + pre_sdn = slapi_entry_get_sdn(pre_e); + post_sdn = slapi_entry_get_sdn(post_e); } /* copy config so it doesn't change out from under us */ @@ -653,7 +655,7 @@ int memberof_postop_modrdn(Slapi_PBlock *pb) memberof_lock(); /* update any downstream members */ - if(pre_dn && post_dn && configCopy.group_filter && + if(pre_sdn && post_sdn && configCopy.group_filter && !slapi_filter_test_simple(post_e, configCopy.group_filter)) { int i = 0; @@ -665,7 +667,8 @@ int memberof_postop_modrdn(Slapi_PBlock *pb) { if(0 == slapi_entry_attr_find(post_e, configCopy.groupattrs[i], &attr)) { - if(memberof_moddn_attr_list(pb, &configCopy, pre_dn, post_dn, attr) != 0){ + if(memberof_moddn_attr_list(pb, &configCopy, pre_sdn, + post_sdn, attr) != 0){ break; } } @@ -675,8 +678,8 @@ int memberof_postop_modrdn(Slapi_PBlock *pb) /* It's possible that this is an entry who is a member * of other group entries. We need to update any member * attributes to refer to the new name. */ - if (pre_dn && post_dn) { - memberof_replace_dn_from_groups(pb, &configCopy, pre_dn, post_dn); + if (pre_sdn && post_sdn) { + memberof_replace_dn_from_groups(pb, &configCopy, pre_sdn, post_sdn); } memberof_unlock(); @@ -701,7 +704,7 @@ typedef struct _replace_dn_data * to use post_dn instead. */ static void memberof_replace_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, - char *pre_dn, char *post_dn) + Slapi_DN *pre_sdn, Slapi_DN *post_sdn) { int i = 0; char *groupattrs[2] = {0, 0}; @@ -711,11 +714,13 @@ memberof_replace_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, * using the same grouping attribute. */ for (i = 0; config->groupattrs[i]; i++) { - replace_dn_data data = {pre_dn, post_dn, config->groupattrs[i]}; + replace_dn_data data = {(char *)slapi_sdn_get_ndn(pre_sdn), + (char *)slapi_sdn_get_ndn(post_sdn), + config->groupattrs[i]}; groupattrs[0] = config->groupattrs[i]; - memberof_call_foreach_dn(pb, pre_dn, groupattrs, + memberof_call_foreach_dn(pb, pre_sdn, groupattrs, memberof_replace_dn_type_callback, &data); } } @@ -785,7 +790,7 @@ int memberof_replace_dn_type_callback(Slapi_Entry *e, void *callback_data) int memberof_postop_modify(Slapi_PBlock *pb) { int ret = 0; - char *normdn = 0; + Slapi_DN *sdn = NULL; Slapi_Mods *smods = 0; Slapi_Mod *smod = 0; LDAPMod **mods; @@ -803,7 +808,7 @@ int memberof_postop_modify(Slapi_PBlock *pb) return 0; } - if(memberof_oktodo(pb) && (normdn = memberof_getdn(pb))) + if(memberof_oktodo(pb) && (sdn = memberof_getsdn(pb))) { int config_copied = 0; MemberOfConfig *mainConfig = 0; @@ -859,7 +864,7 @@ int memberof_postop_modify(Slapi_PBlock *pb) case LDAP_MOD_ADD: { /* add group DN to targets */ - memberof_add_smod_list(pb, &configCopy, normdn, smod); + memberof_add_smod_list(pb, &configCopy, sdn, smod); break; } @@ -871,12 +876,12 @@ int memberof_postop_modify(Slapi_PBlock *pb) * entry, which the replace code deals with. */ if (slapi_mod_get_num_values(smod) == 0) { - memberof_replace_list(pb, &configCopy, normdn); + memberof_replace_list(pb, &configCopy, sdn); } else { /* remove group DN from target values in smod*/ - memberof_del_smod_list(pb, &configCopy, normdn, smod); + memberof_del_smod_list(pb, &configCopy, sdn, smod); } break; } @@ -884,7 +889,7 @@ int memberof_postop_modify(Slapi_PBlock *pb) case LDAP_MOD_REPLACE: { /* replace current values */ - memberof_replace_list(pb, &configCopy, normdn); + memberof_replace_list(pb, &configCopy, sdn); break; } @@ -930,7 +935,7 @@ int memberof_postop_add(Slapi_PBlock *pb) { int ret = 0; int interested = 0; - char *normdn = 0; + Slapi_DN *sdn = 0; void *caller_id = NULL; slapi_log_error( SLAPI_LOG_TRACE, MEMBEROF_PLUGIN_SUBSYSTEM, @@ -944,7 +949,7 @@ int memberof_postop_add(Slapi_PBlock *pb) return 0; } - if(memberof_oktodo(pb) && (normdn = memberof_getdn(pb))) + if(memberof_oktodo(pb) && (sdn = memberof_getsdn(pb))) { MemberOfConfig *mainConfig = 0; MemberOfConfig configCopy = {0, 0, 0, 0}; @@ -976,7 +981,7 @@ int memberof_postop_add(Slapi_PBlock *pb) { if(0 == slapi_entry_attr_find(e, configCopy.groupattrs[i], &attr)) { - memberof_add_attr_list(pb, &configCopy, normdn, attr); + memberof_add_attr_list(pb, &configCopy, sdn, attr); } } @@ -1037,22 +1042,14 @@ bail: return ret; } -/* - * memberof_getdn() - * - * Get dn of target entry - * Note: slapi_sdn_get_dn returns normalized dn. - * - */ -char *memberof_getdn(Slapi_PBlock *pb) +static Slapi_DN * +memberof_getsdn(Slapi_PBlock *pb) { - const char *dn = 0; Slapi_DN *sdn = NULL; slapi_pblock_get(pb, SLAPI_TARGET_SDN, &sdn); - dn = slapi_sdn_get_dn(sdn); /* returns norm dn */ - return (char *)dn; + return sdn; } /* @@ -1066,9 +1063,10 @@ char *memberof_getdn(Slapi_PBlock *pb) * Also, we must not delete entries that are a member of the group */ int memberof_modop_one(Slapi_PBlock *pb, MemberOfConfig *config, int mod_op, - char *op_this, char *op_to) + Slapi_DN *op_this_sdn, Slapi_DN *op_to_sdn) { - return memberof_modop_one_r(pb, config, mod_op, op_this, op_this, op_to, 0); + return memberof_modop_one_r(pb, config, mod_op, op_this_sdn, + op_this_sdn, op_to_sdn, 0); } /* memberof_modop_one_r() @@ -1077,19 +1075,21 @@ int memberof_modop_one(Slapi_PBlock *pb, MemberOfConfig *config, int mod_op, */ int memberof_modop_one_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod_op, - char *group_dn, char *op_this, char *op_to, memberofstringll *stack) + Slapi_DN *group_sdn, Slapi_DN *op_this_sdn, Slapi_DN *op_to_sdn, + memberofstringll *stack) { return memberof_modop_one_replace_r( - pb, config, mod_op, group_dn, op_this, 0, op_to, stack); + pb, config, mod_op, group_sdn, op_this_sdn, 0, op_to_sdn, stack); } /* memberof_modop_one_replace_r() * * recursive function to perform above (with added replace arg) */ -int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, - int mod_op, char *group_dn, char *op_this, char *replace_with, - char *op_to, memberofstringll *stack) +int +memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, + int mod_op, Slapi_DN *group_sdn, Slapi_DN *op_this_sdn, + Slapi_DN *replace_with_sdn, Slapi_DN *op_to_sdn, memberofstringll *stack) { int rc = 0; LDAPMod mod; @@ -1098,12 +1098,16 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, char *val[2]; char *replace_val[2]; Slapi_PBlock *mod_pb = 0; - Slapi_DN *op_to_sdn = 0; Slapi_Entry *e = 0; memberofstringll *ll = 0; char *op_str = 0; + const char *op_to = slapi_sdn_get_ndn(op_to_sdn); + const char *op_this = slapi_sdn_get_ndn(op_this_sdn); Slapi_Value *to_dn_val = slapi_value_new_string(op_to); Slapi_Value *this_dn_val = slapi_value_new_string(op_this); + /* op_this and op_to are both case-normalized */ + slapi_value_set_flags(this_dn_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS); + slapi_value_set_flags(to_dn_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS); if (config == NULL) { slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM, @@ -1112,7 +1116,6 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, } /* determine if this is a group op or single entry */ - op_to_sdn = slapi_sdn_new_normdn_byref(op_to); slapi_search_internal_get_entry( op_to_sdn, config->groupattrs, &e, memberof_get_plugin_id()); if(!e) @@ -1180,7 +1183,7 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, * entry. This will fix the references to * the missing group as well as the group * represented by op_this. */ - memberof_test_membership(pb, config, op_to); + memberof_test_membership(pb, config, op_to_sdn); } } slapi_free_search_results_internal(search_pb); @@ -1232,6 +1235,8 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, while(ll) { ll_dn_val = slapi_value_new_string(ll->dn); + /* ll->dn is case-normalized */ + slapi_value_set_flags(ll_dn_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS); if(0 == memberof_compare(config, &ll_dn_val, &to_dn_val)) { @@ -1267,7 +1272,8 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, slapi_entry_attr_find( e, config->groupattrs[i], &members ); if(members) { - if(memberof_mod_attr_list_r(pb, config, mod_op, group_dn, op_this, members, ll) != 0){ + if(memberof_mod_attr_list_r(pb, config, mod_op, group_sdn, + op_this_sdn, members, ll) != 0){ rc = -1; goto bail; } @@ -1324,7 +1330,7 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, mods[1] = 0; } - val[0] = op_this; + val[0] = (char *)op_this; val[1] = 0; mod.mod_op = LDAP_MOD_REPLACE == mod_op?LDAP_MOD_DELETE:mod_op; mod.mod_type = config->memberof_attr; @@ -1332,7 +1338,7 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, if(LDAP_MOD_REPLACE == mod_op) { - replace_val[0] = replace_with; + replace_val[0] = (char *)slapi_sdn_get_ndn(replace_with_sdn); replace_val[1] = 0; replace_mod.mod_op = LDAP_MOD_ADD; @@ -1356,7 +1362,6 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, } bail: - slapi_sdn_free(&op_to_sdn); slapi_value_free(&to_dn_val); slapi_value_free(&this_dn_val); slapi_entry_free(e); @@ -1370,9 +1375,11 @@ bail: * Add addthis DN to the memberof attribute of addto * */ -int memberof_add_one(Slapi_PBlock *pb, MemberOfConfig *config, char *addthis, char *addto) +int +memberof_add_one(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *addthis_sdn, Slapi_DN *addto_sdn) { - return memberof_modop_one(pb, config, LDAP_MOD_ADD, addthis, addto); + return memberof_modop_one(pb, config, LDAP_MOD_ADD, addthis_sdn, addto_sdn); } /* @@ -1381,9 +1388,11 @@ int memberof_add_one(Slapi_PBlock *pb, MemberOfConfig *config, char *addthis, ch * Delete delthis DN from the memberof attribute of delfrom * */ -int memberof_del_one(Slapi_PBlock *pb, MemberOfConfig *config, char *delthis, char *delfrom) +int +memberof_del_one(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *delthis_sdn, Slapi_DN *delfrom_sdn) { - return memberof_modop_one(pb, config, LDAP_MOD_DELETE, delthis, delfrom); + return memberof_modop_one(pb, config, LDAP_MOD_DELETE, delthis_sdn, delfrom_sdn); } /* @@ -1393,12 +1402,13 @@ int memberof_del_one(Slapi_PBlock *pb, MemberOfConfig *config, char *delthis, ch * */ int memberof_mod_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, int mod, - char *group_dn, Slapi_Mod *smod) + Slapi_DN *group_sdn, Slapi_Mod *smod) { int rc = 0; struct berval *bv = slapi_mod_get_first_value(smod); int last_size = 0; char *last_str = 0; + Slapi_DN *sdn = slapi_sdn_new(); while(bv) { @@ -1424,12 +1434,14 @@ int memberof_mod_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, int mod, memset(dn_str, 0, last_size); strncpy(dn_str, bv->bv_val, (size_t)bv->bv_len); + slapi_sdn_set_dn_byref(sdn, dn_str); - memberof_modop_one(pb, config, mod, group_dn, dn_str); + memberof_modop_one(pb, config, mod, group_sdn, sdn); bv = slapi_mod_get_next_value(smod); } + slapi_sdn_free(&sdn); if(last_str) slapi_ch_free_string(&last_str); @@ -1443,9 +1455,9 @@ int memberof_mod_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, int mod, * */ int memberof_add_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *groupdn, Slapi_Mod *smod) + Slapi_DN *group_sdn, Slapi_Mod *smod) { - return memberof_mod_smod_list(pb, config, LDAP_MOD_ADD, groupdn, smod); + return memberof_mod_smod_list(pb, config, LDAP_MOD_ADD, group_sdn, smod); } @@ -1456,9 +1468,9 @@ int memberof_add_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, * */ int memberof_del_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *groupdn, Slapi_Mod *smod) + Slapi_DN *group_sdn, Slapi_Mod *smod) { - return memberof_mod_smod_list(pb, config, LDAP_MOD_DELETE, groupdn, smod); + return memberof_mod_smod_list(pb, config, LDAP_MOD_DELETE, group_sdn, smod); } /** @@ -1482,13 +1494,15 @@ void * memberof_get_plugin_id() * */ int memberof_mod_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, int mod, - char *group_dn, Slapi_Attr *attr) + Slapi_DN *group_sdn, Slapi_Attr *attr) { - return memberof_mod_attr_list_r(pb, config, mod, group_dn, group_dn, attr, 0); + return memberof_mod_attr_list_r(pb, config, mod, group_sdn, group_sdn, + attr, 0); } int memberof_mod_attr_list_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod, - char *group_dn, char *op_this, Slapi_Attr *attr, memberofstringll *stack) + Slapi_DN *group_sdn, Slapi_DN *op_this_sdn, + Slapi_Attr *attr, memberofstringll *stack) { int rc = 0; Slapi_Value *val = 0; @@ -1496,8 +1510,10 @@ int memberof_mod_attr_list_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod, int last_size = 0; char *last_str = 0; int hint = slapi_attr_first_value(attr, &val); + Slapi_DN *sdn = slapi_sdn_new(); - op_this_val = slapi_value_new_string(op_this); + op_this_val = slapi_value_new_string(slapi_sdn_get_ndn(op_this_sdn)); + slapi_value_set_flags(op_this_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS); while(val) { @@ -1532,14 +1548,17 @@ int memberof_mod_attr_list_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod, /* If we're doing a replace (as we would in the MODRDN case), we need * to specify the new group DN value */ + slapi_sdn_set_normdn_byref(sdn, dn_str); /* dn_str is normalized */ if(mod == LDAP_MOD_REPLACE) { - memberof_modop_one_replace_r(pb, config, mod, group_dn, op_this, - group_dn, dn_str, stack); + memberof_modop_one_replace_r(pb, config, mod, group_sdn, + op_this_sdn, group_sdn, + sdn, stack); } else { - memberof_modop_one_r(pb, config, mod, group_dn, op_this, dn_str, stack); + memberof_modop_one_r(pb, config, mod, group_sdn, + op_this_sdn, sdn, stack); } } @@ -1548,6 +1567,7 @@ int memberof_mod_attr_list_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod, slapi_value_free(&op_this_val); + slapi_sdn_free(&sdn); if(last_str) slapi_ch_free_string(&last_str); @@ -1560,10 +1580,10 @@ int memberof_mod_attr_list_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod, * Add group DN to the memberof attribute of the list of targets * */ -int memberof_add_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, char *groupdn, - Slapi_Attr *attr) +int memberof_add_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *group_sdn, Slapi_Attr *attr) { - return memberof_mod_attr_list(pb, config, LDAP_MOD_ADD, groupdn, attr); + return memberof_mod_attr_list(pb, config, LDAP_MOD_ADD, group_sdn, attr); } /* @@ -1572,10 +1592,10 @@ int memberof_add_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group * Remove group DN from the memberof attribute of the list of targets * */ -int memberof_del_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, char *groupdn, - Slapi_Attr *attr) +int memberof_del_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *group_sdn, Slapi_Attr *attr) { - return memberof_mod_attr_list(pb, config, LDAP_MOD_DELETE, groupdn, attr); + return memberof_mod_attr_list(pb, config, LDAP_MOD_DELETE, group_sdn, attr); } /* @@ -1585,13 +1605,14 @@ int memberof_del_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group * */ int memberof_moddn_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *pre_dn, char *post_dn, Slapi_Attr *attr) + Slapi_DN *pre_sdn, Slapi_DN *post_sdn, Slapi_Attr *attr) { int rc = 0; Slapi_Value *val = 0; int last_size = 0; char *last_str = 0; int hint = slapi_attr_first_value(attr, &val); + Slapi_DN *sdn = slapi_sdn_new(); while(val) { @@ -1619,12 +1640,14 @@ int memberof_moddn_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, strncpy(dn_str, bv->bv_val, (size_t)bv->bv_len); + slapi_sdn_set_normdn_byref(sdn, dn_str); /* dn_str is normalized */ memberof_modop_one_replace_r(pb, config, LDAP_MOD_REPLACE, - post_dn, pre_dn, post_dn, dn_str, 0); + post_sdn, pre_sdn, post_sdn, sdn, 0); hint = slapi_attr_next_value(attr, hint, &val); } + slapi_sdn_free(&sdn); if(last_str) slapi_ch_free_string(&last_str); @@ -1638,24 +1661,30 @@ int memberof_moddn_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, * A Slapi_ValueSet* is returned. It is up to the caller to * free it. */ -Slapi_ValueSet *memberof_get_groups(MemberOfConfig *config, char *memberdn) +Slapi_ValueSet * +memberof_get_groups(MemberOfConfig *config, Slapi_DN *member_sdn) { - Slapi_Value *memberdn_val = slapi_value_new_string(memberdn); Slapi_ValueSet *groupvals = slapi_valueset_new(); + Slapi_Value *memberdn_val = + slapi_value_new_string(slapi_sdn_get_ndn(member_sdn)); + slapi_value_set_flags(memberdn_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS); + memberof_get_groups_data data = {config, memberdn_val, &groupvals}; - memberof_get_groups_r(config, memberdn, &data); + memberof_get_groups_r(config, member_sdn, &data); slapi_value_free(&memberdn_val); return groupvals; } -int memberof_get_groups_r(MemberOfConfig *config, char *memberdn, memberof_get_groups_data *data) +int +memberof_get_groups_r(MemberOfConfig *config, Slapi_DN *member_sdn, + memberof_get_groups_data *data) { /* Search for any grouping attributes that point to memberdn. * For each match, add it to the list, recurse and do same search */ - return memberof_call_foreach_dn(NULL, memberdn, config->groupattrs, + return memberof_call_foreach_dn(NULL, member_sdn, config->groupattrs, memberof_get_groups_callback, data); } @@ -1665,7 +1694,8 @@ int memberof_get_groups_r(MemberOfConfig *config, char *memberdn, memberof_get_g */ int memberof_get_groups_callback(Slapi_Entry *e, void *callback_data) { - char *group_dn = slapi_entry_get_dn(e); + Slapi_DN *group_sdn = slapi_entry_get_sdn(e); + char *group_dn = slapi_entry_get_ndn(e); Slapi_Value *group_dn_val = 0; Slapi_ValueSet *groupvals = *((memberof_get_groups_data*)callback_data)->groupvals; int rc = 0; @@ -1685,6 +1715,8 @@ int memberof_get_groups_callback(Slapi_Entry *e, void *callback_data) } /* get the DN of the group */ group_dn_val = slapi_value_new_string(group_dn); + /* group_dn is case-normalized */ + slapi_value_set_flags(group_dn_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS); /* check if e is the same as our original member entry */ if (0 == memberof_compare(((memberof_get_groups_data*)callback_data)->config, @@ -1725,7 +1757,7 @@ int memberof_get_groups_callback(Slapi_Entry *e, void *callback_data) /* now recurse to find parent groups of e */ memberof_get_groups_r(((memberof_get_groups_data*)callback_data)->config, - group_dn, callback_data); + group_sdn, callback_data); bail: return rc; @@ -1810,11 +1842,13 @@ static int memberof_is_grouping_attr(char *type, MemberOfConfig *config) * iterate until a pass fails to move a group over to member groups * remaining groups should be deleted */ -int memberof_test_membership(Slapi_PBlock *pb, MemberOfConfig *config, char *group_dn) +int +memberof_test_membership(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *group_sdn) { char *attrs[2] = {config->memberof_attr, 0}; - return memberof_call_foreach_dn(pb, group_dn, attrs, + return memberof_call_foreach_dn(pb, group_sdn, attrs, memberof_test_membership_callback , config); } @@ -1833,9 +1867,13 @@ int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data) Slapi_Value **member_array = 0; Slapi_Value **candidate_array = 0; Slapi_Value *entry_dn = 0; + Slapi_DN *entry_sdn = 0; MemberOfConfig *config = (MemberOfConfig *)callback_data; + Slapi_DN *sdn = slapi_sdn_new(); - entry_dn = slapi_value_new_string(slapi_entry_get_dn(e)); + entry_sdn = slapi_entry_get_sdn(e); + entry_dn = slapi_value_new_string(slapi_entry_get_ndn(e)); + slapi_value_set_flags(entry_dn, SLAPI_ATTR_FLAG_NORMALIZED_CIS); if(0 == entry_dn) { @@ -1908,8 +1946,7 @@ int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data) /* Check for a special value in this position * that indicates that the candidate was moved * to the member array. */ - if((void*)1 == - candidate_array[inner_index]) + if((void*)1 == candidate_array[inner_index]) { /* was moved, skip */ inner_index++; @@ -1955,11 +1992,9 @@ int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data) continue; } - memberof_del_one( - 0, config, - (char*)slapi_value_get_string( - candidate_array[outer_index]), - (char*)slapi_value_get_string(entry_dn)); + slapi_sdn_set_normdn_byref(sdn, + slapi_value_get_string(candidate_array[outer_index])); + memberof_del_one(0, config, sdn, entry_sdn); outer_index++; } @@ -1980,6 +2015,7 @@ int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data) } bail: + slapi_sdn_free(&sdn); slapi_value_free(&entry_dn); return rc; @@ -1991,7 +2027,9 @@ bail: * Perform replace the group DN list in the memberof attribute of the list of targets * */ -int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group_dn) +int +memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *group_sdn) { struct slapi_entry *pre_e = NULL; struct slapi_entry *post_e = NULL; @@ -2018,6 +2056,7 @@ int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group_ Slapi_Value **post_array = 0; int pre_index = 0; int post_index = 0; + Slapi_DN *sdn = slapi_sdn_new(); /* create arrays of values */ if(pre_attr) @@ -2077,22 +2116,18 @@ int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group_ if(pre_index == pre_total) { /* add the rest of post */ - memberof_add_one( - pb, config, - group_dn, - (char*)slapi_value_get_string( - post_array[post_index])); + slapi_sdn_set_normdn_byref(sdn, + slapi_value_get_string(post_array[post_index])); + memberof_add_one(pb, config, group_sdn, sdn); post_index++; } else if(post_index == post_total) { /* delete the rest of pre */ - memberof_del_one( - pb, config, - group_dn, - (char*)slapi_value_get_string( - pre_array[pre_index])); + slapi_sdn_set_normdn_byref(sdn, + slapi_value_get_string(pre_array[pre_index])); + memberof_del_one(pb, config, group_sdn, sdn); pre_index++; } @@ -2107,22 +2142,18 @@ int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group_ if(cmp < 0) { /* delete pre array */ - memberof_del_one( - pb, config, - group_dn, - (char*)slapi_value_get_string( - pre_array[pre_index])); + slapi_sdn_set_normdn_byref(sdn, + slapi_value_get_string(pre_array[pre_index])); + memberof_del_one(pb, config, group_sdn, sdn); pre_index++; } else if(cmp > 0) { /* add post array */ - memberof_add_one( - pb, config, - group_dn, - (char*)slapi_value_get_string( - post_array[post_index])); + slapi_sdn_set_normdn_byref(sdn, + slapi_value_get_string(post_array[post_index])); + memberof_add_one(pb, config, group_sdn, sdn); post_index++; } @@ -2134,6 +2165,7 @@ int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group_ } } } + slapi_sdn_free(&sdn); slapi_ch_free((void **)&pre_array); slapi_ch_free((void **)&post_array); } @@ -2171,10 +2203,7 @@ int memberof_compare(MemberOfConfig *config, const void *a, const void *b) /* We only need to provide a Slapi_Attr here for it's syntax. We * already validated all grouping attributes to use the Distinguished * Name syntax, so we can safely just use the first attr. */ - return slapi_attr_value_cmp( - config->group_slapiattrs[0], - slapi_value_get_berval(val1), - slapi_value_get_berval(val2)); + return slapi_attr_value_cmp_ext(config->group_slapiattrs[0], val1, val2); } /* memberof_qsort_compare() @@ -2194,10 +2223,8 @@ int memberof_qsort_compare(const void *a, const void *b) /* We only need to provide a Slapi_Attr here for it's syntax. We * already validated all grouping attributes to use the Distinguished * Name syntax, so we can safely just use the first attr. */ - return slapi_attr_value_cmp( - qsortConfig->group_slapiattrs[0], - slapi_value_get_berval(val1), - slapi_value_get_berval(val2)); + return slapi_attr_value_cmp_ext(qsortConfig->group_slapiattrs[0], + val1, val2); } void memberof_lock() @@ -2401,14 +2428,13 @@ int memberof_fix_memberof(MemberOfConfig *config, char *dn, char *filter_str) int memberof_fix_memberof_callback(Slapi_Entry *e, void *callback_data) { int rc = 0; - char *dn = slapi_entry_get_dn(e); Slapi_DN *sdn = slapi_entry_get_sdn(e); MemberOfConfig *config = (MemberOfConfig *)callback_data; memberof_del_dn_data del_data = {0, config->memberof_attr}; Slapi_ValueSet *groups = 0; /* get a list of all of the groups this user belongs to */ - groups = memberof_get_groups(config, dn); + groups = memberof_get_groups(config, sdn); /* If we found some groups, replace the existing memberOf attribute * with the found values. */ diff --git a/ldap/servers/slapd/attr.c b/ldap/servers/slapd/attr.c index fe68ab7..2dc2a80 100644 --- a/ldap/servers/slapd/attr.c +++ b/ldap/servers/slapd/attr.c @@ -404,6 +404,7 @@ int slapi_attr_value_find( const Slapi_Attr *a, const struct berval *v ) { struct ava ava; + unsigned long a_flags; if ( NULL == a ) { return( -1 ); @@ -412,7 +413,8 @@ slapi_attr_value_find( const Slapi_Attr *a, const struct berval *v ) ava.ava_type = a->a_type; ava.ava_value = *v; if (a->a_flags & SLAPI_ATTR_FLAG_NORMALIZED) { - ava.ava_private = &a->a_flags; + a_flags = a->a_flags; + ava.ava_private = &a_flags; } else { ava.ava_private = NULL; } @@ -549,21 +551,56 @@ slapi_attr_value_cmp( const Slapi_Attr *a, const struct berval *v1, const struct } else { - Slapi_Attr a2; - struct ava ava; - Slapi_Value *cvals[2]; - Slapi_Value tmpcval; - - a2 = *a; - cvals[0] = &tmpcval; - cvals[0]->v_csnset = NULL; - cvals[0]->bv = *v1; - cvals[0]->v_flags = 0; - cvals[1] = NULL; - a2.a_present_values.va = cvals; /* JCM - PUKE */ - ava.ava_type = a->a_type; - ava.ava_value = *v2; - ava.ava_private = NULL; + Slapi_Attr a2; + struct ava ava; + Slapi_Value *cvals[2]; + Slapi_Value tmpcval; + + a2 = *a; + cvals[0] = &tmpcval; + cvals[0]->v_csnset = NULL; + cvals[0]->bv = *v1; + cvals[0]->v_flags = 0; + cvals[1] = NULL; + a2.a_present_values.va = cvals; /* JCM - PUKE */ + ava.ava_type = a->a_type; + ava.ava_value = *v2; + ava.ava_private = NULL; + retVal = plugin_call_syntax_filter_ava(&a2, LDAP_FILTER_EQUALITY, &ava); + } + return retVal; +} + +int +slapi_attr_value_cmp_ext(const Slapi_Attr *a, Slapi_Value *v1, Slapi_Value *v2) +{ + int retVal; + const struct berval *bv2 = slapi_value_get_berval(v2); + + if ( a->a_flags & SLAPI_ATTR_FLAG_CMP_BITBYBIT ) + { + const struct berval *bv1 = slapi_value_get_berval(v1); + return slapi_attr_value_cmp(a, bv1, bv2); + } + else + { + Slapi_Attr a2; + struct ava ava; + Slapi_Value *cvals[2]; + unsigned long v2_flags = v2->v_flags; + + a2 = *a; + cvals[0] = v1; + cvals[1] = NULL; + a2.a_present_values.va = cvals; /* JCM - PUKE */ + + ava.ava_type = a->a_type; + ava.ava_value = *bv2; + if (v2_flags) { + ava.ava_private = &v2_flags; + } else { + ava.ava_private = NULL; + } retVal = plugin_call_syntax_filter_ava(&a2, LDAP_FILTER_EQUALITY, &ava); } return retVal; diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h index 3377c64..fc0281f 100644 --- a/ldap/servers/slapd/slapi-plugin.h +++ b/ldap/servers/slapd/slapi-plugin.h @@ -3734,7 +3734,7 @@ int slapi_attr_get_flags( const Slapi_Attr *attr, unsigned long *flags ); int slapi_attr_flag_is_set( const Slapi_Attr *attr, unsigned long flag ); /** - * Comare two values for a given attribute. + * Comare two bervals for a given attribute. * * \param attr Attribute used to determine how these values are compared; for * example, the syntax of the attribute may perform case-insensitive @@ -3754,6 +3754,27 @@ int slapi_attr_flag_is_set( const Slapi_Attr *attr, unsigned long flag ); int slapi_attr_value_cmp( const Slapi_Attr *attr, const struct berval *v1, const struct berval *v2 ); /** + * Comare two values for a given attribute. + * + * \param attr Attribute used to determine how these values are compared; for + * example, the syntax of the attribute may perform case-insensitive + * comparisons. + * \param v1 Pointer to the \c Slapi_Value structure containing the first value + * that you want to compare. + * \param v2 Pointer to the \c Slapi_Value structure containing the second value + * that you want to compare. + * \return \c 0 if the values are equal. + * \return \c -1 if the values are not equal. + * \see slapi_attr_add_value() + * \see slapi_attr_first_value() + * \see slapi_attr_next_value() + * \see slapi_attr_get_numvalues() + * \see slapi_attr_value_find() + * \see slapi_attr_value_cmp() + */ +int slapi_attr_value_cmp_ext(const Slapi_Attr *a, Slapi_Value *v1, Slapi_Value *v2); + +/** * Determine if an attribute contains a given value. * * \param a Attribute that you want to check. diff --git a/ldap/servers/slapd/value.c b/ldap/servers/slapd/value.c index 73e5d20..7bd11be 100644 --- a/ldap/servers/slapd/value.c +++ b/ldap/servers/slapd/value.c @@ -544,19 +544,19 @@ slapi_value_compare(const Slapi_Attr *a,const Slapi_Value *v1,const Slapi_Value int r= 0; if(v1!=NULL && v2!=NULL) { - r= slapi_attr_value_cmp( a, &v1->bv, &v2->bv); + r= slapi_attr_value_cmp_ext(a, (Slapi_Value *)v1, (Slapi_Value *)v2); } else if(v1!=NULL && v2==NULL) { - r= 1; /* v1>v2 */ + r= 1; /* v1>v2 */ } else if (v1==NULL && v2!=NULL) { - r= -1; /* v1<v2 */ + r= -1; /* v1<v2 */ } else /* (v1==NULL && v2==NULL) */ { - r= 0; /* The same */ + r= 0; /* The same */ } return r; }

1 0

ldap/servers
by Noriko Hosoi 20 Jul '12

20 Jul '12

ldap/servers/plugins/memberof/memberof.c | 342 ++++++++++++++++--------------- ldap/servers/slapd/attr.c | 69 ++++-- ldap/servers/slapd/slapi-plugin.h | 23 +- ldap/servers/slapd/value.c | 8 4 files changed, 263 insertions(+), 179 deletions(-) New commits: commit 6a21e8e9be90de76549b8fb37dc744ca48234e00 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Tue Jul 17 17:26:09 2012 -0700 Trac Ticket #412 - memberof performance enhancement https://fedorahosted.org/389/ticket/412 Fix description: memberof.c: replaced DN strings with Slapi_DN and set the normalized info to Slapi_Value flags. It reduces the number of slaip_dn_normalize_ext call by ~25%. attr.c, slapi-plugin.h: introduced a new API slapi_attr_ value_cmp_ext which takes Slapi_Value instead of struct berval. By replacing with Slapi_Value, the value flag (e.g., normalized info) can be passed to the syntax plugin. value.c: changed slapi_value_compare to call slapi_attr_ value_cmp_ext instead of slapi_attr_value_cmp. diff --git a/ldap/servers/plugins/memberof/memberof.c b/ldap/servers/plugins/memberof/memberof.c index fc4529d..a2fdbd9 100644 --- a/ldap/servers/plugins/memberof/memberof.c +++ b/ldap/servers/plugins/memberof/memberof.c @@ -108,57 +108,60 @@ static int memberof_postop_close(Slapi_PBlock *pb); /* supporting cast */ static int memberof_oktodo(Slapi_PBlock *pb); -static char *memberof_getdn(Slapi_PBlock *pb); +static Slapi_DN *memberof_getsdn(Slapi_PBlock *pb); static int memberof_modop_one(Slapi_PBlock *pb, MemberOfConfig *config, int mod_op, - char *op_this, char *op_to); + Slapi_DN *op_this_sdn, Slapi_DN *op_to_sdn); static int memberof_modop_one_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod_op, - char *group_dn, char *op_this, char *op_to, memberofstringll *stack); -static int memberof_add_one(Slapi_PBlock *pb, MemberOfConfig *config, char *addthis, - char *addto); -static int memberof_del_one(Slapi_PBlock *pb, MemberOfConfig *config, char *delthis, - char *delfrom); -static int memberof_mod_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, int mod, - char *groupdn, Slapi_Mod *smod); + Slapi_DN *group_sdn, Slapi_DN *op_this_sdn, Slapi_DN *op_to_sdn, + memberofstringll *stack); +static int memberof_add_one(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *addthis_sdn, Slapi_DN *addto_sdn); +static int memberof_del_one(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *delthis_sdn, Slapi_DN *delfrom_sdn); +static int memberof_mod_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, + int mod, Slapi_DN *group_sdn, Slapi_Mod *smod); static int memberof_add_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *groupdn, Slapi_Mod *smod); + Slapi_DN *group_sdn, Slapi_Mod *smod); static int memberof_del_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *groupdn, Slapi_Mod *smod); + Slapi_DN *group_sdn, Slapi_Mod *smod); static int memberof_mod_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, int mod, - char *groupdn, Slapi_Attr *attr); + Slapi_DN *group_sdn, Slapi_Attr *attr); static int memberof_mod_attr_list_r(Slapi_PBlock *pb, MemberOfConfig *config, - int mod, char *group_dn, char *op_this, Slapi_Attr *attr, memberofstringll *stack); + int mod, Slapi_DN *group_sdn, Slapi_DN *op_this_sdn, Slapi_Attr *attr, + memberofstringll *stack); static int memberof_add_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *groupdn, Slapi_Attr *attr); + Slapi_DN *group_sdn, Slapi_Attr *attr); static int memberof_del_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *groupdn, Slapi_Attr *attr); + Slapi_DN *group_sdn, Slapi_Attr *attr); static int memberof_moddn_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *pre_dn, char *post_dn, Slapi_Attr *attr); -static int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group_dn); + Slapi_DN *pre_sdn, Slapi_DN *post_sdn, Slapi_Attr *attr); +static int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *group_sdn); static void memberof_set_plugin_id(void * plugin_id); static void *memberof_get_plugin_id(); static int memberof_compare(MemberOfConfig *config, const void *a, const void *b); static int memberof_qsort_compare(const void *a, const void *b); static void memberof_load_array(Slapi_Value **array, Slapi_Attr *attr); -static void memberof_del_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, char *dn); -static int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, +static void memberof_del_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, Slapi_DN *sdn); +static int memberof_call_foreach_dn(Slapi_PBlock *pb, Slapi_DN *sdn, char **types, plugin_search_entry_callback callback, void *callback_data); static int memberof_is_direct_member(MemberOfConfig *config, Slapi_Value *groupdn, Slapi_Value *memberdn); static int memberof_is_grouping_attr(char *type, MemberOfConfig *config); -static Slapi_ValueSet *memberof_get_groups(MemberOfConfig *config, char *memberdn); -static int memberof_get_groups_r(MemberOfConfig *config, char *memberdn, +static Slapi_ValueSet *memberof_get_groups(MemberOfConfig *config, Slapi_DN *member_sdn); +static int memberof_get_groups_r(MemberOfConfig *config, Slapi_DN *member_sdn, memberof_get_groups_data *data); static int memberof_get_groups_callback(Slapi_Entry *e, void *callback_data); static int memberof_test_membership(Slapi_PBlock *pb, MemberOfConfig *config, - char *group_dn); + Slapi_DN *group_sdn); static int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data); static int memberof_del_dn_type_callback(Slapi_Entry *e, void *callback_data); static int memberof_replace_dn_type_callback(Slapi_Entry *e, void *callback_data); static void memberof_replace_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, - char *pre_dn, char *post_dn); + Slapi_DN *pre_sdn, Slapi_DN *post_sdn); static int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, - int mod_op, char *group_dn, char *op_this, char *replace_with, char *op_to, - memberofstringll *stack); + int mod_op, Slapi_DN *group_sdn, Slapi_DN *op_this_sdn, + Slapi_DN *replace_with_sdn, Slapi_DN *op_to_sdn, memberofstringll *stack); static int memberof_task_add(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Entry *eAfter, int *returncode, char *returntext, void *arg); @@ -379,7 +382,7 @@ int memberof_postop_del(Slapi_PBlock *pb) { int ret = 0; MemberOfConfig configCopy = {0, 0, 0, 0}; - char *normdn; + Slapi_DN *sdn; void *caller_id = NULL; slapi_log_error( SLAPI_LOG_TRACE, MEMBEROF_PLUGIN_SUBSYSTEM, @@ -393,7 +396,7 @@ int memberof_postop_del(Slapi_PBlock *pb) return 0; } - if(memberof_oktodo(pb) && (normdn = memberof_getdn(pb))) + if(memberof_oktodo(pb) && (sdn = memberof_getsdn(pb))) { struct slapi_entry *e = NULL; @@ -413,7 +416,7 @@ int memberof_postop_del(Slapi_PBlock *pb) /* remove this DN from the * membership lists of groups */ - memberof_del_dn_from_groups(pb, &configCopy, normdn); + memberof_del_dn_from_groups(pb, &configCopy, sdn); /* is the entry of interest as a group? */ if(e && configCopy.group_filter && !slapi_filter_test_simple(e, configCopy.group_filter)) @@ -426,7 +429,7 @@ int memberof_postop_del(Slapi_PBlock *pb) { if (0 == slapi_entry_attr_find(e, configCopy.groupattrs[i], &attr)) { - memberof_del_attr_list(pb, &configCopy, normdn, attr); + memberof_del_attr_list(pb, &configCopy, sdn, attr); } } } @@ -449,7 +452,7 @@ typedef struct _memberof_del_dn_data /* Deletes a member dn from all groups that refer to it. */ static void -memberof_del_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, char *dn) +memberof_del_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, Slapi_DN *sdn) { int i = 0; char *groupattrs[2] = {0, 0}; @@ -459,12 +462,13 @@ memberof_del_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, char *dn) * same grouping attribute. */ for (i = 0; config->groupattrs[i]; i++) { - memberof_del_dn_data data = {dn, config->groupattrs[i]}; + memberof_del_dn_data data = {(char *)slapi_sdn_get_dn(sdn), + config->groupattrs[i]}; groupattrs[0] = config->groupattrs[i]; - memberof_call_foreach_dn(pb, dn, groupattrs, - memberof_del_dn_type_callback, &data); + memberof_call_foreach_dn(pb, sdn, groupattrs, + memberof_del_dn_type_callback, &data); } } @@ -510,19 +514,18 @@ int memberof_del_dn_type_callback(Slapi_Entry *e, void *callback_data) * is a user, you'd want "type" to be "member". If "dn" is a group, you * could want type to be either "member" or "memberOf" depending on the case. */ -int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, +int memberof_call_foreach_dn(Slapi_PBlock *pb, Slapi_DN *sdn, char **types, plugin_search_entry_callback callback, void *callback_data) { Slapi_PBlock *search_pb = NULL; Slapi_DN *base_sdn = NULL; Slapi_Backend *be = NULL; - Slapi_DN *sdn = NULL; char *filter_str = NULL; char *cookie = NULL; int all_backends = memberof_config_get_all_backends(); int types_name_len = 0; int num_types = 0; - int dn_len = strlen(dn); + int dn_len = slapi_sdn_get_ndn_len(sdn); int rc = 0; int i = 0; @@ -550,7 +553,7 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, for (i = 0; types[i]; i++) { bytes_out += snprintf(filter_str + bytes_out, filter_str_len - bytes_out, - "(%s=%s)", types[i], dn); + "(%s=%s)", types[i], slapi_sdn_get_ndn(sdn)); } /* Add end of filter. */ @@ -558,7 +561,8 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, } else if (num_types == 1) { - filter_str = slapi_ch_smprintf("(%s=%s)", types[0], dn); + filter_str = + slapi_ch_smprintf("(%s=%s)", types[0], slapi_sdn_get_ndn(sdn)); } if(filter_str == NULL){ @@ -569,7 +573,6 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, be = slapi_get_first_backend(&cookie); while(be){ if(!all_backends){ - sdn = slapi_sdn_new_normdn_byref(dn); be = slapi_be_select(sdn); if(be == NULL){ break; @@ -596,7 +599,6 @@ int memberof_call_foreach_dn(Slapi_PBlock *pb, char *dn, be = slapi_get_next_backend(cookie); } - slapi_sdn_free(&sdn); slapi_pblock_destroy(search_pb); slapi_ch_free((void **)&cookie); slapi_ch_free_string(&filter_str); @@ -632,16 +634,16 @@ int memberof_postop_modrdn(Slapi_PBlock *pb) MemberOfConfig configCopy = {0, 0, 0, 0}; struct slapi_entry *pre_e = NULL; struct slapi_entry *post_e = NULL; - char *pre_dn = 0; - char *post_dn = 0; + Slapi_DN *pre_sdn = 0; + Slapi_DN *post_sdn = 0; slapi_pblock_get( pb, SLAPI_ENTRY_PRE_OP, &pre_e ); slapi_pblock_get( pb, SLAPI_ENTRY_POST_OP, &post_e ); if(pre_e && post_e) { - pre_dn = slapi_entry_get_ndn(pre_e); - post_dn = slapi_entry_get_ndn(post_e); + pre_sdn = slapi_entry_get_sdn(pre_e); + post_sdn = slapi_entry_get_sdn(post_e); } /* copy config so it doesn't change out from under us */ @@ -653,7 +655,7 @@ int memberof_postop_modrdn(Slapi_PBlock *pb) memberof_lock(); /* update any downstream members */ - if(pre_dn && post_dn && configCopy.group_filter && + if(pre_sdn && post_sdn && configCopy.group_filter && !slapi_filter_test_simple(post_e, configCopy.group_filter)) { int i = 0; @@ -665,7 +667,8 @@ int memberof_postop_modrdn(Slapi_PBlock *pb) { if(0 == slapi_entry_attr_find(post_e, configCopy.groupattrs[i], &attr)) { - if(memberof_moddn_attr_list(pb, &configCopy, pre_dn, post_dn, attr) != 0){ + if(memberof_moddn_attr_list(pb, &configCopy, pre_sdn, + post_sdn, attr) != 0){ break; } } @@ -675,8 +678,8 @@ int memberof_postop_modrdn(Slapi_PBlock *pb) /* It's possible that this is an entry who is a member * of other group entries. We need to update any member * attributes to refer to the new name. */ - if (pre_dn && post_dn) { - memberof_replace_dn_from_groups(pb, &configCopy, pre_dn, post_dn); + if (pre_sdn && post_sdn) { + memberof_replace_dn_from_groups(pb, &configCopy, pre_sdn, post_sdn); } memberof_unlock(); @@ -701,7 +704,7 @@ typedef struct _replace_dn_data * to use post_dn instead. */ static void memberof_replace_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, - char *pre_dn, char *post_dn) + Slapi_DN *pre_sdn, Slapi_DN *post_sdn) { int i = 0; char *groupattrs[2] = {0, 0}; @@ -711,11 +714,13 @@ memberof_replace_dn_from_groups(Slapi_PBlock *pb, MemberOfConfig *config, * using the same grouping attribute. */ for (i = 0; config->groupattrs[i]; i++) { - replace_dn_data data = {pre_dn, post_dn, config->groupattrs[i]}; + replace_dn_data data = {(char *)slapi_sdn_get_ndn(pre_sdn), + (char *)slapi_sdn_get_ndn(post_sdn), + config->groupattrs[i]}; groupattrs[0] = config->groupattrs[i]; - memberof_call_foreach_dn(pb, pre_dn, groupattrs, + memberof_call_foreach_dn(pb, pre_sdn, groupattrs, memberof_replace_dn_type_callback, &data); } } @@ -785,7 +790,7 @@ int memberof_replace_dn_type_callback(Slapi_Entry *e, void *callback_data) int memberof_postop_modify(Slapi_PBlock *pb) { int ret = 0; - char *normdn = 0; + Slapi_DN *sdn = NULL; Slapi_Mods *smods = 0; Slapi_Mod *smod = 0; LDAPMod **mods; @@ -803,7 +808,7 @@ int memberof_postop_modify(Slapi_PBlock *pb) return 0; } - if(memberof_oktodo(pb) && (normdn = memberof_getdn(pb))) + if(memberof_oktodo(pb) && (sdn = memberof_getsdn(pb))) { int config_copied = 0; MemberOfConfig *mainConfig = 0; @@ -859,7 +864,7 @@ int memberof_postop_modify(Slapi_PBlock *pb) case LDAP_MOD_ADD: { /* add group DN to targets */ - memberof_add_smod_list(pb, &configCopy, normdn, smod); + memberof_add_smod_list(pb, &configCopy, sdn, smod); break; } @@ -871,12 +876,12 @@ int memberof_postop_modify(Slapi_PBlock *pb) * entry, which the replace code deals with. */ if (slapi_mod_get_num_values(smod) == 0) { - memberof_replace_list(pb, &configCopy, normdn); + memberof_replace_list(pb, &configCopy, sdn); } else { /* remove group DN from target values in smod*/ - memberof_del_smod_list(pb, &configCopy, normdn, smod); + memberof_del_smod_list(pb, &configCopy, sdn, smod); } break; } @@ -884,7 +889,7 @@ int memberof_postop_modify(Slapi_PBlock *pb) case LDAP_MOD_REPLACE: { /* replace current values */ - memberof_replace_list(pb, &configCopy, normdn); + memberof_replace_list(pb, &configCopy, sdn); break; } @@ -930,7 +935,7 @@ int memberof_postop_add(Slapi_PBlock *pb) { int ret = 0; int interested = 0; - char *normdn = 0; + Slapi_DN *sdn = 0; void *caller_id = NULL; slapi_log_error( SLAPI_LOG_TRACE, MEMBEROF_PLUGIN_SUBSYSTEM, @@ -944,7 +949,7 @@ int memberof_postop_add(Slapi_PBlock *pb) return 0; } - if(memberof_oktodo(pb) && (normdn = memberof_getdn(pb))) + if(memberof_oktodo(pb) && (sdn = memberof_getsdn(pb))) { MemberOfConfig *mainConfig = 0; MemberOfConfig configCopy = {0, 0, 0, 0}; @@ -976,7 +981,7 @@ int memberof_postop_add(Slapi_PBlock *pb) { if(0 == slapi_entry_attr_find(e, configCopy.groupattrs[i], &attr)) { - memberof_add_attr_list(pb, &configCopy, normdn, attr); + memberof_add_attr_list(pb, &configCopy, sdn, attr); } } @@ -1037,22 +1042,14 @@ bail: return ret; } -/* - * memberof_getdn() - * - * Get dn of target entry - * Note: slapi_sdn_get_dn returns normalized dn. - * - */ -char *memberof_getdn(Slapi_PBlock *pb) +static Slapi_DN * +memberof_getsdn(Slapi_PBlock *pb) { - const char *dn = 0; Slapi_DN *sdn = NULL; slapi_pblock_get(pb, SLAPI_TARGET_SDN, &sdn); - dn = slapi_sdn_get_dn(sdn); /* returns norm dn */ - return (char *)dn; + return sdn; } /* @@ -1066,9 +1063,10 @@ char *memberof_getdn(Slapi_PBlock *pb) * Also, we must not delete entries that are a member of the group */ int memberof_modop_one(Slapi_PBlock *pb, MemberOfConfig *config, int mod_op, - char *op_this, char *op_to) + Slapi_DN *op_this_sdn, Slapi_DN *op_to_sdn) { - return memberof_modop_one_r(pb, config, mod_op, op_this, op_this, op_to, 0); + return memberof_modop_one_r(pb, config, mod_op, op_this_sdn, + op_this_sdn, op_to_sdn, 0); } /* memberof_modop_one_r() @@ -1077,19 +1075,21 @@ int memberof_modop_one(Slapi_PBlock *pb, MemberOfConfig *config, int mod_op, */ int memberof_modop_one_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod_op, - char *group_dn, char *op_this, char *op_to, memberofstringll *stack) + Slapi_DN *group_sdn, Slapi_DN *op_this_sdn, Slapi_DN *op_to_sdn, + memberofstringll *stack) { return memberof_modop_one_replace_r( - pb, config, mod_op, group_dn, op_this, 0, op_to, stack); + pb, config, mod_op, group_sdn, op_this_sdn, 0, op_to_sdn, stack); } /* memberof_modop_one_replace_r() * * recursive function to perform above (with added replace arg) */ -int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, - int mod_op, char *group_dn, char *op_this, char *replace_with, - char *op_to, memberofstringll *stack) +int +memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, + int mod_op, Slapi_DN *group_sdn, Slapi_DN *op_this_sdn, + Slapi_DN *replace_with_sdn, Slapi_DN *op_to_sdn, memberofstringll *stack) { int rc = 0; LDAPMod mod; @@ -1098,12 +1098,16 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, char *val[2]; char *replace_val[2]; Slapi_PBlock *mod_pb = 0; - Slapi_DN *op_to_sdn = 0; Slapi_Entry *e = 0; memberofstringll *ll = 0; char *op_str = 0; + const char *op_to = slapi_sdn_get_ndn(op_to_sdn); + const char *op_this = slapi_sdn_get_ndn(op_this_sdn); Slapi_Value *to_dn_val = slapi_value_new_string(op_to); Slapi_Value *this_dn_val = slapi_value_new_string(op_this); + /* op_this and op_to are both case-normalized */ + slapi_value_set_flags(this_dn_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS); + slapi_value_set_flags(to_dn_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS); if (config == NULL) { slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM, @@ -1112,7 +1116,6 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, } /* determine if this is a group op or single entry */ - op_to_sdn = slapi_sdn_new_normdn_byref(op_to); slapi_search_internal_get_entry( op_to_sdn, config->groupattrs, &e, memberof_get_plugin_id()); if(!e) @@ -1180,7 +1183,7 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, * entry. This will fix the references to * the missing group as well as the group * represented by op_this. */ - memberof_test_membership(pb, config, op_to); + memberof_test_membership(pb, config, op_to_sdn); } } slapi_free_search_results_internal(search_pb); @@ -1232,6 +1235,8 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, while(ll) { ll_dn_val = slapi_value_new_string(ll->dn); + /* ll->dn is case-normalized */ + slapi_value_set_flags(ll_dn_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS); if(0 == memberof_compare(config, &ll_dn_val, &to_dn_val)) { @@ -1267,7 +1272,8 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, slapi_entry_attr_find( e, config->groupattrs[i], &members ); if(members) { - if(memberof_mod_attr_list_r(pb, config, mod_op, group_dn, op_this, members, ll) != 0){ + if(memberof_mod_attr_list_r(pb, config, mod_op, group_sdn, + op_this_sdn, members, ll) != 0){ rc = -1; goto bail; } @@ -1324,7 +1330,7 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, mods[1] = 0; } - val[0] = op_this; + val[0] = (char *)op_this; val[1] = 0; mod.mod_op = LDAP_MOD_REPLACE == mod_op?LDAP_MOD_DELETE:mod_op; mod.mod_type = config->memberof_attr; @@ -1332,7 +1338,7 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, if(LDAP_MOD_REPLACE == mod_op) { - replace_val[0] = replace_with; + replace_val[0] = (char *)slapi_sdn_get_ndn(replace_with_sdn); replace_val[1] = 0; replace_mod.mod_op = LDAP_MOD_ADD; @@ -1356,7 +1362,6 @@ int memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig *config, } bail: - slapi_sdn_free(&op_to_sdn); slapi_value_free(&to_dn_val); slapi_value_free(&this_dn_val); slapi_entry_free(e); @@ -1370,9 +1375,11 @@ bail: * Add addthis DN to the memberof attribute of addto * */ -int memberof_add_one(Slapi_PBlock *pb, MemberOfConfig *config, char *addthis, char *addto) +int +memberof_add_one(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *addthis_sdn, Slapi_DN *addto_sdn) { - return memberof_modop_one(pb, config, LDAP_MOD_ADD, addthis, addto); + return memberof_modop_one(pb, config, LDAP_MOD_ADD, addthis_sdn, addto_sdn); } /* @@ -1381,9 +1388,11 @@ int memberof_add_one(Slapi_PBlock *pb, MemberOfConfig *config, char *addthis, ch * Delete delthis DN from the memberof attribute of delfrom * */ -int memberof_del_one(Slapi_PBlock *pb, MemberOfConfig *config, char *delthis, char *delfrom) +int +memberof_del_one(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *delthis_sdn, Slapi_DN *delfrom_sdn) { - return memberof_modop_one(pb, config, LDAP_MOD_DELETE, delthis, delfrom); + return memberof_modop_one(pb, config, LDAP_MOD_DELETE, delthis_sdn, delfrom_sdn); } /* @@ -1393,12 +1402,13 @@ int memberof_del_one(Slapi_PBlock *pb, MemberOfConfig *config, char *delthis, ch * */ int memberof_mod_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, int mod, - char *group_dn, Slapi_Mod *smod) + Slapi_DN *group_sdn, Slapi_Mod *smod) { int rc = 0; struct berval *bv = slapi_mod_get_first_value(smod); int last_size = 0; char *last_str = 0; + Slapi_DN *sdn = slapi_sdn_new(); while(bv) { @@ -1424,12 +1434,14 @@ int memberof_mod_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, int mod, memset(dn_str, 0, last_size); strncpy(dn_str, bv->bv_val, (size_t)bv->bv_len); + slapi_sdn_set_dn_byref(sdn, dn_str); - memberof_modop_one(pb, config, mod, group_dn, dn_str); + memberof_modop_one(pb, config, mod, group_sdn, sdn); bv = slapi_mod_get_next_value(smod); } + slapi_sdn_free(&sdn); if(last_str) slapi_ch_free_string(&last_str); @@ -1443,9 +1455,9 @@ int memberof_mod_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, int mod, * */ int memberof_add_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *groupdn, Slapi_Mod *smod) + Slapi_DN *group_sdn, Slapi_Mod *smod) { - return memberof_mod_smod_list(pb, config, LDAP_MOD_ADD, groupdn, smod); + return memberof_mod_smod_list(pb, config, LDAP_MOD_ADD, group_sdn, smod); } @@ -1456,9 +1468,9 @@ int memberof_add_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, * */ int memberof_del_smod_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *groupdn, Slapi_Mod *smod) + Slapi_DN *group_sdn, Slapi_Mod *smod) { - return memberof_mod_smod_list(pb, config, LDAP_MOD_DELETE, groupdn, smod); + return memberof_mod_smod_list(pb, config, LDAP_MOD_DELETE, group_sdn, smod); } /** @@ -1482,13 +1494,15 @@ void * memberof_get_plugin_id() * */ int memberof_mod_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, int mod, - char *group_dn, Slapi_Attr *attr) + Slapi_DN *group_sdn, Slapi_Attr *attr) { - return memberof_mod_attr_list_r(pb, config, mod, group_dn, group_dn, attr, 0); + return memberof_mod_attr_list_r(pb, config, mod, group_sdn, group_sdn, + attr, 0); } int memberof_mod_attr_list_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod, - char *group_dn, char *op_this, Slapi_Attr *attr, memberofstringll *stack) + Slapi_DN *group_sdn, Slapi_DN *op_this_sdn, + Slapi_Attr *attr, memberofstringll *stack) { int rc = 0; Slapi_Value *val = 0; @@ -1496,8 +1510,10 @@ int memberof_mod_attr_list_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod, int last_size = 0; char *last_str = 0; int hint = slapi_attr_first_value(attr, &val); + Slapi_DN *sdn = slapi_sdn_new(); - op_this_val = slapi_value_new_string(op_this); + op_this_val = slapi_value_new_string(slapi_sdn_get_ndn(op_this_sdn)); + slapi_value_set_flags(op_this_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS); while(val) { @@ -1532,14 +1548,17 @@ int memberof_mod_attr_list_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod, /* If we're doing a replace (as we would in the MODRDN case), we need * to specify the new group DN value */ + slapi_sdn_set_normdn_byref(sdn, dn_str); /* dn_str is normalized */ if(mod == LDAP_MOD_REPLACE) { - memberof_modop_one_replace_r(pb, config, mod, group_dn, op_this, - group_dn, dn_str, stack); + memberof_modop_one_replace_r(pb, config, mod, group_sdn, + op_this_sdn, group_sdn, + sdn, stack); } else { - memberof_modop_one_r(pb, config, mod, group_dn, op_this, dn_str, stack); + memberof_modop_one_r(pb, config, mod, group_sdn, + op_this_sdn, sdn, stack); } } @@ -1548,6 +1567,7 @@ int memberof_mod_attr_list_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod, slapi_value_free(&op_this_val); + slapi_sdn_free(&sdn); if(last_str) slapi_ch_free_string(&last_str); @@ -1560,10 +1580,10 @@ int memberof_mod_attr_list_r(Slapi_PBlock *pb, MemberOfConfig *config, int mod, * Add group DN to the memberof attribute of the list of targets * */ -int memberof_add_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, char *groupdn, - Slapi_Attr *attr) +int memberof_add_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *group_sdn, Slapi_Attr *attr) { - return memberof_mod_attr_list(pb, config, LDAP_MOD_ADD, groupdn, attr); + return memberof_mod_attr_list(pb, config, LDAP_MOD_ADD, group_sdn, attr); } /* @@ -1572,10 +1592,10 @@ int memberof_add_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group * Remove group DN from the memberof attribute of the list of targets * */ -int memberof_del_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, char *groupdn, - Slapi_Attr *attr) +int memberof_del_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *group_sdn, Slapi_Attr *attr) { - return memberof_mod_attr_list(pb, config, LDAP_MOD_DELETE, groupdn, attr); + return memberof_mod_attr_list(pb, config, LDAP_MOD_DELETE, group_sdn, attr); } /* @@ -1585,13 +1605,14 @@ int memberof_del_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group * */ int memberof_moddn_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, - char *pre_dn, char *post_dn, Slapi_Attr *attr) + Slapi_DN *pre_sdn, Slapi_DN *post_sdn, Slapi_Attr *attr) { int rc = 0; Slapi_Value *val = 0; int last_size = 0; char *last_str = 0; int hint = slapi_attr_first_value(attr, &val); + Slapi_DN *sdn = slapi_sdn_new(); while(val) { @@ -1619,12 +1640,14 @@ int memberof_moddn_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, strncpy(dn_str, bv->bv_val, (size_t)bv->bv_len); + slapi_sdn_set_normdn_byref(sdn, dn_str); /* dn_str is normalized */ memberof_modop_one_replace_r(pb, config, LDAP_MOD_REPLACE, - post_dn, pre_dn, post_dn, dn_str, 0); + post_sdn, pre_sdn, post_sdn, sdn, 0); hint = slapi_attr_next_value(attr, hint, &val); } + slapi_sdn_free(&sdn); if(last_str) slapi_ch_free_string(&last_str); @@ -1638,24 +1661,30 @@ int memberof_moddn_attr_list(Slapi_PBlock *pb, MemberOfConfig *config, * A Slapi_ValueSet* is returned. It is up to the caller to * free it. */ -Slapi_ValueSet *memberof_get_groups(MemberOfConfig *config, char *memberdn) +Slapi_ValueSet * +memberof_get_groups(MemberOfConfig *config, Slapi_DN *member_sdn) { - Slapi_Value *memberdn_val = slapi_value_new_string(memberdn); Slapi_ValueSet *groupvals = slapi_valueset_new(); + Slapi_Value *memberdn_val = + slapi_value_new_string(slapi_sdn_get_ndn(member_sdn)); + slapi_value_set_flags(memberdn_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS); + memberof_get_groups_data data = {config, memberdn_val, &groupvals}; - memberof_get_groups_r(config, memberdn, &data); + memberof_get_groups_r(config, member_sdn, &data); slapi_value_free(&memberdn_val); return groupvals; } -int memberof_get_groups_r(MemberOfConfig *config, char *memberdn, memberof_get_groups_data *data) +int +memberof_get_groups_r(MemberOfConfig *config, Slapi_DN *member_sdn, + memberof_get_groups_data *data) { /* Search for any grouping attributes that point to memberdn. * For each match, add it to the list, recurse and do same search */ - return memberof_call_foreach_dn(NULL, memberdn, config->groupattrs, + return memberof_call_foreach_dn(NULL, member_sdn, config->groupattrs, memberof_get_groups_callback, data); } @@ -1665,7 +1694,8 @@ int memberof_get_groups_r(MemberOfConfig *config, char *memberdn, memberof_get_g */ int memberof_get_groups_callback(Slapi_Entry *e, void *callback_data) { - char *group_dn = slapi_entry_get_dn(e); + Slapi_DN *group_sdn = slapi_entry_get_sdn(e); + char *group_dn = slapi_entry_get_ndn(e); Slapi_Value *group_dn_val = 0; Slapi_ValueSet *groupvals = *((memberof_get_groups_data*)callback_data)->groupvals; int rc = 0; @@ -1685,6 +1715,8 @@ int memberof_get_groups_callback(Slapi_Entry *e, void *callback_data) } /* get the DN of the group */ group_dn_val = slapi_value_new_string(group_dn); + /* group_dn is case-normalized */ + slapi_value_set_flags(group_dn_val, SLAPI_ATTR_FLAG_NORMALIZED_CIS); /* check if e is the same as our original member entry */ if (0 == memberof_compare(((memberof_get_groups_data*)callback_data)->config, @@ -1725,7 +1757,7 @@ int memberof_get_groups_callback(Slapi_Entry *e, void *callback_data) /* now recurse to find parent groups of e */ memberof_get_groups_r(((memberof_get_groups_data*)callback_data)->config, - group_dn, callback_data); + group_sdn, callback_data); bail: return rc; @@ -1810,11 +1842,13 @@ static int memberof_is_grouping_attr(char *type, MemberOfConfig *config) * iterate until a pass fails to move a group over to member groups * remaining groups should be deleted */ -int memberof_test_membership(Slapi_PBlock *pb, MemberOfConfig *config, char *group_dn) +int +memberof_test_membership(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *group_sdn) { char *attrs[2] = {config->memberof_attr, 0}; - return memberof_call_foreach_dn(pb, group_dn, attrs, + return memberof_call_foreach_dn(pb, group_sdn, attrs, memberof_test_membership_callback , config); } @@ -1833,9 +1867,13 @@ int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data) Slapi_Value **member_array = 0; Slapi_Value **candidate_array = 0; Slapi_Value *entry_dn = 0; + Slapi_DN *entry_sdn = 0; MemberOfConfig *config = (MemberOfConfig *)callback_data; + Slapi_DN *sdn = slapi_sdn_new(); - entry_dn = slapi_value_new_string(slapi_entry_get_dn(e)); + entry_sdn = slapi_entry_get_sdn(e); + entry_dn = slapi_value_new_string(slapi_entry_get_ndn(e)); + slapi_value_set_flags(entry_dn, SLAPI_ATTR_FLAG_NORMALIZED_CIS); if(0 == entry_dn) { @@ -1908,8 +1946,7 @@ int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data) /* Check for a special value in this position * that indicates that the candidate was moved * to the member array. */ - if((void*)1 == - candidate_array[inner_index]) + if((void*)1 == candidate_array[inner_index]) { /* was moved, skip */ inner_index++; @@ -1955,11 +1992,9 @@ int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data) continue; } - memberof_del_one( - 0, config, - (char*)slapi_value_get_string( - candidate_array[outer_index]), - (char*)slapi_value_get_string(entry_dn)); + slapi_sdn_set_normdn_byref(sdn, + slapi_value_get_string(candidate_array[outer_index])); + memberof_del_one(0, config, sdn, entry_sdn); outer_index++; } @@ -1980,6 +2015,7 @@ int memberof_test_membership_callback(Slapi_Entry *e, void *callback_data) } bail: + slapi_sdn_free(&sdn); slapi_value_free(&entry_dn); return rc; @@ -1991,7 +2027,9 @@ bail: * Perform replace the group DN list in the memberof attribute of the list of targets * */ -int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group_dn) +int +memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, + Slapi_DN *group_sdn) { struct slapi_entry *pre_e = NULL; struct slapi_entry *post_e = NULL; @@ -2018,6 +2056,7 @@ int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group_ Slapi_Value **post_array = 0; int pre_index = 0; int post_index = 0; + Slapi_DN *sdn = slapi_sdn_new(); /* create arrays of values */ if(pre_attr) @@ -2077,22 +2116,18 @@ int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group_ if(pre_index == pre_total) { /* add the rest of post */ - memberof_add_one( - pb, config, - group_dn, - (char*)slapi_value_get_string( - post_array[post_index])); + slapi_sdn_set_normdn_byref(sdn, + slapi_value_get_string(post_array[post_index])); + memberof_add_one(pb, config, group_sdn, sdn); post_index++; } else if(post_index == post_total) { /* delete the rest of pre */ - memberof_del_one( - pb, config, - group_dn, - (char*)slapi_value_get_string( - pre_array[pre_index])); + slapi_sdn_set_normdn_byref(sdn, + slapi_value_get_string(pre_array[pre_index])); + memberof_del_one(pb, config, group_sdn, sdn); pre_index++; } @@ -2107,22 +2142,18 @@ int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group_ if(cmp < 0) { /* delete pre array */ - memberof_del_one( - pb, config, - group_dn, - (char*)slapi_value_get_string( - pre_array[pre_index])); + slapi_sdn_set_normdn_byref(sdn, + slapi_value_get_string(pre_array[pre_index])); + memberof_del_one(pb, config, group_sdn, sdn); pre_index++; } else if(cmp > 0) { /* add post array */ - memberof_add_one( - pb, config, - group_dn, - (char*)slapi_value_get_string( - post_array[post_index])); + slapi_sdn_set_normdn_byref(sdn, + slapi_value_get_string(post_array[post_index])); + memberof_add_one(pb, config, group_sdn, sdn); post_index++; } @@ -2134,6 +2165,7 @@ int memberof_replace_list(Slapi_PBlock *pb, MemberOfConfig *config, char *group_ } } } + slapi_sdn_free(&sdn); slapi_ch_free((void **)&pre_array); slapi_ch_free((void **)&post_array); } @@ -2171,10 +2203,7 @@ int memberof_compare(MemberOfConfig *config, const void *a, const void *b) /* We only need to provide a Slapi_Attr here for it's syntax. We * already validated all grouping attributes to use the Distinguished * Name syntax, so we can safely just use the first attr. */ - return slapi_attr_value_cmp( - config->group_slapiattrs[0], - slapi_value_get_berval(val1), - slapi_value_get_berval(val2)); + return slapi_attr_value_cmp_ext(config->group_slapiattrs[0], val1, val2); } /* memberof_qsort_compare() @@ -2194,10 +2223,8 @@ int memberof_qsort_compare(const void *a, const void *b) /* We only need to provide a Slapi_Attr here for it's syntax. We * already validated all grouping attributes to use the Distinguished * Name syntax, so we can safely just use the first attr. */ - return slapi_attr_value_cmp( - qsortConfig->group_slapiattrs[0], - slapi_value_get_berval(val1), - slapi_value_get_berval(val2)); + return slapi_attr_value_cmp_ext(qsortConfig->group_slapiattrs[0], + val1, val2); } void memberof_lock() @@ -2401,14 +2428,13 @@ int memberof_fix_memberof(MemberOfConfig *config, char *dn, char *filter_str) int memberof_fix_memberof_callback(Slapi_Entry *e, void *callback_data) { int rc = 0; - char *dn = slapi_entry_get_dn(e); Slapi_DN *sdn = slapi_entry_get_sdn(e); MemberOfConfig *config = (MemberOfConfig *)callback_data; memberof_del_dn_data del_data = {0, config->memberof_attr}; Slapi_ValueSet *groups = 0; /* get a list of all of the groups this user belongs to */ - groups = memberof_get_groups(config, dn); + groups = memberof_get_groups(config, sdn); /* If we found some groups, replace the existing memberOf attribute * with the found values. */ diff --git a/ldap/servers/slapd/attr.c b/ldap/servers/slapd/attr.c index 17a8f5c..7fb613c 100644 --- a/ldap/servers/slapd/attr.c +++ b/ldap/servers/slapd/attr.c @@ -404,6 +404,7 @@ int slapi_attr_value_find( const Slapi_Attr *a, const struct berval *v ) { struct ava ava; + unsigned long a_flags; if ( NULL == a ) { return( -1 ); @@ -412,7 +413,8 @@ slapi_attr_value_find( const Slapi_Attr *a, const struct berval *v ) ava.ava_type = a->a_type; ava.ava_value = *v; if (a->a_flags & SLAPI_ATTR_FLAG_NORMALIZED) { - ava.ava_private = &a->a_flags; + a_flags = a->a_flags; + ava.ava_private = &a_flags; } else { ava.ava_private = NULL; } @@ -549,21 +551,56 @@ slapi_attr_value_cmp( const Slapi_Attr *a, const struct berval *v1, const struct } else { - Slapi_Attr a2; - struct ava ava; - Slapi_Value *cvals[2]; - Slapi_Value tmpcval; - - a2 = *a; - cvals[0] = &tmpcval; - cvals[0]->v_csnset = NULL; - cvals[0]->bv = *v1; - cvals[0]->v_flags = 0; - cvals[1] = NULL; - a2.a_present_values.va = cvals; /* JCM - PUKE */ - ava.ava_type = a->a_type; - ava.ava_value = *v2; - ava.ava_private = NULL; + Slapi_Attr a2; + struct ava ava; + Slapi_Value *cvals[2]; + Slapi_Value tmpcval; + + a2 = *a; + cvals[0] = &tmpcval; + cvals[0]->v_csnset = NULL; + cvals[0]->bv = *v1; + cvals[0]->v_flags = 0; + cvals[1] = NULL; + a2.a_present_values.va = cvals; /* JCM - PUKE */ + ava.ava_type = a->a_type; + ava.ava_value = *v2; + ava.ava_private = NULL; + retVal = plugin_call_syntax_filter_ava(&a2, LDAP_FILTER_EQUALITY, &ava); + } + return retVal; +} + +int +slapi_attr_value_cmp_ext(const Slapi_Attr *a, Slapi_Value *v1, Slapi_Value *v2) +{ + int retVal; + const struct berval *bv2 = slapi_value_get_berval(v2); + + if ( a->a_flags & SLAPI_ATTR_FLAG_CMP_BITBYBIT ) + { + const struct berval *bv1 = slapi_value_get_berval(v1); + return slapi_attr_value_cmp(a, bv1, bv2); + } + else + { + Slapi_Attr a2; + struct ava ava; + Slapi_Value *cvals[2]; + unsigned long v2_flags = v2->v_flags; + + a2 = *a; + cvals[0] = v1; + cvals[1] = NULL; + a2.a_present_values.va = cvals; /* JCM - PUKE */ + + ava.ava_type = a->a_type; + ava.ava_value = *bv2; + if (v2_flags) { + ava.ava_private = &v2_flags; + } else { + ava.ava_private = NULL; + } retVal = plugin_call_syntax_filter_ava(&a2, LDAP_FILTER_EQUALITY, &ava); } return retVal; diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h index 979b558..192d663 100644 --- a/ldap/servers/slapd/slapi-plugin.h +++ b/ldap/servers/slapd/slapi-plugin.h @@ -3766,7 +3766,7 @@ int slapi_attr_get_flags( const Slapi_Attr *attr, unsigned long *flags ); int slapi_attr_flag_is_set( const Slapi_Attr *attr, unsigned long flag ); /** - * Comare two values for a given attribute. + * Comare two bervals for a given attribute. * * \param attr Attribute used to determine how these values are compared; for * example, the syntax of the attribute may perform case-insensitive @@ -3786,6 +3786,27 @@ int slapi_attr_flag_is_set( const Slapi_Attr *attr, unsigned long flag ); int slapi_attr_value_cmp( const Slapi_Attr *attr, const struct berval *v1, const struct berval *v2 ); /** + * Comare two values for a given attribute. + * + * \param attr Attribute used to determine how these values are compared; for + * example, the syntax of the attribute may perform case-insensitive + * comparisons. + * \param v1 Pointer to the \c Slapi_Value structure containing the first value + * that you want to compare. + * \param v2 Pointer to the \c Slapi_Value structure containing the second value + * that you want to compare. + * \return \c 0 if the values are equal. + * \return \c -1 if the values are not equal. + * \see slapi_attr_add_value() + * \see slapi_attr_first_value() + * \see slapi_attr_next_value() + * \see slapi_attr_get_numvalues() + * \see slapi_attr_value_find() + * \see slapi_attr_value_cmp() + */ +int slapi_attr_value_cmp_ext(const Slapi_Attr *a, Slapi_Value *v1, Slapi_Value *v2); + +/** * Determine if an attribute contains a given value. * * \param a Attribute that you want to check. diff --git a/ldap/servers/slapd/value.c b/ldap/servers/slapd/value.c index 73e5d20..7bd11be 100644 --- a/ldap/servers/slapd/value.c +++ b/ldap/servers/slapd/value.c @@ -544,19 +544,19 @@ slapi_value_compare(const Slapi_Attr *a,const Slapi_Value *v1,const Slapi_Value int r= 0; if(v1!=NULL && v2!=NULL) { - r= slapi_attr_value_cmp( a, &v1->bv, &v2->bv); + r= slapi_attr_value_cmp_ext(a, (Slapi_Value *)v1, (Slapi_Value *)v2); } else if(v1!=NULL && v2==NULL) { - r= 1; /* v1>v2 */ + r= 1; /* v1>v2 */ } else if (v1==NULL && v2!=NULL) { - r= -1; /* v1<v2 */ + r= -1; /* v1<v2 */ } else /* (v1==NULL && v2==NULL) */ { - r= 0; /* The same */ + r= 0; /* The same */ } return r; }

1 0

Branch '389-ds-base-1.2.11' - 3 commits - ldap/servers
by Richard Allen Megginson 19 Jul '12

19 Jul '12

ldap/servers/plugins/syntaxes/nameoptuid.c | 3 - ldap/servers/plugins/syntaxes/string.c | 61 +++++++++++++++++++++++------ ldap/servers/slapd/attr.c | 6 ++ ldap/servers/slapd/attrlist.c | 6 +- ldap/servers/slapd/back-ldbm/index.c | 4 + ldap/servers/slapd/back-ldbm/ldbm_add.c | 2 ldap/servers/slapd/entry.c | 4 - ldap/servers/slapd/entrywsi.c | 6 +- ldap/servers/slapd/slapi-plugin.h | 10 ++++ ldap/servers/slapd/slapi-private.h | 4 - ldap/servers/slapd/utf8compare.c | 19 +++++++-- ldap/servers/slapd/value.c | 3 - ldap/servers/slapd/valueset.c | 4 - 13 files changed, 101 insertions(+), 31 deletions(-) New commits: commit 8e72028edfe2f17482c183cad23e74d83a1835d7 Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com> Date: Tue Jul 17 18:53:54 2012 -0700 12813: Uninitialized pointer read string_values2keys (plugins/syntaxes/string.c) Commit 2bac5ab553395550af33bf92082877ef6b4c5427 missed to set an value bvp for the newly added case ((syntax & SYNTAX_DN) && (value_flags & SLAPI_ATTR_FLAG_NORMALIZED_CES)), which caused the uninitialized pointer read. This patch sets bvp for all 3 cases. (cherry picked from commit 40013a5277599aeba62cb0996bbf9860e2acbe34) diff --git a/ldap/servers/plugins/syntaxes/string.c b/ldap/servers/plugins/syntaxes/string.c index 8d04746..e5bdc18 100644 --- a/ldap/servers/plugins/syntaxes/string.c +++ b/ldap/servers/plugins/syntaxes/string.c @@ -605,6 +605,7 @@ string_values2keys( Slapi_PBlock *pb, Slapi_Value **bvals, /* This dn value is case-normalized */ value_flags &= ~SLAPI_ATTR_FLAG_NORMALIZED_CES; value_flags |= SLAPI_ATTR_FLAG_NORMALIZED_CIS; + bvp = slapi_value_get_berval(bvdup); } else { bvp = slapi_value_get_berval(*bvlp); } commit a4f6ecb1bee63298a98f10dfac0a7c4e1a78b2b5 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Jul 13 11:56:30 2012 -0700 Trac Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values https://fedorahosted.org/389/ticket/346 Fix Description: Fix in "commit c0151f78509c35250095da6e2785842337963008" takes advantage of the knowledge on normalized attribute DNs. When generating index keys from the attribute value, it has to be case normalized, but the attribute DN is normalized w/o the cases lowered. This patch introduces attribute flags to distinguish the 2 cases: SLAPI_ATTR_FLAG_NORMALIZED_CES - normalized but not case- normalized. SLAPI_ATTR_FLAG_NORMALIZED_CIS - case-normalized And SLAPI_ATTR_FLAG_NORMALIZED is the combination of the 2 macros. (cherry picked from commit 2bac5ab553395550af33bf92082877ef6b4c5427) diff --git a/ldap/servers/plugins/syntaxes/string.c b/ldap/servers/plugins/syntaxes/string.c index 5c78d6a..8d04746 100644 --- a/ldap/servers/plugins/syntaxes/string.c +++ b/ldap/servers/plugins/syntaxes/string.c @@ -448,21 +448,31 @@ string_values2keys( Slapi_PBlock *pb, Slapi_Value **bvals, for ( bvlp = bvals, nbvlp = nbvals; bvlp && *bvlp; bvlp++, nbvlp++ ) { + unsigned long value_flags = slapi_value_get_flags(*bvlp); c = slapi_ch_strdup(slapi_value_get_string(*bvlp)); /* if the NORMALIZED flag is set, skip normalizing */ - if (!(slapi_value_get_flags(*bvlp) & SLAPI_ATTR_FLAG_NORMALIZED)) { + if (!(value_flags & SLAPI_ATTR_FLAG_NORMALIZED)) { /* 3rd arg: 1 - trim leading blanks */ value_normalize_ext( c, syntax, 1, &alt ); + value_flags |= SLAPI_ATTR_FLAG_NORMALIZED; + } else if ((syntax & SYNTAX_DN) && + (value_flags & SLAPI_ATTR_FLAG_NORMALIZED_CES)) { + /* This dn value is normalized, but not case-normalized. */ + slapi_dn_ignore_case(c); + /* This dn value is case-normalized */ + value_flags &= ~SLAPI_ATTR_FLAG_NORMALIZED_CES; + value_flags |= SLAPI_ATTR_FLAG_NORMALIZED_CIS; } if (alt) { slapi_ch_free_string(&c); - *nbvlp = slapi_value_new_string_passin(alt); + *nbvlp = slapi_value_new_string_passin(alt); alt = NULL; } else { - *nbvlp = slapi_value_new_string_passin(c); + *nbvlp = slapi_value_new_string_passin(c); + c = NULL; } /* new value is normalized */ - slapi_value_set_flags(*nbvlp, slapi_value_get_flags(*bvlp)|SLAPI_ATTR_FLAG_NORMALIZED); + slapi_value_set_flags(*nbvlp, value_flags); } *ivals = nbvals; break; @@ -570,8 +580,9 @@ string_values2keys( Slapi_PBlock *pb, Slapi_Value **bvals, bvdup= slapi_value_new(); for ( bvlp = bvals; bvlp && *bvlp; bvlp++ ) { + unsigned long value_flags = slapi_value_get_flags(*bvlp); /* 3rd arg: 1 - trim leading blanks */ - if (!(slapi_value_get_flags(*bvlp) & SLAPI_ATTR_FLAG_NORMALIZED)) { + if (!(value_flags & SLAPI_ATTR_FLAG_NORMALIZED)) { c = slapi_ch_strdup(slapi_value_get_string(*bvlp)); value_normalize_ext( c, syntax, 1, &alt ); if (alt) { @@ -583,6 +594,17 @@ string_values2keys( Slapi_PBlock *pb, Slapi_Value **bvals, c = NULL; } bvp = slapi_value_get_berval(bvdup); + value_flags |= SLAPI_ATTR_FLAG_NORMALIZED; + } else if ((syntax & SYNTAX_DN) && + (value_flags & SLAPI_ATTR_FLAG_NORMALIZED_CES)) { + /* This dn value is normalized, but not case-normalized. */ + c = slapi_ch_strdup(slapi_value_get_string(*bvlp)); + slapi_dn_ignore_case(c); + slapi_value_set_string_passin(bvdup, c); + c = NULL; + /* This dn value is case-normalized */ + value_flags &= ~SLAPI_ATTR_FLAG_NORMALIZED_CES; + value_flags |= SLAPI_ATTR_FLAG_NORMALIZED_CIS; } else { bvp = slapi_value_get_berval(*bvlp); } @@ -595,7 +617,7 @@ string_values2keys( Slapi_PBlock *pb, Slapi_Value **bvals, } buf[substrlens[INDEX_SUBSTRBEGIN]] = '\0'; (*ivals)[n] = slapi_value_new_string(buf); - slapi_value_set_flags((*ivals)[n], slapi_value_get_flags(*bvlp)|SLAPI_ATTR_FLAG_NORMALIZED); + slapi_value_set_flags((*ivals)[n], value_flags); n++; } @@ -608,7 +630,7 @@ string_values2keys( Slapi_PBlock *pb, Slapi_Value **bvals, } buf[substrlens[INDEX_SUBSTRMIDDLE]] = '\0'; (*ivals)[n] = slapi_value_new_string(buf); - slapi_value_set_flags((*ivals)[n], slapi_value_get_flags(*bvlp)|SLAPI_ATTR_FLAG_NORMALIZED); + slapi_value_set_flags((*ivals)[n], value_flags); n++; } @@ -621,7 +643,7 @@ string_values2keys( Slapi_PBlock *pb, Slapi_Value **bvals, buf[substrlens[INDEX_SUBSTREND] - 1] = '$'; buf[substrlens[INDEX_SUBSTREND]] = '\0'; (*ivals)[n] = slapi_value_new_string(buf); - slapi_value_set_flags((*ivals)[n], slapi_value_get_flags(*bvlp)|SLAPI_ATTR_FLAG_NORMALIZED); + slapi_value_set_flags((*ivals)[n], value_flags); n++; } } @@ -674,8 +696,16 @@ string_assertion2keys_ava( alt = NULL; } tmpval->bv.bv_len=strlen(tmpval->bv.bv_val); + flags |= SLAPI_ATTR_FLAG_NORMALIZED; + } else if ((syntax & SYNTAX_DN) && + (flags & SLAPI_ATTR_FLAG_NORMALIZED_CES)) { + /* This dn value is normalized, but not case-normalized. */ + slapi_dn_ignore_case(tmpval->bv.bv_val); + /* This dn value is case-normalized */ + flags &= ~SLAPI_ATTR_FLAG_NORMALIZED_CES; + flags |= SLAPI_ATTR_FLAG_NORMALIZED_CIS; } - slapi_value_set_flags(tmpval, flags|SLAPI_ATTR_FLAG_NORMALIZED); + slapi_value_set_flags(tmpval, flags); break; case LDAP_FILTER_EQUALITY: (*ivals) = (Slapi_Value **) slapi_ch_malloc( 2 * sizeof(Slapi_Value *) ); @@ -689,8 +719,16 @@ string_assertion2keys_ava( (*ivals)[0]->bv.bv_len = strlen( (*ivals)[0]->bv.bv_val ); alt = NULL; } - slapi_value_set_flags((*ivals)[0], flags|SLAPI_ATTR_FLAG_NORMALIZED); - } + flags |= SLAPI_ATTR_FLAG_NORMALIZED; + } else if ((syntax & SYNTAX_DN) && + (flags & SLAPI_ATTR_FLAG_NORMALIZED_CES)) { + /* This dn value is normalized, but not case-normalized. */ + slapi_dn_ignore_case((*ivals)[0]->bv.bv_val); + /* This dn value is case-normalized */ + flags &= ~SLAPI_ATTR_FLAG_NORMALIZED_CES; + flags |= SLAPI_ATTR_FLAG_NORMALIZED_CIS; + } + slapi_value_set_flags((*ivals)[0], flags); (*ivals)[1] = NULL; break; diff --git a/ldap/servers/slapd/attrlist.c b/ldap/servers/slapd/attrlist.c index 4ae5fcf..e365f3d 100644 --- a/ldap/servers/slapd/attrlist.c +++ b/ldap/servers/slapd/attrlist.c @@ -292,7 +292,7 @@ int attrlist_replace(Slapi_Attr **alist, const char *type, struct berval **vals) valuearray_init_bervalarray(vals, &values); if (slapi_attr_is_dn_syntax_attr(*a)) { valuearray_dn_normalize_value(values); - (*a)->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED; + (*a)->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED_CES; } rc = attr_replace(*a, values); } @@ -319,7 +319,7 @@ int attrlist_replace_with_flags(Slapi_Attr **alist, const char *type, struct ber valuearray_init_bervalarray_with_flags(vals, &values, flags); if (slapi_attr_is_dn_syntax_attr(*a)) { valuearray_dn_normalize_value(values); - (*a)->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED; + (*a)->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED_CES; } rc = attr_replace(*a, values); } diff --git a/ldap/servers/slapd/back-ldbm/index.c b/ldap/servers/slapd/back-ldbm/index.c index 43b68f5..a5c6ac5 100644 --- a/ldap/servers/slapd/back-ldbm/index.c +++ b/ldap/servers/slapd/back-ldbm/index.c @@ -455,7 +455,9 @@ index_addordel_entry( /* skip "entrydn" */ continue; } else { - slapi_values_set_flags(svals, SLAPI_ATTR_FLAG_NORMALIZED); + /* entrydn is case-normalized */ + slapi_values_set_flags(svals, + SLAPI_ATTR_FLAG_NORMALIZED_CIS); } } result = index_addordel_values_sv( be, type, svals, NULL, diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c b/ldap/servers/slapd/back-ldbm/ldbm_add.c index 18390c2..158dc8e 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_add.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c @@ -1189,7 +1189,7 @@ add_update_entrydn_operational_attributes(struct backentry *ep) bv.bv_val = (void*)backentry_get_ndn(ep); bv.bv_len = strlen( bv.bv_val ); entry_replace_values_with_flags( ep->ep_entry, LDBM_ENTRYDN_STR, bvp, - SLAPI_ATTR_FLAG_NORMALIZED ); + SLAPI_ATTR_FLAG_NORMALIZED_CIS ); } /* diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c index eb39c24..6339a6f 100644 --- a/ldap/servers/slapd/entry.c +++ b/ldap/servers/slapd/entry.c @@ -3359,7 +3359,7 @@ slapi_entry_add_values_sv(Slapi_Entry *e, attrlist_find_or_create(alist, type, &a); if (slapi_attr_is_dn_syntax_attr(*a)) { valuearray_dn_normalize_value(vals); - (*a)->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED; + (*a)->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED_CES; } rc= attr_add_valuearray(*a,vals,slapi_entry_get_dn_const(e)); } diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c index 2f2cfd3..0419864 100644 --- a/ldap/servers/slapd/entrywsi.c +++ b/ldap/servers/slapd/entrywsi.c @@ -442,7 +442,7 @@ entry_add_present_values_wsi(Slapi_Entry *e, const char *type, struct berval **b /* Check if the type of the to-be-added values has DN syntax or not. */ if (slapi_attr_is_dn_syntax_attr(a)) { valuearray_dn_normalize_value(valuestoadd); - a->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED; + a->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED_CES; } if(urp) { @@ -564,7 +564,7 @@ entry_delete_present_values_wsi(Slapi_Entry *e, const char *type, struct berval * or not. */ if (slapi_attr_is_dn_syntax_attr(a)) { valuearray_dn_normalize_value(valuestodelete); - a->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED; + a->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED_CES; } if(urp) { diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h index a7eb84c..3377c64 100644 --- a/ldap/servers/slapd/slapi-plugin.h +++ b/ldap/servers/slapd/slapi-plugin.h @@ -177,7 +177,15 @@ NSPR_API(PRUint32) PR_fprintf(struct PRFileDesc* fd, const char *fmt, ...) * \see slapi_value_set_flags() * \see slapi_values_set_flags() */ -#define SLAPI_ATTR_FLAG_NORMALIZED 0x0200 /* the attr value is normalized */ +/* the attr value is normalized */ +#define SLAPI_ATTR_FLAG_NORMALIZED \ + (SLAPI_ATTR_FLAG_NORMALIZED_CES|SLAPI_ATTR_FLAG_NORMALIZED_CIS) +#define SLAPI_ATTR_FLAG_NORMALIZED_CES 0x0200 /* the attr value is normalized, + but not case-normalized. + Used for DN. */ +#define SLAPI_ATTR_FLAG_NORMALIZED_CIS 0x0400 /* the attr value is normalized + including case. + Used for DN. */ /* operation flags */ #define SLAPI_OP_FLAG_INTERNAL 0x00020 /* An operation generated by the core server or a plugin. */ diff --git a/ldap/servers/slapd/value.c b/ldap/servers/slapd/value.c index 6d30f63..73e5d20 100644 --- a/ldap/servers/slapd/value.c +++ b/ldap/servers/slapd/value.c @@ -595,7 +595,7 @@ value_dn_normalize_value(Slapi_Value *value) value->bv.bv_val = slapi_ch_strdup(slapi_sdn_get_dn(sdn)); value->bv.bv_len = slapi_sdn_get_ndn_len(sdn); slapi_sdn_free(&sdn); - slapi_value_set_flags(value, SLAPI_ATTR_FLAG_NORMALIZED); + slapi_value_set_flags(value, SLAPI_ATTR_FLAG_NORMALIZED_CES); } else { rc = 1; slapi_ch_free((void **)&sdn); /* free just Slapi_DN */ commit 9b9d97ca73b4113eae6877ed0dff7c34bc2f8830 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Wed Jul 11 17:37:02 2012 -0700 Trac Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values https://fedorahosted.org/389/ticket/346 Fix description: 1) Set SLAPI_ATTR_FLAG_NORMALIZED to a_flag for the already normalized dn values. Then, let slapi_attr_value_find pass the flag to plugin_call_syntax_filter_ava, where dn normalization is skipped based on the knowledge. 2) To avoid the confusion, rename value_normalize_value and valuearray_normalize_value to value_dn_normalize_value and valuearray_dn_normalize_value, respectively. 3) In slapi_has8thBit, instead of checking the 8th bit one byte by one byte, check 4 bytes at one time. (cherry picked from commit c0151f78509c35250095da6e2785842337963008) (cherry picked from commit 89f13859bf753ab8fc858a5a005cdce920be2359) diff --git a/ldap/servers/plugins/syntaxes/nameoptuid.c b/ldap/servers/plugins/syntaxes/nameoptuid.c index e6341e1..af31db9 100644 --- a/ldap/servers/plugins/syntaxes/nameoptuid.c +++ b/ldap/servers/plugins/syntaxes/nameoptuid.c @@ -170,8 +170,7 @@ nameoptuid_filter_ava( syntax |= SYNTAX_NORM_FILT; } } - return( string_filter_ava( bvfilter, bvals, syntax, - ftype, retVal ) ); + return( string_filter_ava( bvfilter, bvals, syntax, ftype, retVal ) ); } diff --git a/ldap/servers/slapd/attr.c b/ldap/servers/slapd/attr.c index eab20e5..fe68ab7 100644 --- a/ldap/servers/slapd/attr.c +++ b/ldap/servers/slapd/attr.c @@ -411,7 +411,11 @@ slapi_attr_value_find( const Slapi_Attr *a, const struct berval *v ) ava.ava_type = a->a_type; ava.ava_value = *v; - ava.ava_private = NULL; + if (a->a_flags & SLAPI_ATTR_FLAG_NORMALIZED) { + ava.ava_private = &a->a_flags; + } else { + ava.ava_private = NULL; + } return(plugin_call_syntax_filter_ava( a, LDAP_FILTER_EQUALITY, &ava )); } diff --git a/ldap/servers/slapd/attrlist.c b/ldap/servers/slapd/attrlist.c index cdf9e6b..4ae5fcf 100644 --- a/ldap/servers/slapd/attrlist.c +++ b/ldap/servers/slapd/attrlist.c @@ -291,7 +291,8 @@ int attrlist_replace(Slapi_Attr **alist, const char *type, struct berval **vals) attrlist_find_or_create(alist, type, &a); valuearray_init_bervalarray(vals, &values); if (slapi_attr_is_dn_syntax_attr(*a)) { - valuearray_normalize_value(values); + valuearray_dn_normalize_value(values); + (*a)->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED; } rc = attr_replace(*a, values); } @@ -317,7 +318,8 @@ int attrlist_replace_with_flags(Slapi_Attr **alist, const char *type, struct ber attrlist_find_or_create(alist, type, &a); valuearray_init_bervalarray_with_flags(vals, &values, flags); if (slapi_attr_is_dn_syntax_attr(*a)) { - valuearray_normalize_value(values); + valuearray_dn_normalize_value(values); + (*a)->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED; } rc = attr_replace(*a, values); } diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c index 76654cd..eb39c24 100644 --- a/ldap/servers/slapd/entry.c +++ b/ldap/servers/slapd/entry.c @@ -2132,7 +2132,6 @@ slapi_entry_dup( const Slapi_Entry *e ) /* Copy flags as well */ ec->e_flags = e->e_flags; - ENTRY_DUMP(ec,"slapi_entry_dup"); return( ec ); } @@ -3359,7 +3358,8 @@ slapi_entry_add_values_sv(Slapi_Entry *e, Slapi_Attr **alist= &e->e_attrs; attrlist_find_or_create(alist, type, &a); if (slapi_attr_is_dn_syntax_attr(*a)) { - valuearray_normalize_value(vals); + valuearray_dn_normalize_value(vals); + (*a)->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED; } rc= attr_add_valuearray(*a,vals,slapi_entry_get_dn_const(e)); } diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c index 8c6a122..2f2cfd3 100644 --- a/ldap/servers/slapd/entrywsi.c +++ b/ldap/servers/slapd/entrywsi.c @@ -441,7 +441,8 @@ entry_add_present_values_wsi(Slapi_Entry *e, const char *type, struct berval **b a->a_flags |= flags; /* Check if the type of the to-be-added values has DN syntax or not. */ if (slapi_attr_is_dn_syntax_attr(a)) { - valuearray_normalize_value(valuestoadd); + valuearray_dn_normalize_value(valuestoadd); + a->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED; } if(urp) { @@ -562,7 +563,8 @@ entry_delete_present_values_wsi(Slapi_Entry *e, const char *type, struct berval /* Check if the type of the to-be-deleted values has DN syntax * or not. */ if (slapi_attr_is_dn_syntax_attr(a)) { - valuearray_normalize_value(valuestodelete); + valuearray_dn_normalize_value(valuestodelete); + a->a_flags |= SLAPI_ATTR_FLAG_NORMALIZED; } if(urp) { diff --git a/ldap/servers/slapd/slapi-private.h b/ldap/servers/slapd/slapi-private.h index 75f8e8f..f995e30 100644 --- a/ldap/servers/slapd/slapi-private.h +++ b/ldap/servers/slapd/slapi-private.h @@ -369,7 +369,7 @@ const CSN *value_get_csn( const Slapi_Value *value, CSNType t ); const CSNSet *value_get_csnset ( const Slapi_Value *value); Slapi_Value *value_remove_csn( Slapi_Value *value, CSNType t); int value_contains_csn( const Slapi_Value *value, CSN *csn); -int value_normalize_value(Slapi_Value *value); +int value_dn_normalize_value(Slapi_Value *value); /* dn.c */ /* this functions should only be used for dns allocated on the stack */ @@ -835,7 +835,7 @@ void valuearray_add_value_fast(Slapi_Value ***vals, Slapi_Value *addval, int nva void valuearray_add_valuearray( Slapi_Value ***vals, Slapi_Value **addvals, PRUint32 flags ); void valuearray_add_valuearray_fast( Slapi_Value ***vals, Slapi_Value **addvals, int nvals, int naddvals, int *maxvals, int exact, int passin ); int valuearray_find(const Slapi_Attr *a, Slapi_Value **va, const Slapi_Value *v); -int valuearray_normalize_value(Slapi_Value **vals); +int valuearray_dn_normalize_value(Slapi_Value **vals); /* * proxyauth.c diff --git a/ldap/servers/slapd/utf8compare.c b/ldap/servers/slapd/utf8compare.c index f595ed6..e336ccb 100644 --- a/ldap/servers/slapd/utf8compare.c +++ b/ldap/servers/slapd/utf8compare.c @@ -60,14 +60,27 @@ typedef struct sUpperLowerTbl { int slapi_has8thBit(unsigned char *s) { - unsigned char *p, *tail; - tail = s + strlen((char *)s); - for (p = s; p < tail; p++) { +#define MY8THBITWIDTH 4 /* sizeof(PRUint32) */ +#define MY8THBITFILTER 0x80808080 + unsigned char *p, *stail, *ltail; + PRUint32 *uip; + size_t len = strlen((const char *)s); + ltail = s + len; + stail = ltail - (len % MY8THBITWIDTH); + for (p = s; p < stail; p += MY8THBITWIDTH) { + uip = (PRUint32 *)p; + if (MY8THBITFILTER & *uip) { + return 1; + } + } + for (; p < ltail; p++) { if (0x80 & *p) { return 1; } } return 0; +#undef MY8THBITWIDTH +#undef MY8THBITFILTER } /* diff --git a/ldap/servers/slapd/value.c b/ldap/servers/slapd/value.c index 0d2a29b..6d30f63 100644 --- a/ldap/servers/slapd/value.c +++ b/ldap/servers/slapd/value.c @@ -581,7 +581,7 @@ value_dump( const Slapi_Value *value, const char *text) #endif int -value_normalize_value(Slapi_Value *value) +value_dn_normalize_value(Slapi_Value *value) { Slapi_DN *sdn = NULL; int rc = 0; @@ -595,6 +595,7 @@ value_normalize_value(Slapi_Value *value) value->bv.bv_val = slapi_ch_strdup(slapi_sdn_get_dn(sdn)); value->bv.bv_len = slapi_sdn_get_ndn_len(sdn); slapi_sdn_free(&sdn); + slapi_value_set_flags(value, SLAPI_ATTR_FLAG_NORMALIZED); } else { rc = 1; slapi_ch_free((void **)&sdn); /* free just Slapi_DN */ diff --git a/ldap/servers/slapd/valueset.c b/ldap/servers/slapd/valueset.c index 6a3a205..a91256c 100644 --- a/ldap/servers/slapd/valueset.c +++ b/ldap/servers/slapd/valueset.c @@ -1444,13 +1444,13 @@ valueset_update_csn_for_valuearray(Slapi_ValueSet *vs, const Slapi_Attr *a, Slap } int -valuearray_normalize_value(Slapi_Value **vals) +valuearray_dn_normalize_value(Slapi_Value **vals) { int rc = 0; Slapi_Value **vp = NULL; for (vp = vals; vp && *vp; vp++) { - rc |= value_normalize_value(*vp); + rc |= value_dn_normalize_value(*vp); } return rc;

1 0

Changes to 'refs/tags/389-ds-base-1.2.10.14'
by Richard Allen Megginson 19 Jul '12

19 Jul '12

Changes since 389-ds-base-1.2.6.a1: Charles Lopes (1): Bug #361: Bad DNs in ACIs can segfault ns-slapd Endi S. Dewata (168): Bug 545620 - Password cannot start with minus sign Bug 538525 - Ability to create instance as non-root user Bug 570542 - Root password cannot contain matching curly braces Bug 470684 - Pam_passthru plugin doesn't verify account activation Bug 573375 - MODRDN operation not logged Bug 520151 - Error when modifying userPassword with proxy user Bug 455489 - Address compiler warnings about strict-aliasing rules Bug 566320 - RFE: add exception to removal of attributes in cn=config for aci Bug 566043 - startpid file is only cleaned by initscript runs Bug 584109 - Slapd crashes while parsing DNA configuration Bug 542570 - Directory Server port number is not validated in the beginning. Bug 145181 - Plugin target/bind subtrees only take 1 value. Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 628096 - spurious error message from /sbin/service when doing a stop on no instances Bug 573889 - Migration does not remove deprecated schema Bug 606545 - core schema should include numSubordinates Bug 643979 - Strange byte sequence for attribute with no values (nsslapd-referral) Endi Sukma Dewata (16): Bug 630092 - Coverity #12117: Resource leaks issues Bug 630092 - Coverity #15478: Resource leaks issues Bug 630092 - Coverity #15479: Resource leaks issues Bug 630092 - Coverity #15481: Resource leaks issues Bug 630092 - Coverity #15482: Resource leaks issues Bug 630092 - Coverity #15483: Resource leaks issues Bug 630092 - Coverity #15484: Resource leaks issues Bug 630092 - Coverity #15485: Resource leaks issues Bug 630092 - Coverity #15487: Resource leaks issues Bug 630092 - Coverity #15490: Resource leaks issues Bug 630092 - Coverity #15497: Resource leaks issues Bug 630092 - Coverity #11991: Resource leaks issues Bug 630092 - Coverity #12000: Resource leaks issues Bug 630092 - Coverity #12003: Resource leaks issues Bug 630092 - Coverity #11985: Resource leaks issues Bug 630092 - Coverity #11992,11993: Resource leaks issues Mark Reynolds (19): Ticket #71 - unable to delete managed entry config Ticket #159 - Managed Entry Plugin runs against managed entries upon any update without validating Ticket #177 - logconv.pl doesn't detect restarts Merge branch 'ticket159' Ticket #49 - better handling for server shutdown while long running tasks are active Ticket #50 - server should not call a plugin after the plugin close function is calle Updated for ticket#50 Ticket #55 - Limit of 1024 characters for nsMatchingRule Ticket #140 - incorrect memset parameters Revert "Ticket #140 - incorrect memset parameters" Revert "Ticket #55 - Limit of 1024 characters for nsMatchingRule" Ticket #38 - nisDomain schema is incorrect Ticket #6 - protocol error from proxied auth operation Ticket #55 - Limit of 1024 characters for nsMatchingRule Ticket #39 - Account Policy Plugin does not work for simple binds when PAM Pass Through Auth plugin is enabled Ticket 175 - logconv.pl improvements Ticket 175 - minor fixes Ticket #306 - void function cannot return value Ticket #305 - Certain CMP operations hang or cause ns-slapd to crash Nathan Kinder (189): Bug 549554 - Trim single-valued attributes before sending to AD Improve search for pcre header file Bug 434735 - Allow SASL ANONYMOUS mech to work Bug 570912 - Avoid selinux context conflict with httpd Allow instance name to be parsed from start-slapd Add managed entries plug-in Bug 572355 - Label instance files and ports during upgrade. Bug 578863 - Password modify extop needs to send referrals on replicas Bug 584156 - Remove ldapi socket file during upgrade Fix rsearch usage of name files for random filters Bug 584497 - Allow DNA plugin to set same value on multiple attributes Add replication session hooks Correct function prototype for repl session hook Bug 592389 - Set anonymous resource limits properly Bug 601433 - Add man pages for start-dirsrv and related commands Bug 604263 - Fix memory leak when password change is rejected Bug 612242 - membership change on DS does not show on AD Bug 613833 - Allow dirsrv_t to bind to rpc ports Bug 594745 - Get rid of dirsrv_lib_t label Bug 620927 - Allow multiple membership attributes in memberof plugin Bug 612264 - ACI issue with (targetattr='userPassword') Bug 630098 - fix coverity Defect Type: Code maintainability issues Bug 630098 - fix coverity Defect Type: Code maintainability issues Bug 630093 - (cov#15511) Don't use unintialized search_results in refint plugin Bug 630093 - (cov#15518) Need to intialize fd in ldbm2ldif code Bug 630096 - (cov#11778) check return value of ldap_parse_result Bug 630096 - (cov#15446) check return value of ber_scanf() Bug 630096 - (cov#15449,15450) Check return value of stat() Bug 630096 - (cov#15448) Check return value of cache_replace() Bug 630096 - (cov#15447) - Check return value of idl_append_extend() Bug 630090 - (cov#11974) Remove unused ACL functions Bug 630090 - (cov#15445) Fix illegal free in archive code Bug 630094 - (cov#11818) Fix unreachable return in snmp subagent Bug 630094 - (cov#15451) Get rid of unreachable free statements Bug 630094 - (cov#15452) Remove NULL checking for op_string Bug 630094 - (cov#15453) Eliminate NULL check for local_newentry Bug 630094 - (cov#15454) Fix deadcode issue in mapping tree code Bug 630094 - (cov#15455) Remove deadcode in attr_index_config() Bug 630094 - (cov#15456) Remove NULL check for srdn in import code Bug 630094 - (cov#15457) Remove deadcode in import code Bug 630094 - (cov#15458) Fix deadcode issue in moddn code Bug 630094 - (cov#15459) Remove NULL check for srdn in ldif2ldbm code Bug 630094 - (cov#15520) Fix unreachable code issue if perfctrs code Bug 630094 - (cov#15581) Add missing breaks in agt_mopen_stats() Bug 690090 - (cov#11974) Remove additional unused ACL functions Bug 630091 - (cov#15512) Fix usage of uninitialized bervals Bug 630091 - (cov#15513) Fix usage of uninitialized bervals Bug 630091 - (cov#15514) Initialize DBT in entryrdn_get_parent() Bug 630091 - (cov#15515) Use of uninitialized array in index config code Bug 630091 - (cov#15516,15517) Initialize pointers before attempting to free Bug 630091 - (cov#15519) Initialize bervals in search_easter_egg() Bug 630091 - (cov#15582) Free of uninitialized pointer in attr_index_config() Bug 630097 - (cov#11933) Fix NULL dereference in schema code Bug 630097 - (cov#11938) NULL dereference in mmldif Bug 630097 - (cov#11946) NULL dereference in ResHashCreate() Bug 630097 - (cov#11964) Remove dead code from libaccess Bug 630097 - (cov#12143) NULL dereference in cos cache code Bug 630097 - (cov#12148) NULL dereference in ruvInit() Bug 630097 - (cov#12182,12183) NULL dereference in import code Bug 630097 - (cov#15460) NULL deference in ACL URL code Bug 630097 - (cov#15461) Remove unnecessary NULL check in DNA Bug 630097 - (cov#15462) NULL dereference in mep_modrdn_post_op() Bug 630097 - (cov#15463) Remove NULL check in referint plugin Bug 630097 - (cov#15464) NULL dereference in repl code Bug 630097 - (cov#15465) Null dereference in USN code Bug 630097 - (cov#15473) NULL dereference in ResHashCreate() Bug 630097 - (cov#15505) NULL dereference in memberOf code Bug 630097 - (cov#15506) NULL dereference in dblayer code Bug 630097 - (cov#15507,15508) NULL dereference in entryrdn code Bug 630097 - (cov#15509) NULL dereference in idsktune Bug 630097 - (cov#11938) NULL dereference in mmldif Bug 630097 - (cov#15477) NULL dereference in ACL plug-in code Bug 630091 - (cov#12209) Use of uninitialized pointer in libaccess Bug 630092 - (cov#12116) Resource leak in ldclt code Bug 630092 - (cov#12105) Resource leak in pwdscheme config code Bug 630092 - (cov#12068) Resource leak in certmap code Bug 630091 - (cov#11973) Array overrun in libaccess Bug 522055 - Scope check for managed attribute fails Bug 625335 - Self-write aci has permission to invalid attribute Bug 631993 - Log authzid when proxy auth control is used Cov #16300 - Unused variable in account policy plugin Bug 544321 - remove-ds.pl should not throw error unlabelling port Bug 555955 - Allow CoS values to be merged Bug 643937 - Initialize replication version flags Bug 305131 - Allow empty modify operation Bug 619633 - Make attribute uniqueness obey requiredObjectClass Bug 619623 - attr-unique-plugin ignores requiredObjectClass on modrdn operations Bug 189985 - Improve attribute uniqueness error message Bug 647932 - multiple memberOf configuration adding memberOf where there is no member Bug 521088 - DNA should check ACLs before getting a value from the range Bug 635009 - Add one-way AD sync capability Bump VERSION.sh to 1.2.8.a1 Bug 648949 - Move selinux policy into base OS Bug 648949 - Update configure Roll back VERSION.sh for 1.2.7 release Bug 625950 - hash nsslapd-rootpw changes in audit log Bug 656392 - Remove calls to ber_err_print() Bug 656515 - Allow Name and Optional UID syntax for grouping attributes Bug 197886 - Avoid overflow of UUID generator Bug 658312 - Allow mapped attribute types to be quoted Bug 197886 - Initialize return value for UUID generation code Bug 658309 - Process escaped characters in managed entry mappings Bug 659456 - Incorrect usage of ber_printf() in winsync code Bug 641944 - Don't normalize non-DN RDN values Bug 658312 - Invalid free in Managed Entry plug-in Bug 661792 - Valid managed entry config rejected Bug 588791 - Allow anonymous rootDSE access only Bug 606439 - Creating server instance with LDAPI takes too long Bug 632670 - Chain-on-update logs managed-entries-plugin errors Bug 621008 - parsing purge RUV from changelog at startup fails Bug 663191 - Don't use $USER in DSCreate.pm Bug 663597 - Memory leaks in normalization code Bug 659131 - Incorrect RDN values added with multi-valued RDN Bug 661102 - Rename of managed entries not handled correctly Bug 193297 - Call pre-bind plug-ins for all SASL bind steps Bug 201652 - LDAPv2 bind with expired password doesn't unbind correctly Bug 470576 - Migration could do addition checks before commiting actions Bug 481195 - Missing op type in log when password change required Bug 509897 - Validate dnaScope to ensure it is a legal DN Bug 505722 - Allow ntGroup to have mail attribute present Bug 543633 - replication problems if supplier is killed under update load Bug 671033 - range sharing between server breaks with SASL/GSSAPI auth Bug 527912 - setup-ds.pl appears to hang when DNS is unreachable Bug 252249 - Add pkg-config file for plug-in developers Bug 670616 - Allow SSF to be set for local (ldapi) connections Bug 668862 - init scripts return wrong error code Bug 674430 - Improve error messages for attribute uniqueness Bug 675853 - dirsrv crash segfault in need_new_pw() Bug 678646 - Ignore tombstone operations in managed entry plug-in Bug 671199 - Don't allow other to write to rundir Bug 672468 - Don't use empty path elements in LD_LIBRARY_PATH Bug 674852 - crash in ldap-agent when using OpenLDAP Bug 681345 - setup-ds.pl should set SuiteSpotGroup automatically Bug 680558 - Winsync plugin fails to restrain itself to the configured subtree Bug 504803 - Allow maxlogsize to be set if logmaxdiskspace is -1 Bug 687974 - (cov#10715) Fix Coverity uninitialized variables issues Bug 688341 - (cov#10709) Fix Coverity code maintainability issues Bug 688341 - (cov#10708) Fix Coverity code maintainability issues Bug 688341 - (cov#10706,10707) Fix Coverity code maintainability issues Bug 688341 - (cov#10704,10705) Fix Coverity code maintainability issues Bug 688341 - (cov#10703) Fix Coverity code maintainability issues Bug 688341 - (cov#10702) Fix Coverity code maintainability issues Bug 688341 - (cov#10709) Fix Coverity code maintainability issues Bug 689537 - (cov#10699) Fix Coverity NULL pointer dereferences Bug 689537 - (cov#10610) Fix Coverity NULL pointer dereferences Bug 689537 - (cov#10608) Fix Coverity NULL pointer dereferences Bug 689952 - (cov#10581) Incorrect bit check in replication connection code Bug 690526 - (cov#10734) Double free in dse_add() Bug 690649 - (cov#10731) Use of free'd pointer in indexing code Bug 690882 - (cov#10571) Incorrect sizeof use in uuid code Bug 690882 - (cov#10636,10637) Useless comparison in attrcrypt Bug 690882 - (cov#10703) Incorrect sizeof use in vattr code Bug 690882 - (cov#10572,10710) Incorrect sizeof use in uuid code Bug 691574 - (cov#10579) Check return value of ber_scanf() in sort code Bug 691574 - (cov#10577) Check return types when adding RDN CSNs Bug 691574 - (cov#10573) check return value in GER code Bug 691574 - (cov#10575) Check return value of ldap_get_option Bug 691574 - (cov#10573) Fix syntax error Bug 693868 - Add managed entry config during in-place upgrade Add Auto Membership Plug-in Bug 698428 - Make auto membership use Slapi_DN for DN comparisons Bug 695779 - windows sync can lose old values when a new value is added Bug 700557 - Linked attrs callbacks access free'd pointers after close Bug 700557 - Leak at shutdown in DNA plug-in Bug 703304 - Auto membership alternate config area should override default area Bug 703304 - Auto membership alternate config area should override default area Bug 703530 - Allow Managed Entry config to be relocated Bug 697961 - memberOf needs to be triggered by internal operations Bug 710377 - Import with chain-on-update crashes ns-slapd Split automember regex rules into separate entries Bug 713209 - Update sudo schema Bug 691313 - Need TLS/SSL error messages in repl status and errors log Bug 723937 - Slapi_Counter API broken on 32-bit F15 Bug 725743 - Make memberOf use PRMonitor for it's operation lock Bug 729717 - Fatal error messages when syncing deletes from AD Bug 728510 - Run dirsync after sending updates to AD Bug 730387 - Add slapi_rwlock API and use POSIX rwlocks Bug 611438 - Add Account Usability Control support Bug 728592 - Allow ns-slapd to start with an invalid server cert Bug 732541 - Ignore error 32 when adding automember config Bug 722292 - Entries in DS are not updated properly when using WinSync API Bug 722292 - (cov#11030) Leak of mapped_sdn in winsync rename code Bug 735114 - renaming a managed entry does not update mepmanagedby Bug 739172 - Allow separate fractional attrs for incremental and total protocols Bug 743966 - Compiler warnings in account usability plugin Bug 744946 - (cov#11046) NULL dereference in IDL code Bug 752155 - Use restorecon after creating init script lock file Ticket 284 - Remove unnecessary SNMP MIB files ticket 304 - Fix kernel version checking in dsktune Noriko Hosoi (311): 544089 - Referential Integrity Plugin does not take into account the attribute 557224 - subtree rename breaks the referential integrity plug-in 247413 - Incorrect error on multiple identical value add 559016 - Attempting to rename suffix returns inappropriate errors 555577 - Syntax validation fails for "ou=NetscapeRoot" tree Undo - 555577 - Syntax validation fails for "ou=NetscapeRoot" tree 560827 - Admin Server templates: DistinguishName validation fails 548535 - memory leak in attrcrypt 563365 - Error handling problems in the backend functions 565664 - Incorrect parameter for CACHE_RETURN() 565987 - redhat-ds-base fails to build due to undefined struct 527848 - make sure db upgrade to 4.7 and later works correctly 539618 - Replication bulk import reports Invalid read/write 567370 - dncache: assertion failure in id2entry_delete 548115 - memory leak in schema reload 555970 - missing read lock in the combination of cos and nsview 539618 - Replication bulk import reports Invalid read/write 570667 - MMR: simultaneous total updates on the masters cause Merge branch '547503' Revert "Merge branch '547503'" Bug 554573 - ACIs use bind DN from bind req rather than cert mapped DN from sasl/external 199923 - subtree search fails to find items under a db 570107 - The import of LDIFs with base-64 encoded DNs fails, 572649 - DS8.2 crashes on RHEL 4 (corresponding to bob, ber_2 test case) 573060 - DN normalizer: ESC HEX HEX is not normalized ( 573896 - initializing subtree with invalid syntax crashes ns-slapd 515805 - Stop "initialize Database" crashes the server 548533 - memory leak in Repl_5_Inc_Protocol_new Fixing a syntax error Update to New DN Format 585905 - ACL with targattrfilters error crashes the server 574167 - An escaped space at the end of the RDN value is not 590931 - rhds81 import - hardcoded pages_limit for nsslapd-import-cache-autosize 591336 - Implementing upgrade DN format tool 593453 - Creating password policy with ns-newpolicy.pl on Replicated 593110 - backup-restore does not ALWAYS work 593899 - adding specific ACI causes very large mem allocate request 588867 - entryusn plugin fails on solaris 593899 - adding specific ACI causes very large mem allocate request 595893 - Base DN in SASL mapping is not normalized 511112 - Password history limited to 25 values 597375 - Deleting LDBM database causes backup/restore problem 574101 - MODRDN request never returns - possible deadlock 606920 - anonymous resource limit - nstimelimit - 605827 - In-place upgrade: upgrade dn format should not run in setup-ds-admin.pl 578296 - Attribute type entrydn needs to be added when subtree 609256 - Selinux: pwdhash fails if called via Admin Server CGI 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 609255 - fix coverity Defect Type: Memory - illegal accesses issues 616618 - 389 v1.2.5 accepts 2 identical entries with different DN formats 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 610281 - fix coverity Defect Type: Control flow issues 616608 - SIGBUS in RDN index reads on platforms with strict alignments 619595 - Upgrading sub suffix under non-normalized suffix disappears 513166 - Simple Paged result doesn't provide the server's estimate 621928 - Unable to enable replica (rdn problem?) on 1.2.6 rc6 Bug 194531 - db2bak is too noisy Bug 622628 - fix coverity Defect Type: Integer handling issues Bug 622628 - fix coverity Defect Type: Integer handling issues Bug 622628 - fix coverity Defect Type: Integer handling issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 622903 - fix coverity Defect Type: Code maintainability issues Bug 623118 - Simplepaged results going in infinite loop Bug 614511 - fix coverity Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 619122 - fix coverity Defect Type: Resource leaks issues CID 11975 - 12051 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 617630 - fix coverity Defect Type: Resource leaks issues CID 12052 - 12093 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 616500 - fix coverity Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverity Defect Type: Resource leaks issues CID 12094 - 12136 Bug 616500 - fix coverity Defect Type: Resource leaks issues CID 12094 - 12136 Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939 Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 Bug 616500 - fix coverity Defect Type: Resource leaks issues Bug 623507 - fix coverity Defect Type: Incorrect expression issues Bug 623507 - fix coverity Defect Type: Incorrect expression issues Bug 613056 - fix coverify Defect Type: Null pointer dereferences Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166 Removed redundant code in agmt_new_from_entry Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093 Bug 628300 - DN is not normalized in dn/entry cache when an entry is added, entrydn is not present in search results Bug 531642 - EntryUSN: RFE: a configuration option to make entryusn "global" Bug 627738 - The cn=monitor statistics entries for the dnentry cache do not change or change very rarely DN normalizer should check the invalid type Bug 627738 - The cn=monitor statistics entries for the dnentry cache Bug 629710 - escape_string does not check '\<HEX><HEX>' agmtlist_shutdown (repl5_agmtlist.c) had an illegal access defect. Bug 633168 - Share backend dbEnv with the replication changelog Bug 633168 - Share backend dbEnv with the replication changelog Bug 631862 - crash - delete entries not in cache + referint Bug 625014 - SubTree Renames: ModRDN operation fails and the server hangs if the entry is moved to "under" the same DN. Bug 558099 - Enhancement request: Log more information about the search result being a paged one Bug 635987 - Incorrect sub scope search result with Bug 606920 - anonymous resource limit- nstimelimit - Bug 635987 - Incorrect sub scope search result with ACL containing ldap:///self Bug 639289 - Adding a new CN entry with UpperCase UTF-8 Character Bug 640027 - Naming attribute with a special char sequence parsing bug Bug 640854 - changelog db: _cl5WriteOperation: failed to Bug 637852 - sasl_io_start_packet: failed - read only 3 bytes Bug 586966 - Sample update script has syntax errors Bug 586973 - Sample update ldif points to non-existent directory Bug 602456 - Allow to add any cn=config attributes; Bug 244229 - targetattr not verified against schema when setting an aci Bug 643532 - Incorrect DNs sometimes returned on searches Bug 592397 - Upgrade tool dn2rdn: it does not clean up Bug 645061 - Upgrade: 06inetorgperson.ldif and 05rfc4524.ldif Bug 629681 - Retro Changelog trimming does not behave as expected Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs Bug 638773 - permissions too loose on pid and lock files Bug 491733 - dbtest crashes Bug 329751 - "nested" filtered roles searches candidates more Bug 567282 - server can not abandon searchRequest of "simple paged results" Bug 572018 - Upgrading from 1.2.5 to 1.2.6.a2 deletes userRoot Bug 651571 - When attrcrypt is on, entrydn is stored in the backend db Bug 661918 - 389-ds MMR plugin's changelogdb path logic is incorrect Bug 182507 - clear-password mod from replica is discarded before changelogged Bug 602456 - Allow to add any cn=config attributes; Bug 489379 - passwordExpirationTime in entry being added Bug 663484 - Entry usn plugin fails to properly tag entries on initialization Bug 664563 - GER: ger for non-present entry is not correct Bug 653007 - db2ldif export of clear text passwords lacks storage scheme Bug 667488 - Cannot recreate numsubordinates index with db2index Bug 663752 - Cert renewal for attrcrypt and encchangelog Bug 615100 - log rotationinfo always recreated at startup, Bug 624442 - MMR: duplicate replica ID Bug 669205 - db2bak: backed up changelog should include RUVs Bug 616850 - ldapmodify failed to reject the replace operation Bug 627993 - Inconsistent storage of password expiry times Bug 627993 - Inconsistent storage of password expiry times dn2rdn should respect the DB version info Bug 646381 - Faulty password for nsmultiplexorcredentials does not give any error message in logs Bug 624547 - attrcrypt should query the given slot/token for Bug 668619 - slapd stops responding Bug 151705 - Need to update Console Cipher Preferences with new ciphers Bug 615052 - intrinsics and 64-bit atomics code fails to compile Bug 616213 - insufficient stack size for HP-UX on PA-RISC Bug 675265 - preventryusn gets added to entries on a failed delete Bug 604881 - admin server log files have incorrect permissions/ownerships Bug 676053 - export task followed by import task causes cache assertion Bug 676053 - export task followed by import task causes cache assertion Bug 676053 - export task followed by import task causes cache assertion Bug 450016 - RFE- Console display values in KB/MB/GB Cancelling commit aef19508c4f618285116d2068655183658f564d9 Bug 625424 - repl-monitor.pl doesn't work in hub node Bug 679978 - modifying attr value crashes the server, which is supposed to Bug 681015 - RFE: allow fine grained password policy duration attributes in days, hours, minutes, as well Bug 668909 - Can't modify replication agreement in some cases Bug 684996 - Exported tombstone cannot be imported correctly Bug 681015 - RFE: allow fine grained password policy duration attributes in days, hours, minutes, as well Bug 689866 - ns-newpwpolicy.pl needs to use the new DN format Bug 690955 - Mrclone fails due to the replica generation id mismatch Bug 696407 - If an entry with a mixed case RDN is turned to be Bug 697027 - 1 - minor memory leaks found by Valgrind + TET Bug 697027 - 2 - minor memory leaks found by Valgrind + TET Bug 697027 - 3 - minor memory leaks found by Valgrind + TET Bug 697027 - 4 - minor memory leaks found by Valgrind + TET Bug 697027 - 5 - minor memory leaks found by Valgrind + TET Bug 697027 - 6 - minor memory leaks found by Valgrind + TET Bug 697027 - 7 - minor memory leaks found by Valgrind + TET Bug 697027 - 8 - minor memory leaks found by Valgrind + TET Bug 697027 - 9 - minor memory leaks found by Valgrind + TET Bug 697027 - 10 - minor memory leaks found by Valgrind + TET Bug 697027 - 11 - minor memory leaks found by Valgrind + TET Bug 697027 - 12 - minor memory leaks found by Valgrind + TET Bug 697027 - 13 - minor memory leaks found by Valgrind + TET Bug 697027 - 14 - minor memory leaks found by Valgrind + TET Bug 697027 - 15 - minor memory leaks found by Valgrind + TET Bug 697027 - 16 - minor memory leaks found by Valgrind + TET Bug 697027 - 3 - minor memory leaks found by Valgrind + TET Bug 697027 - 3 - minor memory leaks found by Valgrind + TET Bug 700215 - ldclt core dumps Bug 668619 - slapd stops responding Bug 709826 - Memory leak: when extra referrals configured Bug 706179 - DS can not restart after create a new objectClass has entryusn attribute Bug 663752 - Cert renewal for attrcrypt and encchangelog Bug 663752 - Cert renewal for attrcrypt and encchangelog Bug 711679 - unresponsive LDAP service when deleting vlv on replica Bug 711679 - unresponsive LDAP service when deleting vlv on replica Bug 718303 - Intensive updates on masters could break the consumer's cache Merge branch '718303' Bug 719069 - clean up compiler warnings in 389-ds-base 1.2.9 Bug 712855 - Directory Server 8.2 logs "Netscape Portable Bug 663752 - Cert renewal for attrcrypt and encchangelog Bug 732153 - subtree and user account lockout policies implemented? Introducing an environment variable USE_VALGRIND to clean up the entry cache and dn cache on exit. Bug 744945 - nsslapd-counters attribute value cannot be set to "off" Keep unhashed password psuedo-attribute in the adding entry Reduce the number of DN normalization Bug 745259 - Incorrect entryUSN index under high load Bug 750622 - Fix Coverity (11104) Resource leak: Bug 750624 - Fix Coverity (11053) Explicit null dereferenced: Bug 750625 - Fix Coverity (11066) Unused pointer value Bug 750625 - Fix Coverity (11065) Uninitialized pointer read Bug 750625 - Fix Coverity (11064) Dereference before null check Bug 750625 - Fix Coverity (11061) Resource leak Bug 750625 - Fix Coverity (11060) Dereference null return value Bug 750625 - Fix Coverity (11058, 11059) Dereference null return value Bug 750625 - Fix Coverity (11057) Dereference null return value Bug 750625 - Fix Coverity (11055) Explicit null dereferenced Bug 750625 - Fix Coverity (11054) Dereference after null check Bug 750625 - Fix Coverity (11117) Uninitialized pointer read Bug 750625 - Fix Coverity (11116) Uninitialized pointer read Bug 750625 - Fix Coverity (11114, 11115) Uninitialized value use Bug 750625 - Fix Coverity (11113) Uninitialized pointer read Bug 750625 - Fix Coverity (11112) Uninitialized pointer read Bug 750625 - Fix Coverity (11109, 11110, 11111) Uninitialized pointer read Bug 750625 - Fix Coverity (11108) Sizeof not portable Bug 750625 - Fix Coverity (11107) Dereference before null check Bug 750625 - Fix Coverity (11096) Explicit null dereferenced Bug 750625 - Fix Coverity (11095) Explicit null dereferenced Bug 750625 - Fix Coverity (11094) Dereference after null check Bug 750625 - Fix Coverity (11091) Unchecked return value Bug 750625 - Fix Coverity (11055-2) Explicit null dereferenced Bug 750625 - Fix Coverity (11062) Resource leak Bug 750625 - Fix Coverity (11066-2) Unused pointer value Bug 750625 - Fix Coverity (12195) Dereference after null check Bug 750625 - Fix Coverity (12196) Dereference before null check Bug 750625 - Fix Coverity (11066-3) Unused pointer value Bug 745259 - Incorrect entryUSN index under high load in Trac Ticket 2 - If node entries are tombstone'd, Trac Ticket 2 - If node entries are tombstone'd, Trac Ticket 26 - Please support setting Trac Ticket 75 - Unconfigure plugin opperations are being called. Trac Ticket 168 - minssf should not apply to rootdse Trac Ticket #18 - Data inconsitency during replication Trac Ticket #52 - FQDN set to nsslapd-listenhost Trac Ticket 139 - eliminate the use of char *dn in favor of Slapi_DN *dn Trac Ticket 35 - Log not clear enough on schema errors Trac Ticket #274 - Reindexing entryrdn fails if Trac Ticket #275 - Invalid read reported by valgrind Trac Ticket 51 - memory leaks in 389-ds-base-1.2.8.2-1.el5? Trac Ticket #26 - Please support setting defaultNamingContext in the rootdse. Trac Ticket #298 - crash when replicating orphaned tombstone entry Trac Ticket #290 - server hangs during shutdown if betxn pre/post op fails Trac Ticket #359 - Database RUV could mismatch the one Trac Ticket #338 - letters in object's cn get converted to Trac Ticket #359 - Database RUV could mismatch the one Ticket #390 - [abrt] 389-ds-base-1.2.10.6-1.fc16: slapi_attr_value_cmp: Process /usr/sbin/ns-slapd was killed by signal 11 (SIGSEGV) Bug 829213 - unhashed#user#password visible after changing password Ticket 365 - passwords in clear text in the audit log Bug 829213 - unhashed#user#password visible after changing password Bug 829213 - unhashed#user#password visible after changing password Trac Ticket 396 - Account Usability Control Not Working [Bug 835238] Rich Megginson (332): Net::LDAP password modify extop breaks; msgid in response is 0xFF Clean up assert for entrydn Bug 543080 - Bitwise plugin fails to return the exact matched entries for Bitwise search filter Bug 537466 - nsslapd-distribution-plugin should not require plugin name to begin with "lib" bump version to 1.2.6.a2 Do not use syntax plugins directly for filters, indexing wrap new style matching rule plugins for use in old style indexing code change extensible filter code to use new syntax function style mr funcs change syntax plugins to register required matching rule plugins crash looking up compat syntax; numeric string syntax using integer; make octet string ordering work correctly fix memory leak in attr replace when replacement fails fix dso linking issues found by fedora 13 linking problems linking with -z defs 389 DS segfaults on libsyntax-plugin.so - part 1 389 DS segfaults on libsyntax-plugin.so - part 2 389 DS segfaults on libsyntax-plugin.so - part 3 Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location on non-RHEL/Fedora OS Bug 568196 - Install DS8.2 on Solaris fails Bug 568196 - Install DS8.2 on Solaris fails - part 2 Bug 551198 - LDAPI: incorrect logging to access log bump version to 1.2.6.a3 fix various memory leaks Bug 551198 - LDAPI: incorrect logging to access log - part 2 Bug 554573 - ACIs use bind DN from bind req rather than cert mapped DN from sasl/external cleanup build warnings Bug 571514 - upgrade to 1.2.6 should upgrade 05rfc4523.ldif (cert schema) Bug 570905 - postalAddress syntax should allow empty lines (should allow $$) Add support for additional schema/matching rules included with 389 Bug 572677 - Memory leak in searches including GER control Bug 571677 - Busy replica on consumers when directly deleting a replication conflict Bug 576074 - search filters with parentheses fail Bug 567429 - slapd didn't close connection and get into CLOSE_WAIT state Bug 578167 - repl. of mod/replace deletes multi-valued attrs Bug 561575 - setup-ds-admin fails to supply nsds5ReplicaName when configuring via ConfigFile Bug 572162 - the string "|*" within a search filter on a non-indexed attribute returns all elements. Bug 576644 - segfault while multimaster replication (paired node won't find deleted entries) start of 1.2.6.a4 Bug 572018 - Upgrading from 1.2.5 to 1.2.6.a2 deletes userRoot Fix too few args for format warning in acllas Bug 586571 - DS Console shows escaped DNs Bug 591685 - Server instances Fail to Start on Solaris due to Library Path and pcre bump console version to 1.2.3 Repl Session API needs to check for NULL api before init Bug 593392 - setup-ds-admin.pl -k creates world readable file Bug 595874 - 99user.ldif getting overpopulated bump version to 1.2.6.a5 bump version to 1.2.6.rc1 bump version to 1.2.6.rc2 bump version to 1.2.6.rc3 Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll Bug 603942 - null deref in _ger_parse_control() for subjectdn bump version to 1.2.6.rc4 Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 602530 - coverity: op_shared_modify: compare pre, post and original entries before freeing them Bug 602531 - coverity: op_shared_delete: compare preop entry and GLUE_PARENT_ENTRY before freeing them Bug 609590 - fix coverity Defect Type: Memory - corruptions issues Bug 610177 - fix coverity Defect Type: Uninitialized variables issues Bug 610276 - fix coverity Defect Type: API usage errors issues Bug 611850 - fix coverity Defect Type: Error handling issues Bug 614242 - C99/ANSI C++ related compile errors on HP-UX Bug 547503 - replication broken again, with 389 MMR replication and TCP errors Bug 617013 - repl-monitor.pl use cpu upto 90% fix build failures due to libtool problems Bug 617629 - Missing aliases in new schema files Bug 617862 - Replication: Unable to delete tombstone errors bump version to 1.2.7.a1 Bug 610281 - fix coverity Defect Type: Control flow issues - daemon.c:write_function() Bug 610281 - fix coverity Defect Type: Control flow issues - last repl init status postalAddress syntax does not accept empty values ger should support both "dn" and "distinguishedName" openldap - ldap_url_parse_ext is not part of the public api fix memleak in ldbm_config_read_instance_entries Add -x option to ldap tools when using openldap openldap - add support for missing controls, add ldif api, fix NSS usage port client tools to use openldap API use the mozldap versions of the proxy auth control create function document slapi wrappers for openldap/mozldap functions that differ fix some compiler warnings use strcasecmp with ptype and type->bv_val ber_printf 'o' cannot handle NULL bv_val fix the url_parse logic when looking for a missing suffix DN openldap ldapsearch uses -LLL to suppress # version: N add ldaptool_opts for the non BUNDLE case in Makefile.am openldap ldapsearch returns empty line at end of LDIF output have to use LDAP_OPT_X_TLS_NEVER to defeat cert hostname checking openldap_read_function needs to set EWOULDBLOCK if the buffer is empty do not terminate unwrapped LDIF line with another newline slapi_ldap_url_parse must handle multiple host:port in url convert mozldap host list to openldap uri list move the out pointer back if continuation lines were removed check src < *out only; only check for \nspace if src < *out - 2 use slapi_ldap_url_parse in the acl code do not un-null-terminate normalized DN until new url is constructed implement slapi_ldap_explode_dn and slapi_ldap_explode_rdn use slapi_pblock_set to set the ldap result code for the be postop plugins pass the string copy to slapi_dn_normalize_original bug 614511 - fix coverity null reference - revert macro aci $dn logic fix compiler warnings - unused vars/funcs, invalid casts use slapi_mods_init_passin/get_ldapmods_passout if modifying the smods Have to explicitly set protocol version to 3 Only check modrdn ops for backend/suffix correctness if not the default backend Bug 634561 - Server crushes when using Windows Sync Agreement openldap ber_init will assert if the bv->bv_val is NULL add the account policy plugin and related server code, schema, and config fix pblock memory leak do not register pre/post op plugins if disabled add support for global inactivity limit fix typos in Makefile.am, acctpolicy schema bump version to 1.2.7.a2 remove extra format argument; use %lu for size_t printf format Bug 644013 - uniqueness plugin segfault bug bump version to 1.2.7.a3 bump to 1.2.7.a4 bump version to 1.2.7.a5 put replication config entries in separate file bump version to 1.2.7.a6 bump version to 1.2.7.1 bump version to 1.2.7.2 bump version to 1.2.7.3 bump version to 1.2.7.4 Bug 515329 - Multiple mods in one operation can result in an inconsistent replica bump version to 1.2.8.a1 Bug 642046 - Segfault when using SASL/GSSAPI multimaster replication, possible krb5_creds doublefree Bug 624485 - setup dsktune check step should default to "yes" if no problems found Bug 622907 - support piped passwords to perl-based maintenance commands Bug 624485 - setup dsktune check step should default to "yes" if no problems found Bug 576534 - Password displayed on console when entered in command-line utilities Bug 667935 - DS pipe log script's logregex.py plugin is not redirecting the log output to the text file bump version to 1.2.8.a2 Bug 668385 - DS pipe log script is executed as many times as the dirsrv service is restarted Bug 676689 - crash while adding a new user to be synced to windows Bug 675113 - ns-slapd core dump in windows_tot_run if oneway sync is used Bug 677440 - clean up compiler warnings in 389-ds-base 1.2.8 Bug 677774 - DS fails to start after reboot Bug 666076 - dirsrv crash (1.2.7.5) with multiple simple paged result searches Bug 675320 - empty modify operation with repl on or lastmod off will crash server bump version to 1.2.9.a1 - console version to 1.2.4 Bug 677705 - ds-logpipe.py script is failing to validate "-s" and "--serverpid" options with "-t". Bug 676655 - winsync stops working after server restart Bug 680555 - ns-slapd segfaults if I have more than 100 DBs Bug 514190 - setup-ds-admin.pl --debug does not log to file Bug 518890 - setup-ds-admin.pl - improve hostname validation Bug 644784 - Memory leak in "testbind.c" plugin Bug 683250 - slapd crashing when traffic replayed Bug 690584 - #10691 ldbm_back_init() - fix coverity resource leak issues Bug 690584 - #10690 #10689 attrcrypt_get_ssl_cert_name() - fix coverity resource leak issues Bug 690584 - #10688 - dblayer_make_env - fix coverity resource leak issues Bug 690584 - #10669 #10668 cl5ImportLDIF - fix coverity resource leak issues Bug 690584 - #10658 linked_attrs_pre_op - fix coverity resource leak issues Bug 690584 - #10655 acllas__handle_group_entry - fix coverity resource leak issues Bug 690584 - #10654 #10653 str2entry_dupcheck - fix coverity resource leak issues Bug 690584 - #10652 #10651 #10650 #10649 #10648 #10647 send_specific_attrs send_all_attrs - fix coverity resource leak issues Bug 690584 - #10643 hash_rootpw - fix coverity resource leak issues Bug 690584 - #10641 reslimit_bv2int - fix coverity resource leak issues Bug 691422 - sdt_destroy - fix coverity control flow issues Bug 691422 - ldbm_back_upgradedb - fix coverity control flow issues Bug 691422 - csnplFree - fix coverity control flow issues Bug 691422 - SetUnicodeStringFromUTF_8 - fix coverity control flow issues Bug 691422 - cl5DeleteRUV - fix coverity control flow issues Bug 691422 - acl_read_access_allowed_on_entry - fix coverity control flow issues Bug 691422 - search_internal_callback_pb - fix coverity control flow issues Bug 691422 - cl5WriteRUV - fix coverity control flow issues Bug 691422 - windows_replay_update - fix coverity control flow issues Bug 690584 - #10691 ldbm_back_init() - fix coverity resource leak issues Bug 690584 - #10652 #10651 #10650 #10649 #10648 #10647 send_specific_attrs send_all_attrs - fix coverity resource leak issues Bug 668385 - DS pipe log script is executed as many times as the dirsrv service is restarted Bug 692937 - Replica install fails after step for "enable GSSAPI for replication" Bug 692331 - Segfault on index update during full replication push on 1.2.7.5 Bug 693451 - cannot use localized matching rules Bug 693455 - nsMatchingRule does not work with multiple values Bug 693503 - matching rules do not inherit from superior attribute type Bug 693466 - Unable to change schema online Bug 692991 - rhds82 - windows_tot_run: failed to obtain data to send to the consumer; LDAP error - -1 Bug 693473 - rhds82 rfe - windows_tot_run to log Sizelimit exceeded instead of LDAP error - -1 Bug 693962 - Full replica push loses some entries with multi-valued RDNs Bug 694336 - Group sync hangs Windows initial Sync Bug 700145 - userpasswd not replicating Bug 703990 - Support upgrade from Red Hat Directory Server bump console version to 1.2.5 Bug 703990 - Support upgrade from Red Hat Directory Server Bug 703990 - Support upgrade from Red Hat Directory Server Bug 707015 - Cannot disable SSLv3 and use TLS only bump version to 1.2.9.a2 Bug 707384 - only allow FIPS approved cipher suites in FIPS mode Bug 711906 - ns-slapd segfaults using suffix referrals Bug 706209 - LEGAL: RHEL6.1 License issue for 389-ds-base package Bug 703703 - setup-ds-admin.pl asks for legal agreement to a non-existant file Bug 711679 - unresponsive LDAP service when deleting vlv on replica bump console version to 1.2.6 Bug 697694 - rhds82 - incr update state stop_fatal_error "requires administrator action", with extop_result: 9 Bug 716980 - winsync uses old AD entry if new one not found add support for ldif files with changetype: add writing Inf file shows SchemaFile = ARRAY(0xhexnum) look for separate openldap ldif library bump version to 1.2.9.a3 Bug 709468 - RSA Authentication Server timeouts when using simple paged results on RHDS 8.2. Bug 720059 - RDN with % can cause crashes or missing entries bump version to 1.2.9.0 Bug 725542 - Instance upgrade fails when upgrading 389-ds-base package Bug 725953 - Winsync: DS entries fail to sync to AD, if the User's CN entry contains a comma Bug 723937 - replication failing on RUV errors bump version to 1.2.9.1 Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error bump version to 1.2.9.2 Bug 727511 - ldclt SSL search requests are failing with "illegal error numbe bump version to 1.2.9.3 Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error bump version to 1.2.9.4 Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error bump version to 1.2.9.5 Bug 729378 - delete user subtree container in AD + modify password in DS == DS crash Bug 723937 - replication failing on RUV errors Bug 729369 - upgrade DB to upgrade from entrydn to entryrdn format is not working. make sure the DBVERSION file ends in a newline bump version to 1.2.10.a1 Bug 633803 - passwordisglobalpolicy attribute brakes TLS chaining Bug 733103 - large targetattr list with syntax errors cause server to crash or hang Bug 703990 - cross-platform - Support upgrade from Red Hat Directory Server Bug 735121 - simple paged search + ip/dns based ACI hangs server Bug 695736 - Providing native systemd file for upcoming F15 Feature Systemd Bug 590826 - Reloading database from ldif causes changelog to emit "data no longer matches" errors Bug 736712 - Modifying ruv entry deadlocks server Add support for pre/post db transaction plugins Make all backend operations transaction aware Bug 741744 - MOD operations with chained delete/add get back error 53 on backend config Bug 742324 - allow nsslapd-idlistscanlimit to be set dynamically and per-user Bug 741744 - part2 - MOD operations with chained delete/add get back error 53 on backend config Bug 740942 - allow resource limits to be set for paged searches independently of limits for other searches/operations bump version to 1.2.10.a2 bump version to 1.2.10.a3 fix transaction support in ldbm_delete bump version to 1.2.10.a4 set the ENTRY_POST_OP for modrdn betxnpostoperation plugins pass the plugin config entry to the plugin init function make memberof transaction aware and able to be a betxnpostoperation plugin Bug 741744 - part3 - MOD operations with chained delete/add get back error 53 bump version to 1.2.10.a5 Change referential integrity to be a betxnpostoperation plugin Use new PLUGIN_CONFIG_ENTRY feature to allow switching between txn and regular Bug 748575 - rhds81 modrn operation and 100% cpu use in replication Bug 748575 - part 2 - rhds81 modrdn operation and 100% cpu use in replication Bug 751495 - 'setup-ds.pl -u' fails with undefined routine 'updateSystemD' bump version to 1.2.10.a6 Bug 751645 - crash when simple paged fails to send entry to client csn_as_string - use slapi_uN_to_hex instead of sprintf uniqueid formatting - use slapi_u8_to_hex instead of sprintf fix member variable name error in slapi_uniqueIDFormat reduce calls to csn_as_string and slapi_log_error csn_init_as_string should not use sscanf use slapi_hexchar2int and slapi_str_to_u8 everywhere Bug 755754 - Unable to start dirsrv service using systemd Bug 755725 - 389 programs linked against openldap crash during shutdown Ticket 1 - pre-normalize filter and pre-compile substring regex - and other optimizations Ticket #162 - Infinite loop / spin inside strcmpi_fast, acl_read_access_allowed_on_attr, server DoS bak2db gets stuck in infinite loop Ticket #256 - debug build assertion in ACL_EvalDestroy() bump version to 1.2.10.a7 Ticket #167 - Mixing transaction and non-transaction plugins can cause deadlock fix mep sdn compiler warnings add a hack to disable sasl hostname canonicalization - helps with testing when you don't want to set up correct host name resolution and/or cannot set the default system hostname Ticket #12 - 389 DS DNA Plugin / Replication failing on GSSAPI Ticket #257 - repl-monitor doesn't work if leftmost hostnames are the same fix recent compiler warnings Ticket #15 - Get rid of rwlock.h/rwlock.c and just use slapi_rwlock instead fix compiler warnings Remove redundant code - make a global into a static Ticket #262 - pid file not removed with systemd fix mozldap build issues Ticket #264 - upgrade needs better check for "server is running" Ticket #263 - add systemd include directive bump version to 1.2.10.rc1 change version to 1.2.10.a8 Ticket #272 - add tombstonenumsubordinates to schema bump version to 1.2.10.rc1 Ticket #161 - Review and address latest Coverity issues Ticket #22 - RFE: Support sendmail LDAP routing schema Ticket #29 - Samba3-schema is missing sambaTrustedDomainPassword Ticket #273 - ruv tombstone searches don't work after reindex entryrdn Ticket #273 - ruv tombstone searches don't work after reindex entryrdn fix a couple of minor coverity issues Ticket #87 - Manpages fixes Ticket #13 - slapd process exits when put the database on read only mode while updates are coming to the server Ticket #55 - Limit of 1024 characters for nsMatchingRule Ticket #277 - cannot set repl referrals or state Ticket #278 - Schema replication update failed: Invalid syntax Ticket #277 - cannot set repl referrals or state Ticket #279 - filter normalization does not use matching rules Ticket #280 - extensible binary filters do not work Ticket #281 - TLS not working with latest openldap coverity 12488 Resource leak In attr_index_config(): Leak of memory or pointers to system resources bump version to 1.2.10.rc2 bump version to 1.2.10.0 Ticket #294 - 389 DS Segfaults during replica install in FreeIPA Ticket #281 - TLS not working with latest openldap Trac Ticket #298 - crash when replicating orphaned tombstone entry bump version to 1.2.10.2 handle null smods memleak in mep_parse_config_entry memleak in normalize_mods2bvals bump version to 1.2.10.3 Ticket #305 - Certain CMP operations hang or cause ns-slapd to crash bump version to 1.2.10.4 Bug 808770 - [abrt] 389-ds-base-1.2.10.4-2.fc16: index_range_read_ext: Process /usr/sbin/ns-slapd was killed by signal 11 (SIGSEGV) Ticket #336 - [abrt] 389-ds-base-1.2.10.4-2.fc16: index_range_read_ext: Process /usr/sbin/ns-slapd was killed by signal 11 (SIGSEGV) bump version to 1.2.10.5 Ticket #336 - [abrt] 389-ds-base-1.2.10.4-2.fc16: index_range_read_ext: Process /usr/sbin/ns-slapd was killed by signal 11 (SIGSEGV) bump version to 1.2.10.6 Ticket #347 - IPA dirsvr seg-fault during system longevity test Ticket #348 - crash in ldap_initialize with multiple threads bump version to 1.2.10.7 Ticket #348 - crash in ldap_initialize with multiple threads bump version to 1.2.10.8 Trac Ticket #359 - Database RUV could mismatch the one in changelog under the stress Ticket #382 - DS Shuts down intermittently bump version to 1.2.10.10 bump version to 1.2.10.11 Ticket 378 - unhashed#user#password visible after changing password bump version to 1.2.10.12 Ticket #405 - referint modrdn not working if case is different Ticket #406 - Impossible to rename entry (modrdn) with Attribute Uniqueness plugin enabled bump version to 1.2.10.13 Ticket #410 - Referential integrity plug-in does not work when update interval is not zero bump version to 1.2.10.14 nturpin (1): Ticket #3: acl cache overflown problem root (1): Bug 480787 - Autoconf parameter --with and --without --- .gitignore | 1 Makefile.am | 261 Makefile.in | 5215 - README | 11 VERSION.sh | 7 aclocal.m4 | 6996 -- compile | 21 config.guess | 302 config.h.in | 22 config.sub | 232 configure |41932 +++++------- configure.ac | 176 depcomp | 172 dirsrv.pc.in | 7 include/base/dbtbase.h | 2 include/base/file.h | 3 include/base/lexer.h | 126 include/base/rwlock.h | 91 include/i18n.h | 115 include/ldaputil/ldaputil.h | 10 include/libaccess/aclerror.h | 1 include/libaccess/aclproto.h | 15 include/libaccess/aclstruct.h | 2 include/libaccess/dbtlibaccess.h | 3 include/public/nsacl/aclapi.h | 7 install-sh | 517 ldap/admin/src/base-initconfig.in | 44 ldap/admin/src/initconfig.in | 37 ldap/admin/src/logconv.pl | 639 ldap/admin/src/scripts/10cleanupldapi.pl | 23 ldap/admin/src/scripts/10fixrundir.pl | 11 ldap/admin/src/scripts/50acctusabilityplugin.ldif | 21 ldap/admin/src/scripts/50automemberplugin.ldif | 15 ldap/admin/src/scripts/50fixNsState.pl | 240 ldap/admin/src/scripts/50managedentriesplugin.ldif | 16 ldap/admin/src/scripts/50refintprecedence.ldif | 4 ldap/admin/src/scripts/50smd5pwdstorageplugin.ldif | 5 ldap/admin/src/scripts/60upgradeschemafiles.pl | 2 ldap/admin/src/scripts/70upgradefromldif.pl | 108 ldap/admin/src/scripts/80upgradednformat.pl | 206 ldap/admin/src/scripts/81changelog.pl | 34 ldap/admin/src/scripts/90subtreerename.pl | 21 ldap/admin/src/scripts/91subtreereindex.pl | 148 ldap/admin/src/scripts/DSCreate.pm.in | 323 ldap/admin/src/scripts/DSDialogs.pm | 4 ldap/admin/src/scripts/DSMigration.pm.in | 47 ldap/admin/src/scripts/DSUpdate.pm.in | 50 ldap/admin/src/scripts/DSUtil.pm.in | 247 ldap/admin/src/scripts/DialogManager.pm | 241 ldap/admin/src/scripts/DialogManager.pm.in | 241 ldap/admin/src/scripts/Inf.pm | 67 ldap/admin/src/scripts/Migration.pm.in | 20 ldap/admin/src/scripts/Setup.pm.in | 20 ldap/admin/src/scripts/SetupDialogs.pm.in | 31 ldap/admin/src/scripts/SetupLog.pm | 8 ldap/admin/src/scripts/ds-logpipe.py | 221 ldap/admin/src/scripts/exampleupdate.ldif | 2 ldap/admin/src/scripts/exampleupdate.sh | 10 ldap/admin/src/scripts/logregex.py | 16 ldap/admin/src/scripts/migrate-ds.pl.in | 13 ldap/admin/src/scripts/remove-ds.pl.in | 28 ldap/admin/src/scripts/repl-monitor.pl.in | 86 ldap/admin/src/scripts/restart-dirsrv.in | 25 ldap/admin/src/scripts/setup-ds.pl.in | 7 ldap/admin/src/scripts/setup-ds.res.in | 35 ldap/admin/src/scripts/start-dirsrv.in | 43 ldap/admin/src/scripts/stop-dirsrv.in | 27 ldap/admin/src/scripts/template-bak2db.in | 49 ldap/admin/src/scripts/template-bak2db.pl.in | 29 ldap/admin/src/scripts/template-db2bak.in | 53 ldap/admin/src/scripts/template-db2bak.pl.in | 29 ldap/admin/src/scripts/template-db2index.in | 14 ldap/admin/src/scripts/template-db2index.pl.in | 33 ldap/admin/src/scripts/template-db2ldif.in | 15 ldap/admin/src/scripts/template-db2ldif.pl.in | 29 ldap/admin/src/scripts/template-dbverify.in | 15 ldap/admin/src/scripts/template-dn2rdn.in | 25 ldap/admin/src/scripts/template-fixup-linkedattrs.pl.in | 29 ldap/admin/src/scripts/template-fixup-memberof.pl.in | 29 ldap/admin/src/scripts/template-ldif2db.in | 15 ldap/admin/src/scripts/template-ldif2db.pl.in | 29 ldap/admin/src/scripts/template-ldif2ldap.in | 19 ldap/admin/src/scripts/template-monitor.in | 19 ldap/admin/src/scripts/template-ns-accountstatus.pl.in | 33 ldap/admin/src/scripts/template-ns-activate.pl.in | 33 ldap/admin/src/scripts/template-ns-inactivate.pl.in | 33 ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in | 47 ldap/admin/src/scripts/template-restart-slapd.in | 2 ldap/admin/src/scripts/template-restoreconfig.in | 15 ldap/admin/src/scripts/template-saveconfig.in | 15 ldap/admin/src/scripts/template-schema-reload.pl.in | 29 ldap/admin/src/scripts/template-start-slapd.in | 3 ldap/admin/src/scripts/template-stop-slapd.in | 2 ldap/admin/src/scripts/template-suffix2instance.in | 15 ldap/admin/src/scripts/template-syntax-validate.pl.in | 29 ldap/admin/src/scripts/template-upgradedb.in | 15 ldap/admin/src/scripts/template-upgradednformat.in | 63 ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl.in | 29 ldap/admin/src/scripts/template-verify-db.pl.in | 19 ldap/admin/src/scripts/template-vlvindex.in | 15 ldap/admin/src/slapd.inf.in | 2 ldap/admin/src/template-initconfig.in | 18 ldap/docs/LICENSE.txt | 132 ldap/docs/README.txt | 11 ldap/include/ldaplog.h | 32 ldap/ldif/50replication-plugins.ldif | 26 ldap/ldif/template-baseacis.ldif.in | 2 ldap/ldif/template-bitwise.ldif.in | 6 ldap/ldif/template-dse.ldif.in | 96 ldap/ldif/template-suffix-db.ldif.in | 1 ldap/schema/00core.ldif | 72 ldap/schema/01core389.ldif | 19 ldap/schema/02common.ldif | 12 ldap/schema/05rfc4523.ldif | 14 ldap/schema/05rfc4524.ldif | 30 ldap/schema/06inetorgperson.ldif | 5 ldap/schema/10automember-plugin.ldif | 123 ldap/schema/10mep-plugin.ldif | 104 ldap/schema/30ns-common.ldif | 4 ldap/schema/50ns-directory.ldif | 4 ldap/schema/60acctpolicy.ldif | 47 ldap/schema/60nis.ldif | 2 ldap/schema/60qmail.ldif | 4 ldap/schema/60samba3.ldif | 34 ldap/schema/60sendmail.ldif | 54 ldap/schema/60sudo.ldif | 58 ldap/servers/plugins/acct_usability/acct_usability.c | 464 ldap/servers/plugins/acct_usability/acct_usability.h | 63 ldap/servers/plugins/acctpolicy/acct_config.c | 143 ldap/servers/plugins/acctpolicy/acct_init.c | 191 ldap/servers/plugins/acctpolicy/acct_plugin.c | 316 ldap/servers/plugins/acctpolicy/acct_util.c | 257 ldap/servers/plugins/acctpolicy/acctpolicy.h | 81 ldap/servers/plugins/acctpolicy/sampleconfig.ldif | 40 ldap/servers/plugins/acctpolicy/samplepolicy.ldif | 27 ldap/servers/plugins/acl/acl.c | 209 ldap/servers/plugins/acl/acl.h | 43 ldap/servers/plugins/acl/acl_ext.c | 152 ldap/servers/plugins/acl/aclanom.c | 13 ldap/servers/plugins/acl/acleffectiverights.c | 116 ldap/servers/plugins/acl/aclgroup.c | 19 ldap/servers/plugins/acl/aclinit.c | 2 ldap/servers/plugins/acl/acllas.c | 400 ldap/servers/plugins/acl/acllist.c | 79 ldap/servers/plugins/acl/aclparse.c | 615 ldap/servers/plugins/acl/aclplugin.c | 37 ldap/servers/plugins/acl/aclproxy.c | 232 ldap/servers/plugins/acl/aclutil.c | 110 ldap/servers/plugins/automember/automember.c | 1930 ldap/servers/plugins/automember/automember.h | 134 ldap/servers/plugins/bitwise/bitwise.c | 23 ldap/servers/plugins/chainingdb/cb.h | 8 ldap/servers/plugins/chainingdb/cb_add.c | 105 ldap/servers/plugins/chainingdb/cb_bind.c | 196 ldap/servers/plugins/chainingdb/cb_compare.c | 101 ldap/servers/plugins/chainingdb/cb_config.c | 37 ldap/servers/plugins/chainingdb/cb_conn_stateless.c | 102 ldap/servers/plugins/chainingdb/cb_controls.c | 36 ldap/servers/plugins/chainingdb/cb_delete.c | 125 ldap/servers/plugins/chainingdb/cb_init.c | 6 ldap/servers/plugins/chainingdb/cb_instance.c | 325 ldap/servers/plugins/chainingdb/cb_modify.c | 133 ldap/servers/plugins/chainingdb/cb_modrdn.c | 176 ldap/servers/plugins/chainingdb/cb_monitor.c | 6 ldap/servers/plugins/chainingdb/cb_schema.c | 4 ldap/servers/plugins/chainingdb/cb_search.c | 223 ldap/servers/plugins/chainingdb/cb_utils.c | 15 ldap/servers/plugins/collation/collate.c | 24 ldap/servers/plugins/collation/orfilter.c | 19 ldap/servers/plugins/cos/cos_cache.c | 769 ldap/servers/plugins/deref/deref.c | 20 ldap/servers/plugins/dna/dna.c | 908 ldap/servers/plugins/http/http_impl.c | 81 ldap/servers/plugins/linkedattrs/fixup_task.c | 154 ldap/servers/plugins/linkedattrs/linked_attrs.c | 284 ldap/servers/plugins/linkedattrs/linked_attrs.h | 8 ldap/servers/plugins/memberof/memberof.c | 841 ldap/servers/plugins/memberof/memberof.h | 8 ldap/servers/plugins/memberof/memberof_config.c | 242 ldap/servers/plugins/mep/mep.c | 2862 ldap/servers/plugins/mep/mep.h | 130 ldap/servers/plugins/pam_passthru/pam_passthru.h | 2 ldap/servers/plugins/pam_passthru/pam_ptconfig.c | 2 ldap/servers/plugins/pam_passthru/pam_ptimpl.c | 32 ldap/servers/plugins/pam_passthru/pam_ptpreop.c | 9 ldap/servers/plugins/passthru/passthru.h | 4 ldap/servers/plugins/passthru/ptbind.c | 6 ldap/servers/plugins/passthru/ptconfig.c | 43 ldap/servers/plugins/passthru/ptconn.c | 8 ldap/servers/plugins/passthru/ptpreop.c | 17 ldap/servers/plugins/pwdstorage/smd5_pwd.c | 9 ldap/servers/plugins/referint/referint.c | 765 ldap/servers/plugins/replication/cl4_api.c | 2 ldap/servers/plugins/replication/cl5.h | 1 ldap/servers/plugins/replication/cl5_api.c | 2655 ldap/servers/plugins/replication/cl5_api.h | 111 ldap/servers/plugins/replication/cl5_clcache.c | 55 ldap/servers/plugins/replication/cl5_clcache.h | 2 ldap/servers/plugins/replication/cl5_config.c | 247 ldap/servers/plugins/replication/cl5_init.c | 2 ldap/servers/plugins/replication/cl5_test.c | 2 ldap/servers/plugins/replication/cl_crypt.c | 203 ldap/servers/plugins/replication/cl_crypt.h | 53 ldap/servers/plugins/replication/csnpl.c | 74 ldap/servers/plugins/replication/legacy_consumer.c | 31 ldap/servers/plugins/replication/llist.c | 8 ldap/servers/plugins/replication/repl-session-plugin.h | 119 ldap/servers/plugins/replication/repl.h | 2 ldap/servers/plugins/replication/repl5.h | 65 ldap/servers/plugins/replication/repl5_agmt.c | 304 ldap/servers/plugins/replication/repl5_agmtlist.c | 106 ldap/servers/plugins/replication/repl5_connection.c | 155 ldap/servers/plugins/replication/repl5_inc_protocol.c | 92 ldap/servers/plugins/replication/repl5_init.c | 49 ldap/servers/plugins/replication/repl5_mtnode_ext.c | 13 ldap/servers/plugins/replication/repl5_plugins.c | 193 ldap/servers/plugins/replication/repl5_prot_private.h | 4 ldap/servers/plugins/replication/repl5_protocol.c | 107 ldap/servers/plugins/replication/repl5_protocol_util.c | 509 ldap/servers/plugins/replication/repl5_replica.c | 308 ldap/servers/plugins/replication/repl5_replica_config.c | 365 ldap/servers/plugins/replication/repl5_replica_dnhash.c | 26 ldap/servers/plugins/replication/repl5_replica_hash.c | 30 ldap/servers/plugins/replication/repl5_ruv.c | 419 ldap/servers/plugins/replication/repl5_ruv.h | 18 ldap/servers/plugins/replication/repl5_tot_protocol.c | 32 ldap/servers/plugins/replication/repl5_total.c | 22 ldap/servers/plugins/replication/repl5_updatedn_list.c | 2 ldap/servers/plugins/replication/repl_bind.c | 6 ldap/servers/plugins/replication/repl_compare.c | 18 ldap/servers/plugins/replication/repl_connext.c | 2 ldap/servers/plugins/replication/repl_controls.c | 2 ldap/servers/plugins/replication/repl_extop.c | 291 ldap/servers/plugins/replication/repl_globals.c | 2 ldap/servers/plugins/replication/repl_init.c | 1 ldap/servers/plugins/replication/repl_objset.c | 9 ldap/servers/plugins/replication/repl_session_plugin.c | 188 ldap/servers/plugins/replication/repl_shared.h | 17 ldap/servers/plugins/replication/replutil.c | 107 ldap/servers/plugins/replication/test_repl_session_plugin.c | 335 ldap/servers/plugins/replication/urp.c | 222 ldap/servers/plugins/replication/urp.h | 11 ldap/servers/plugins/replication/urp_glue.c | 14 ldap/servers/plugins/replication/urp_tombstone.c | 21 ldap/servers/plugins/replication/windows_connection.c | 166 ldap/servers/plugins/replication/windows_inc_protocol.c | 55 ldap/servers/plugins/replication/windows_private.c | 128 ldap/servers/plugins/replication/windows_protocol_util.c | 677 ldap/servers/plugins/replication/windows_tot_protocol.c | 125 ldap/servers/plugins/replication/windowsrepl.h | 14 ldap/servers/plugins/replication/winsync-plugin.h | 2 ldap/servers/plugins/retrocl/retrocl.c | 3 ldap/servers/plugins/retrocl/retrocl.h | 2 ldap/servers/plugins/retrocl/retrocl_create.c | 13 ldap/servers/plugins/retrocl/retrocl_po.c | 23 ldap/servers/plugins/retrocl/retrocl_trim.c | 20 ldap/servers/plugins/rever/des.c | 72 ldap/servers/plugins/rever/rever.c | 8 ldap/servers/plugins/roles/roles_cache.c | 128 ldap/servers/plugins/schema_reload/schema_reload.c | 5 ldap/servers/plugins/shared/plugin-utils.h | 112 ldap/servers/plugins/shared/utils.c | 508 ldap/servers/plugins/statechange/statechange.c | 26 ldap/servers/plugins/syntaxes/bin.c | 142 ldap/servers/plugins/syntaxes/bitstring.c | 68 ldap/servers/plugins/syntaxes/ces.c | 172 ldap/servers/plugins/syntaxes/cis.c | 321 ldap/servers/plugins/syntaxes/deliverymethod.c | 32 ldap/servers/plugins/syntaxes/dn.c | 72 ldap/servers/plugins/syntaxes/facsimile.c | 32 ldap/servers/plugins/syntaxes/guide.c | 32 ldap/servers/plugins/syntaxes/int.c | 96 ldap/servers/plugins/syntaxes/nameoptuid.c | 72 ldap/servers/plugins/syntaxes/numericstring.c | 148 ldap/servers/plugins/syntaxes/sicis.c | 32 ldap/servers/plugins/syntaxes/string.c | 402 ldap/servers/plugins/syntaxes/syntax.h | 61 ldap/servers/plugins/syntaxes/syntax_common.c | 118 ldap/servers/plugins/syntaxes/tel.c | 94 ldap/servers/plugins/syntaxes/teletex.c | 32 ldap/servers/plugins/syntaxes/telex.c | 31 ldap/servers/plugins/syntaxes/validate.c | 17 ldap/servers/plugins/syntaxes/value.c | 120 ldap/servers/plugins/uiduniq/7bit.c | 52 ldap/servers/plugins/uiduniq/plugin-utils.h | 96 ldap/servers/plugins/uiduniq/uid.c | 353 ldap/servers/plugins/uiduniq/utils.c | 256 ldap/servers/plugins/usn/usn.c | 176 ldap/servers/plugins/usn/usn.h | 3 ldap/servers/plugins/usn/usn_cleanup.c | 31 ldap/servers/plugins/views/views.c | 27 ldap/servers/slapd/abandon.c | 7 ldap/servers/slapd/add.c | 186 ldap/servers/slapd/agtmmap.c | 56 ldap/servers/slapd/attr.c | 93 ldap/servers/slapd/attrlist.c | 7 ldap/servers/slapd/attrsyntax.c | 143 ldap/servers/slapd/auditlog.c | 86 ldap/servers/slapd/auth.c | 59 ldap/servers/slapd/ava.c | 2 ldap/servers/slapd/back-ldbm/ancestorid.c | 104 ldap/servers/slapd/back-ldbm/archive.c | 91 ldap/servers/slapd/back-ldbm/back-ldbm.h | 96 ldap/servers/slapd/back-ldbm/backentry.c | 2 ldap/servers/slapd/back-ldbm/cache.c | 83 ldap/servers/slapd/back-ldbm/dbhelp.c | 12 ldap/servers/slapd/back-ldbm/dblayer.c | 1614 ldap/servers/slapd/back-ldbm/dblayer.h | 14 ldap/servers/slapd/back-ldbm/dbtest.c | 349 ldap/servers/slapd/back-ldbm/dbversion.c | 52 ldap/servers/slapd/back-ldbm/dn2entry.c | 63 ldap/servers/slapd/back-ldbm/filterindex.c | 244 ldap/servers/slapd/back-ldbm/findentry.c | 147 ldap/servers/slapd/back-ldbm/id2entry.c | 175 ldap/servers/slapd/back-ldbm/idl.c | 35 ldap/servers/slapd/back-ldbm/idl_common.c | 7 ldap/servers/slapd/back-ldbm/idl_new.c | 111 ldap/servers/slapd/back-ldbm/idl_shim.c | 17 ldap/servers/slapd/back-ldbm/import-merge.c | 28 ldap/servers/slapd/back-ldbm/import-threads.c | 1366 ldap/servers/slapd/back-ldbm/import.c | 403 ldap/servers/slapd/back-ldbm/import.h | 32 ldap/servers/slapd/back-ldbm/index.c | 283 ldap/servers/slapd/back-ldbm/init.c | 89 ldap/servers/slapd/back-ldbm/instance.c | 174 ldap/servers/slapd/back-ldbm/ldbm_add.c | 245 ldap/servers/slapd/back-ldbm/ldbm_attr.c | 392 ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 986 ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c | 2 ldap/servers/slapd/back-ldbm/ldbm_bind.c | 4 ldap/servers/slapd/back-ldbm/ldbm_compare.c | 4 ldap/servers/slapd/back-ldbm/ldbm_config.c | 309 ldap/servers/slapd/back-ldbm/ldbm_config.h | 9 ldap/servers/slapd/back-ldbm/ldbm_delete.c | 364 ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c | 896 ldap/servers/slapd/back-ldbm/ldbm_index_config.c | 668 ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 262 ldap/servers/slapd/back-ldbm/ldbm_modify.c | 145 ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 361 ldap/servers/slapd/back-ldbm/ldbm_search.c | 407 ldap/servers/slapd/back-ldbm/ldbm_usn.c | 74 ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 792 ldap/servers/slapd/back-ldbm/matchrule.c | 50 ldap/servers/slapd/back-ldbm/misc.c | 298 ldap/servers/slapd/back-ldbm/monitor.c | 14 ldap/servers/slapd/back-ldbm/nextid.c | 17 ldap/servers/slapd/back-ldbm/parents.c | 141 ldap/servers/slapd/back-ldbm/perfctrs.c | 24 ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 52 ldap/servers/slapd/back-ldbm/sort.c | 38 ldap/servers/slapd/back-ldbm/start.c | 61 ldap/servers/slapd/back-ldbm/vlv.c | 383 ldap/servers/slapd/back-ldbm/vlv_srch.c | 17 ldap/servers/slapd/back-ldbm/vlv_srch.h | 3 ldap/servers/slapd/back-ldif/back-ldif.h | 2 ldap/servers/slapd/back-ldif/modrdn.c | 12 ldap/servers/slapd/backend.c | 72 ldap/servers/slapd/backend_manager.c | 18 ldap/servers/slapd/bind.c | 320 ldap/servers/slapd/bulk_import.c | 39 ldap/servers/slapd/charray.c | 27 ldap/servers/slapd/compare.c | 41 ldap/servers/slapd/computed.c | 36 ldap/servers/slapd/config.c | 2 ldap/servers/slapd/configdse.c | 63 ldap/servers/slapd/connection.c | 196 ldap/servers/slapd/conntable.c | 3 ldap/servers/slapd/control.c | 26 ldap/servers/slapd/csn.c | 77 ldap/servers/slapd/csngen.c | 54 ldap/servers/slapd/csnset.c | 4 ldap/servers/slapd/daemon.c | 173 ldap/servers/slapd/delete.c | 127 ldap/servers/slapd/dn.c | 1561 ldap/servers/slapd/dse.c | 222 ldap/servers/slapd/dynalib.c | 29 ldap/servers/slapd/entry.c | 961 ldap/servers/slapd/entrywsi.c | 137 ldap/servers/slapd/eventq.c | 4 ldap/servers/slapd/extendop.c | 35 ldap/servers/slapd/factory.c | 1 ldap/servers/slapd/fe.h | 5 ldap/servers/slapd/fedse.c | 40 ldap/servers/slapd/filter.c | 141 ldap/servers/slapd/filter.h | 1 ldap/servers/slapd/filtercmp.c | 26 ldap/servers/slapd/filterentry.c | 36 ldap/servers/slapd/generation.c | 1 ldap/servers/slapd/index_subsystem.c | 28 ldap/servers/slapd/intrinsics.h | 7 ldap/servers/slapd/ldaputil.c | 812 ldap/servers/slapd/lenstr.c | 6 ldap/servers/slapd/libglobs.c | 661 ldap/servers/slapd/libslapd.def | 1 ldap/servers/slapd/log.c | 77 ldap/servers/slapd/log.h | 20 ldap/servers/slapd/main.c | 288 ldap/servers/slapd/mapping_tree.c | 478 ldap/servers/slapd/match.c | 96 ldap/servers/slapd/modify.c | 491 ldap/servers/slapd/modrdn.c | 362 ldap/servers/slapd/modutil.c | 14 ldap/servers/slapd/operation.c | 27 ldap/servers/slapd/opshared.c | 296 ldap/servers/slapd/pagedresults.c | 130 ldap/servers/slapd/passwd_extop.c | 203 ldap/servers/slapd/pblock.c | 575 ldap/servers/slapd/plugin.c | 338 ldap/servers/slapd/plugin_acl.c | 19 ldap/servers/slapd/plugin_internal_op.c | 201 ldap/servers/slapd/plugin_mr.c | 474 ldap/servers/slapd/plugin_syntax.c | 442 ldap/servers/slapd/protect_db.c | 24 ldap/servers/slapd/protect_db.h | 7 ldap/servers/slapd/proto-slap.h | 74 ldap/servers/slapd/proxyauth.c | 246 ldap/servers/slapd/psearch.c | 77 ldap/servers/slapd/pw.c | 510 ldap/servers/slapd/pw.h | 5 ldap/servers/slapd/pw_mgmt.c | 164 ldap/servers/slapd/pw_retry.c | 99 ldap/servers/slapd/rdn.c | 141 ldap/servers/slapd/referral.c | 29 ldap/servers/slapd/regex.c | 3 ldap/servers/slapd/resourcelimit.c | 80 ldap/servers/slapd/result.c | 81 ldap/servers/slapd/rootdse.c | 12 ldap/servers/slapd/rwlock.c | 257 ldap/servers/slapd/rwlock.h | 65 ldap/servers/slapd/sasl_io.c | 167 ldap/servers/slapd/sasl_map.c | 57 ldap/servers/slapd/saslbind.c | 160 ldap/servers/slapd/schema.c | 194 ldap/servers/slapd/schemaparse.c | 13 ldap/servers/slapd/search.c | 89 ldap/servers/slapd/security_wrappers.c | 36 ldap/servers/slapd/slap.h | 196 ldap/servers/slapd/slapi-plugin-compat4.h | 6 ldap/servers/slapd/slapi-plugin.h | 1258 ldap/servers/slapd/slapi-private.h | 58 ldap/servers/slapd/slapi2nspr.c | 79 ldap/servers/slapd/slapi_counter.c | 24 ldap/servers/slapd/snmp_collator.c | 19 ldap/servers/slapd/ssl.c | 323 ldap/servers/slapd/str2filter.c | 5 ldap/servers/slapd/task.c | 128 ldap/servers/slapd/test-plugins/testbind.c | 1 ldap/servers/slapd/test-plugins/testpostop.c | 1 ldap/servers/slapd/time.c | 91 ldap/servers/slapd/tools/dbscan.c | 76 ldap/servers/slapd/tools/ldclt/data.c | 70 ldap/servers/slapd/tools/ldclt/ldapfct.c | 1149 ldap/servers/slapd/tools/ldclt/ldclt.c | 50 ldap/servers/slapd/tools/ldclt/ldclt.h | 3 ldap/servers/slapd/tools/ldclt/ldcltU.c | 24 ldap/servers/slapd/tools/ldclt/parser.c | 19 ldap/servers/slapd/tools/ldclt/scalab01.c | 190 ldap/servers/slapd/tools/ldclt/threadMain.c | 6 ldap/servers/slapd/tools/ldif.c | 4 ldap/servers/slapd/tools/mmldif.c | 9 ldap/servers/slapd/tools/pwenc.c | 2 ldap/servers/slapd/tools/rsearch/addthread.c | 51 ldap/servers/slapd/tools/rsearch/sdattable.c | 4 ldap/servers/slapd/tools/rsearch/searchthread.c | 94 ldap/servers/slapd/uniqueid.c | 99 ldap/servers/slapd/utf8compare.c | 6 ldap/servers/slapd/util.c | 357 ldap/servers/slapd/uuid.c | 22 ldap/servers/slapd/value.c | 53 ldap/servers/slapd/valueset.c | 75 ldap/servers/slapd/vattr.c | 115 ldap/servers/snmp/NETWORK-SERVICES-MIB.txt | 650 ldap/servers/snmp/RFC-1215.txt | 38 ldap/servers/snmp/RFC1155-SMI.txt | 119 ldap/servers/snmp/SNMPv2-CONF.txt | 322 ldap/servers/snmp/SNMPv2-SMI.txt | 344 ldap/servers/snmp/SNMPv2-TC.txt | 772 ldap/servers/snmp/ldap-agent.c | 26 ldap/servers/snmp/main.c | 11 ldap/servers/snmp/netscape-ldap.mib | 759 ldap/systools/idsktune.c | 100 lib/base/crit.cpp | 6 lib/base/ereport.cpp | 2 lib/base/file.cpp | 24 lib/base/lexer.cpp | 1015 lib/base/plist.cpp | 3 lib/base/rwlock.cpp | 168 lib/base/util.cpp | 13 lib/ldaputil/cert.c | 4 lib/ldaputil/certmap.c | 409 lib/ldaputil/dbconf.c | 1 lib/ldaputil/utest/Makefile | 149 lib/ldaputil/utest/auth.cpp | 611 lib/ldaputil/utest/authtest | 138 lib/ldaputil/utest/certmap.conf | 68 lib/ldaputil/utest/dblist.conf | 47 lib/ldaputil/utest/example.c | 153 lib/ldaputil/utest/plugin.c | 152 lib/ldaputil/utest/plugin.h | 57 lib/ldaputil/utest/stubs.c | 144 lib/ldaputil/utest/stubs.cpp | 139 lib/ldaputil/utest/test.ref | 480 lib/ldaputil/vtable.c | 2 lib/libaccess/acl.tab.cpp | 25 lib/libaccess/aclcache.cpp | 105 lib/libaccess/aclflush.cpp | 1 lib/libaccess/aclpriv.h | 1 lib/libaccess/acltext.y | 4 lib/libaccess/acltools.cpp | 1896 lib/libaccess/aclutil.cpp | 13 lib/libaccess/authdb.cpp | 112 lib/libaccess/lasdns.cpp | 23 lib/libaccess/lasgroup.cpp | 10 lib/libaccess/lasip.cpp | 20 lib/libaccess/nseframe.cpp | 1 lib/libaccess/oneeval.cpp | 19 lib/libaccess/permhash.h | 11 lib/libaccess/register.cpp | 50 lib/libaccess/usrcache.cpp | 14 lib/libaccess/utest/.purify | 19 lib/libaccess/utest/Makefile | 147 lib/libaccess/utest/acl.dat | 44 lib/libaccess/utest/aclfile0 | 87 lib/libaccess/utest/aclfile1 | 43 lib/libaccess/utest/aclfile10 | 45 lib/libaccess/utest/aclfile11 | 43 lib/libaccess/utest/aclfile12 | 43 lib/libaccess/utest/aclfile13 | 43 lib/libaccess/utest/aclfile14 | 43 lib/libaccess/utest/aclfile15 | 43 lib/libaccess/utest/aclfile16 | 43 lib/libaccess/utest/aclfile17 | 43 lib/libaccess/utest/aclfile18 | 51 lib/libaccess/utest/aclfile19 | 46 lib/libaccess/utest/aclfile2 | 43 lib/libaccess/utest/aclfile3 | 43 lib/libaccess/utest/aclfile4 | 43 lib/libaccess/utest/aclfile5 | 43 lib/libaccess/utest/aclfile6 | 55 lib/libaccess/utest/aclfile7 | 43 lib/libaccess/utest/aclfile8 | 43 lib/libaccess/utest/aclfile9 | 43 lib/libaccess/utest/aclgrp0 | 42 lib/libaccess/utest/aclgrp1 | 42 lib/libaccess/utest/aclgrp2 | 42 lib/libaccess/utest/aclgrp3 | 42 lib/libaccess/utest/aclgrp4 | 42 lib/libaccess/utest/acltest.cpp | 794 lib/libaccess/utest/onetest.cpp | 77 lib/libaccess/utest/shexp.cpp | 331 lib/libaccess/utest/shexp.h | 168 lib/libaccess/utest/test.ref | 217 lib/libaccess/utest/testmain.cpp | 89 lib/libaccess/utest/twotest.cpp | 87 lib/libaccess/utest/ustubs.cpp | 331 lib/libadmin/error.c | 2 lib/libadmin/template.c | 2 lib/libadmin/util.c | 48 lib/libsi18n/coreres.c | 141 lib/libsi18n/coreres.h | 52 lib/libsi18n/getlang.c | 330 lib/libsi18n/getstrmem.c | 160 lib/libsi18n/getstrmem.h | 1 lib/libsi18n/getstrprop.c | 85 lib/libsi18n/makstrdb.c | 21 lib/libsi18n/propset.c | 442 lib/libsi18n/propset.h | 80 lib/libsi18n/reshash.c | 21 ltmain.sh |13199 ++- m4/db.m4 | 21 m4/fhs.m4 | 4 m4/icu.m4 | 25 m4/kerberos.m4 | 4 m4/mozldap.m4 | 38 m4/netsnmp.m4 | 15 m4/nspr.m4 | 17 m4/nss.m4 | 17 m4/openldap.m4 | 30 m4/pcre.m4 | 28 m4/sasl.m4 | 25 m4/selinux.m4 | 13 m4/svrcore.m4 | 41 man/man1/cl-dump.1 | 18 man/man1/dbgen.pl.1 | 4 man/man1/infadd.1 | 8 man/man1/migratecred.1 | 6 man/man1/mmldif.1 | 4 man/man1/pwdhash.1 | 4 man/man1/repl-monitor.1 | 16 man/man8/ns-slapd.8 | 10 man/man8/remove-ds.pl.8 | 6 man/man8/restart-dirsrv.8 | 50 man/man8/setup-ds.pl.8 | 4 man/man8/start-dirsrv.8 | 50 man/man8/stop-dirsrv.8 | 50 missing | 104 selinux/dirsrv.fc.in | 2 selinux/dirsrv.if | 41 selinux/dirsrv.te | 11 wrappers/cl-dump.in | 11 wrappers/dbscan.in | 10 wrappers/infadd.in | 12 wrappers/initscript.in | 244 wrappers/ldap-agent-initscript.in | 20 wrappers/ldap-agent.in | 12 wrappers/ldclt.in | 12 wrappers/ldif.in | 12 wrappers/migratecred.in | 14 wrappers/mmldif.in | 14 wrappers/pwdhash.in | 14 wrappers/repl-monitor.in | 11 wrappers/rsearch.in | 12 wrappers/systemd-snmp.service.in | 16 wrappers/systemd.group.in | 6 wrappers/systemd.template.service.in | 28 wrappers/systemd.template.sysconfig | 3 616 files changed, 80078 insertions(+), 68061 deletions(-) ---

1 0

ldap/servers
by Richard Allen Megginson 18 Jul '12

18 Jul '12

ldap/servers/plugins/referint/referint.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 0b5cdb4346a9c44cf03191a38b0dd9b5b0327e1d Author: Rich Megginson <rmeggins(a)redhat.com> Date: Wed Jul 18 15:19:35 2012 -0600 Ticket #410 - Referential integrity plug-in does not work when update interval is not zero https://fedorahosted.org/389/ticket/410 Resolves: Ticket #410 Bug Description: Referential integrity plug-in does not work when update interval is not zero Reviewed by: nhosoi (Thanks!) Branch: 389-ds-base-1.2.11 Fix Description: Checking for newsuperior == NULL is not sufficient - also have to check for slapi_sdn_get_dn(newsuperior) == NULL as well. Otherwise we write the string "(null)" to the referint log and that blows up the code that attempt to apply the change. Platforms tested: RHEL6 x86_64 Flag Day: no Doc impact: no diff --git a/ldap/servers/plugins/referint/referint.c b/ldap/servers/plugins/referint/referint.c index 7e45e0e..3342634 100644 --- a/ldap/servers/plugins/referint/referint.c +++ b/ldap/servers/plugins/referint/referint.c @@ -1084,6 +1084,7 @@ writeintegritylog(Slapi_PBlock *pb, char *logfilename, Slapi_DN *sdn, int len_to_write = 0; int rc; const char *requestordn = NULL; + const char *newsuperiordn = NULL; size_t reqdn_len = 0; /* @@ -1115,7 +1116,9 @@ writeintegritylog(Slapi_PBlock *pb, char *logfilename, Slapi_DN *sdn, /* add the length of the newrdn */ len_to_write += strlen(newrdn); } - if(NULL == newsuperior){ + newsuperiordn = slapi_sdn_get_dn(newsuperior); + if(NULL == newsuperiordn) + { /* add the length of "NULL" */ len_to_write += 4; } else { @@ -1137,8 +1140,8 @@ writeintegritylog(Slapi_PBlock *pb, char *logfilename, Slapi_DN *sdn, " to update references to this entry.\n"); } else { PR_snprintf(buffer, MAX_LINE, "%s\t%s\t%s\t%s\t\n", slapi_sdn_get_dn(sdn), - (newrdn != NULL) ? newrdn : "NULL", - (newsuperior != NULL) ? slapi_sdn_get_dn(newsuperior) : "NULL", + (newrdn != NULL) ? newrdn : "NULL", + (newsuperiordn != NULL) ? newsuperiordn : "NULL", requestordn ? requestordn : "NULL"); if (PR_Write(prfd,buffer,strlen(buffer)) < 0){ slapi_log_error(SLAPI_LOG_FATAL,REFERINT_PLUGIN_SUBSYSTEM,

1 0

Branch '389-ds-base-1.2.10' - 2 commits - ldap/servers VERSION.sh
by Richard Allen Megginson 18 Jul '12

18 Jul '12

VERSION.sh | 2 +- ldap/servers/plugins/referint/referint.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) New commits: commit eefd478c8b9fa3708ef760fd3f578d717b21dd12 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Wed Jul 18 21:06:09 2012 -0600 bump version to 1.2.10.14 diff --git a/VERSION.sh b/VERSION.sh index 7ddc2b8..3e3290e 100644 --- a/VERSION.sh +++ b/VERSION.sh @@ -10,7 +10,7 @@ vendor="389 Project" # PACKAGE_VERSION is constructed from these VERSION_MAJOR=1 VERSION_MINOR=2 -VERSION_MAINT=10.13 +VERSION_MAINT=10.14 # if this is a PRERELEASE, set VERSION_PREREL # otherwise, comment it out # be sure to include the dot prefix in the prerel commit 6773187e7e19a7bfdfda62475813a2fe9bba1044 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Wed Jul 18 15:19:35 2012 -0600 Ticket #410 - Referential integrity plug-in does not work when update interval is not zero https://fedorahosted.org/389/ticket/410 Resolves: Ticket #410 Bug Description: Referential integrity plug-in does not work when update interval is not zero Reviewed by: nhosoi (Thanks!) Branch: 389-ds-base-1.2.11 Fix Description: Checking for newsuperior == NULL is not sufficient - also have to check for slapi_sdn_get_dn(newsuperior) == NULL as well. Otherwise we write the string "(null)" to the referint log and that blows up the code that attempt to apply the change. Platforms tested: RHEL6 x86_64 Flag Day: no Doc impact: no diff --git a/ldap/servers/plugins/referint/referint.c b/ldap/servers/plugins/referint/referint.c index 3c973d3..d1a46f0 100644 --- a/ldap/servers/plugins/referint/referint.c +++ b/ldap/servers/plugins/referint/referint.c @@ -1114,6 +1114,8 @@ writeintegritylog(char *logfilename, Slapi_DN *sdn, char buffer[MAX_LINE]; int len_to_write = 0; int rc; + const char *newsuperiordn = NULL; + /* write this record to the file */ /* use this lock to protect file data when update integrity is occuring */ @@ -1147,7 +1149,8 @@ writeintegritylog(char *logfilename, Slapi_DN *sdn, /* add the length of the newrdn */ len_to_write += strlen(newrdn); } - if(NULL == newsuperior) + newsuperiordn = slapi_sdn_get_dn(newsuperior); + if(NULL == newsuperiordn) { /* add the length of "NULL" */ len_to_write += 4; @@ -1166,8 +1169,7 @@ writeintegritylog(char *logfilename, Slapi_DN *sdn, PR_snprintf(buffer, MAX_LINE, "%s\t%s\t%s\t\n", slapi_sdn_get_dn(sdn), (newrdn != NULL) ? newrdn : "NULL", - (newsuperior != NULL) ? slapi_sdn_get_dn(newsuperior) : - "NULL"); + (newsuperiordn != NULL) ? newsuperiordn : "NULL"); if (PR_Write(prfd,buffer,strlen(buffer)) < 0){ slapi_log_error(SLAPI_LOG_FATAL,REFERINT_PLUGIN_SUBSYSTEM, " writeintegritylog: PR_Write failed : The disk"

1 0

Branch '389-ds-base-1.2.11' - ldap/servers
by Richard Allen Megginson 18 Jul '12

18 Jul '12

ldap/servers/plugins/referint/referint.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 14b82c899092f8fc17b8e42beb6543cdf2cfacb5 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Wed Jul 18 15:19:35 2012 -0600 Ticket #410 - Referential integrity plug-in does not work when update interval is not zero https://fedorahosted.org/389/ticket/410 Resolves: Ticket #410 Bug Description: Referential integrity plug-in does not work when update interval is not zero Reviewed by: nhosoi (Thanks!) Branch: 389-ds-base-1.2.11 Fix Description: Checking for newsuperior == NULL is not sufficient - also have to check for slapi_sdn_get_dn(newsuperior) == NULL as well. Otherwise we write the string "(null)" to the referint log and that blows up the code that attempt to apply the change. Platforms tested: RHEL6 x86_64 Flag Day: no Doc impact: no diff --git a/ldap/servers/plugins/referint/referint.c b/ldap/servers/plugins/referint/referint.c index 1929cd5..7aee564 100644 --- a/ldap/servers/plugins/referint/referint.c +++ b/ldap/servers/plugins/referint/referint.c @@ -1119,6 +1119,7 @@ writeintegritylog(Slapi_PBlock *pb, char *logfilename, Slapi_DN *sdn, int len_to_write = 0; int rc; const char *requestordn = NULL; + const char *newsuperiordn = NULL; size_t reqdn_len = 0; /* write this record to the file */ @@ -1153,7 +1154,8 @@ writeintegritylog(Slapi_PBlock *pb, char *logfilename, Slapi_DN *sdn, /* add the length of the newrdn */ len_to_write += strlen(newrdn); } - if(NULL == newsuperior) + newsuperiordn = slapi_sdn_get_dn(newsuperior); + if(NULL == newsuperiordn) { /* add the length of "NULL" */ len_to_write += 4; @@ -1179,8 +1181,7 @@ writeintegritylog(Slapi_PBlock *pb, char *logfilename, Slapi_DN *sdn, PR_snprintf(buffer, MAX_LINE, "%s\t%s\t%s\t%s\t\n", slapi_sdn_get_dn(sdn), (newrdn != NULL) ? newrdn : "NULL", - (newsuperior != NULL) ? slapi_sdn_get_dn(newsuperior) : - "NULL", + (newsuperiordn != NULL) ? newsuperiordn : "NULL", requestordn ? requestordn : "NULL"); if (PR_Write(prfd,buffer,strlen(buffer)) < 0){ slapi_log_error(SLAPI_LOG_FATAL,REFERINT_PLUGIN_SUBSYSTEM,

1 0

ldap/servers
by Noriko Hosoi 18 Jul '12

18 Jul '12

ldap/servers/slapd/slapi-plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 078e65ce79acc5d1a4362299cd9769185ec47e50 Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com> Date: Wed Jul 18 16:59:27 2012 -0700 Conflict definition in SLAPI_ATTR_FLAG macros Bug description: It turned out these 2 macros had conflict values. SLAPI_ATTR_FLAG_NORMALIZED_CIS 0x0400 /* the attr value is normalized .. SLAPI_ATTR_FLAG_NOEXPOSE 0x0400 /* the attr value is not exposed */ SLAPI_ATTR_FLAG_NORMALIZED_CIS was introduced with the commit c0151f78509c35250095da6e2785842337963008. Fix description: Define SLAPI_ATTR_FLAG_NOEXPOSE with 0x0800 which is not used by any other SLAPI_ATTR_FLAG macros. diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h index a703a4c..979b558 100644 --- a/ldap/servers/slapd/slapi-plugin.h +++ b/ldap/servers/slapd/slapi-plugin.h @@ -193,7 +193,7 @@ NSPR_API(PRUint32) PR_fprintf(struct PRFileDesc* fd, const char *fmt, ...) * \see slapi_value_set_flags() * \see slapi_values_set_flags() */ -#define SLAPI_ATTR_FLAG_NOEXPOSE 0x0400 /* the attr value is not exposed */ +#define SLAPI_ATTR_FLAG_NOEXPOSE 0x0800 /* the attr value is not exposed */ /* operation flags */ #define SLAPI_OP_FLAG_INTERNAL 0x00020 /* An operation generated by the core server or a plugin. */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits July 2012