Blame SOURCES/0084-Ticket-47831-remove-debug-logging-from-retro-cl.patch

b161c9
From f5b9a4be65641b29e37e9a0f9a15fee91db2a1e6 Mon Sep 17 00:00:00 2001
b161c9
From: Noriko Hosoi <nhosoi@redhat.com>
b161c9
Date: Tue, 8 Sep 2015 12:20:33 -0700
b161c9
Subject: [PATCH 84/84] Ticket 47831 - remove debug logging from retro cl
b161c9
b161c9
Description: 47831 patch expects "skip_nested" which is not supposed
b161c9
to be in the branch rhel-7.1.
b161c9
---
b161c9
 ldap/servers/plugins/memberof/memberof.c        | 16 +++++++---------
b161c9
 ldap/servers/plugins/memberof/memberof_config.c |  6 +-----
b161c9
 2 files changed, 8 insertions(+), 14 deletions(-)
b161c9
b161c9
diff --git a/ldap/servers/plugins/memberof/memberof.c b/ldap/servers/plugins/memberof/memberof.c
b161c9
index 1840e34..4d79cf6 100644
b161c9
--- a/ldap/servers/plugins/memberof/memberof.c
b161c9
+++ b/ldap/servers/plugins/memberof/memberof.c
b161c9
@@ -522,7 +522,7 @@ int memberof_postop_del(Slapi_PBlock *pb)
b161c9
 {
b161c9
 	int ret = SLAPI_PLUGIN_SUCCESS;
b161c9
 	MemberOfConfig *mainConfig = NULL;
b161c9
-	MemberOfConfig configCopy = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
b161c9
+	MemberOfConfig configCopy = {0, 0, 0, 0, 0, 0, 0, 0, 0};
b161c9
 	Slapi_DN *sdn;
b161c9
 	void *caller_id = NULL;
b161c9
 
b161c9
@@ -850,7 +850,7 @@ int memberof_postop_modrdn(Slapi_PBlock *pb)
b161c9
 	if(memberof_oktodo(pb))
b161c9
 	{
b161c9
 		MemberOfConfig *mainConfig = 0;
b161c9
-		MemberOfConfig configCopy = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
b161c9
+		MemberOfConfig configCopy = {0, 0, 0, 0, 0, 0, 0, 0, 0};
b161c9
 		struct slapi_entry *pre_e = NULL;
b161c9
 		struct slapi_entry *post_e = NULL;
b161c9
 		Slapi_DN *pre_sdn = 0;
b161c9
@@ -1115,7 +1115,7 @@ int memberof_postop_modify(Slapi_PBlock *pb)
b161c9
 	{
b161c9
 		int config_copied = 0;
b161c9
 		MemberOfConfig *mainConfig = 0;
b161c9
-		MemberOfConfig configCopy = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
b161c9
+		MemberOfConfig configCopy = {0, 0, 0, 0, 0, 0, 0, 0, 0};
b161c9
 
b161c9
 		/* get the mod set */
b161c9
 		slapi_pblock_get(pb, SLAPI_MODIFY_MODS, &mods);
b161c9
@@ -1293,7 +1293,7 @@ int memberof_postop_add(Slapi_PBlock *pb)
b161c9
 	if(memberof_oktodo(pb) && (sdn = memberof_getsdn(pb)))
b161c9
 	{
b161c9
 		struct slapi_entry *e = NULL;
b161c9
-		MemberOfConfig configCopy = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
b161c9
+		MemberOfConfig configCopy = {0, 0, 0, 0, 0, 0, 0, 0, 0};
b161c9
 		MemberOfConfig *mainConfig;
b161c9
 		slapi_pblock_get( pb, SLAPI_ENTRY_POST_OP, &e );
b161c9
 
b161c9
@@ -2178,11 +2178,9 @@ int memberof_get_groups_callback(Slapi_Entry *e, void *callback_data)
b161c9
 			slapi_valueset_add_value_ext(groupvals, group_dn_val, SLAPI_VALUE_FLAG_PASSIN);
b161c9
 			slapi_valueset_add_value_ext(group_norm_vals, group_ndn_val, SLAPI_VALUE_FLAG_PASSIN);
b161c9
 	}
b161c9
-	if(!config->skip_nested || config->fixup_task){
b161c9
-		/* now recurse to find parent groups of e */
b161c9
-		memberof_get_groups_r(((memberof_get_groups_data*)callback_data)->config,
b161c9
-			group_sdn, callback_data);
b161c9
-	}
b161c9
+	/* now recurse to find parent groups of e */
b161c9
+	memberof_get_groups_r(((memberof_get_groups_data*)callback_data)->config,
b161c9
+		group_sdn, callback_data);
b161c9
 
b161c9
 bail:
b161c9
 	return rc;
b161c9
diff --git a/ldap/servers/plugins/memberof/memberof_config.c b/ldap/servers/plugins/memberof/memberof_config.c
b161c9
index c335cab..6be7f3c 100644
b161c9
--- a/ldap/servers/plugins/memberof/memberof_config.c
b161c9
+++ b/ldap/servers/plugins/memberof/memberof_config.c
b161c9
@@ -77,7 +77,7 @@ static int memberof_search (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_En
b161c9
 /* This is the main configuration which is updated from dse.ldif.  The
b161c9
  * config will be copied when it is used by the plug-in to prevent it
b161c9
  * being changed out from under a running memberOf operation. */
b161c9
-static MemberOfConfig theConfig = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
b161c9
+static MemberOfConfig theConfig = {0, 0, 0, 0, 0, 0, 0, 0, 0};
b161c9
 static Slapi_RWLock *memberof_config_lock = 0;
b161c9
 static int inited = 0;
b161c9
 
b161c9
@@ -208,7 +208,6 @@ memberof_validate_config (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entr
b161c9
 	Slapi_DN **exclude_dn = NULL;
b161c9
 	char *syntaxoid = NULL;
b161c9
 	char *config_dn = NULL;
b161c9
-	char *skip_nested = NULL;
b161c9
 	char **entry_scopes = NULL;
b161c9
 	char **entry_exclude_scopes = NULL;
b161c9
 	int not_dn_syntax = 0;
b161c9
@@ -462,7 +461,6 @@ memberof_apply_config (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
b161c9
 	char **entryScopes = NULL;
b161c9
 	char **entryScopeExcludeSubtrees = NULL;
b161c9
 	char *sharedcfg = NULL;
b161c9
-	char *skip_nested = NULL;
b161c9
 	int num_vals = 0;
b161c9
 
b161c9
 	*returncode = LDAP_SUCCESS;
b161c9
@@ -495,7 +493,6 @@ memberof_apply_config (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
b161c9
 	groupattrs = slapi_entry_attr_get_charray(e, MEMBEROF_GROUP_ATTR);
b161c9
 	memberof_attr = slapi_entry_attr_get_charptr(e, MEMBEROF_ATTR);
b161c9
 	allBackends = slapi_entry_attr_get_charptr(e, MEMBEROF_BACKEND_ATTR);
b161c9
-	skip_nested = slapi_entry_attr_get_charptr(e, MEMBEROF_SKIP_NESTED_ATTR);
b161c9
 
b161c9
 	/*
b161c9
 	 * We want to be sure we don't change the config in the middle of
b161c9
@@ -657,7 +654,6 @@ done:
b161c9
 	slapi_ch_free_string(&sharedcfg);
b161c9
 	slapi_ch_free_string(&memberof_attr);
b161c9
 	slapi_ch_free_string(&allBackends);
b161c9
-	slapi_ch_free_string(&skip_nested);
b161c9
 	slapi_ch_free((void **)&entryScopes);
b161c9
 	slapi_ch_free((void **)&entryScopeExcludeSubtrees);
b161c9
 
b161c9
-- 
b161c9
1.9.3
b161c9