ldap/servers/plugins/memberof/memberof.c | 46 ++++++++++++++++++++++++-------
1 file changed, 36 insertions(+), 10 deletions(-)
New commits:
commit 4760dc6c66249a793c8485a23c147954265f6fd3
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Wed Dec 17 19:54:33 2014 +0100
fix jenkins warning
diff --git a/ldap/servers/plugins/memberof/memberof.c
b/ldap/servers/plugins/memberof/memberof.c
index cc42c6c..b8e2386 100644
--- a/ldap/servers/plugins/memberof/memberof.c
+++ b/ldap/servers/plugins/memberof/memberof.c
@@ -921,7 +921,7 @@ int memberof_postop_modrdn(Slapi_PBlock *pb)
}
if(ret == LDAP_SUCCESS) {
memberof_del_dn_data del_data = {0, configCopy.memberof_attr};
- if(ret = memberof_del_dn_type_callback(post_e, &del_data)){
+ if((ret = memberof_del_dn_type_callback(post_e, &del_data))){
slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM,
"memberof_postop_modrdn - delete dn callback failed for (%s), error
(%d)\n",
slapi_entry_get_dn(post_e), ret);
commit c8951669b3a74cb9fda013ffe914031b76e2e452
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Wed Dec 17 18:11:44 2014 +0100
Additional fix for ticket 47526 v3
In modrdn we need to distinguish if the entry is changed is a group or a
regular memebr of a group. for the group case do the same as when deleting
a group
For the modrdn of an user entry, the case where no memberof attribute
exists has
to succeed.
Reviewed by: noriko, thanks
https://fedorahosted.org/389/ticket/47526
diff --git a/ldap/servers/plugins/memberof/memberof.c
b/ldap/servers/plugins/memberof/memberof.c
index 5568ba6..cc42c6c 100644
--- a/ldap/servers/plugins/memberof/memberof.c
+++ b/ldap/servers/plugins/memberof/memberof.c
@@ -566,7 +566,7 @@ int memberof_postop_del(Slapi_PBlock *pb)
}
/* is the entry of interest as a group? */
- if(e && configCopy.group_filter && !slapi_filter_test_simple(e,
configCopy.group_filter))
+ if(e && configCopy.group_filter && 0 == slapi_filter_test_simple(e,
configCopy.group_filter))
{
int i = 0;
Slapi_Attr *attr = 0;
@@ -664,6 +664,12 @@ memberof_del_dn_type_callback(Slapi_Entry *e, void *callback_data)
slapi_pblock_destroy(mod_pb);
+ if (rc == LDAP_NO_SUCH_ATTRIBUTE && val[0] == NULL) {
+ /* if no memberof attribut exists
+ * handle as success
+ */
+ rc = LDAP_SUCCESS;
+ }
return rc;
}
@@ -861,7 +867,7 @@ int memberof_postop_modrdn(Slapi_PBlock *pb)
/* update any downstream members */
if(pre_sdn && post_sdn && configCopy.group_filter &&
- !slapi_filter_test_simple(post_e, configCopy.group_filter))
+ 0 == slapi_filter_test_simple(post_e, configCopy.group_filter))
{
int i = 0;
Slapi_Attr *attr = 0;
@@ -890,17 +896,37 @@ int memberof_postop_modrdn(Slapi_PBlock *pb)
if (ret == LDAP_SUCCESS && pre_sdn && post_sdn) {
if ((entry_scope && !slapi_sdn_issuffix(post_sdn, entry_scope)) ||
(entry_scope_exclude_subtree &&
slapi_sdn_issuffix(post_sdn, entry_scope_exclude_subtree))) {
- memberof_del_dn_data del_data = {0, configCopy.memberof_attr};
if((ret = memberof_del_dn_from_groups(pb, &configCopy, pre_sdn))){
slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM,
"memberof_postop_modrdn - delete dn failed for (%s), error (%d)\n",
slapi_sdn_get_dn(pre_sdn), ret);
}
- if(ret == LDAP_SUCCESS && (ret = memberof_del_dn_type_callback(post_e,
&del_data))){
- slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM,
- "memberof_postop_modrdn - delete dn callback failed for (%s), error
(%d)\n",
- slapi_entry_get_dn(post_e), ret);
- }
+ if(ret == LDAP_SUCCESS && pre_e && configCopy.group_filter
&&
+ 0 == slapi_filter_test_simple(pre_e, configCopy.group_filter)) {
+ /* is the entry of interest as a group? */
+ int i = 0;
+ Slapi_Attr *attr = 0;
+
+ /* Loop through to find each grouping attribute separately. */
+ for (i = 0; configCopy.groupattrs[i] && ret == LDAP_SUCCESS; i++) {
+ if (0 == slapi_entry_attr_find(pre_e, configCopy.groupattrs[i], &attr)) {
+ if((ret = memberof_del_attr_list(pb, &configCopy, pre_sdn, attr))){
+ slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM,
+ "memberof_postop_modrdn: error deleting attr list - dn (%s). Error
(%d)\n",
+ slapi_sdn_get_dn(pre_sdn),ret);
+ }
+
+ }
+ }
+ }
+ if(ret == LDAP_SUCCESS) {
+ memberof_del_dn_data del_data = {0, configCopy.memberof_attr};
+ if(ret = memberof_del_dn_type_callback(post_e, &del_data)){
+ slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM,
+ "memberof_postop_modrdn - delete dn callback failed for (%s), error
(%d)\n",
+ slapi_entry_get_dn(post_e), ret);
+ }
+ }
} else {
if((ret = memberof_replace_dn_from_groups(pb, &configCopy, pre_sdn, post_sdn))){
slapi_log_error( SLAPI_LOG_FATAL, MEMBEROF_PLUGIN_SUBSYSTEM,
@@ -1261,7 +1287,7 @@ int memberof_postop_add(Slapi_PBlock *pb)
memberof_rlock_config();
mainConfig = memberof_get_config();
if(e && mainConfig && mainConfig->group_filter &&
- !slapi_filter_test_simple(e, mainConfig->group_filter))
+ 0 == slapi_filter_test_simple(e, mainConfig->group_filter))
{
interested = 1;
/* copy config so it doesn't change out from under us */
@@ -1554,7 +1580,7 @@ memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig
*config,
"memberof_modop_one_replace_r: %s %s in %s\n"
,op_str, op_this, op_to);
- if(config->group_filter && !slapi_filter_test_simple(e,
config->group_filter))
+ if(config->group_filter && 0 == slapi_filter_test_simple(e,
config->group_filter))
{
/* group */
Slapi_Value *ll_dn_val = 0;