From 4f13ba5eb7712a831de2e3e3bb1b398a8d30387f Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Thu, 4 Apr 2013 13:25:29 -0400
Subject: don't skip changes that only affect map membership

When checking if we can skip processing for a given change, pay
attention to whether or not the changes cause the entry to need to be
added or removed from a map (#912673).
---
 src/back-shr.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/back-shr.c b/src/back-shr.c
index 97fa2e2..e238a19 100644
--- a/src/back-shr.c
+++ b/src/back-shr.c
@@ -1677,17 +1677,22 @@ backend_shr_modify_entry_cb(const char *group, const char *set, bool_t flag,
 			}
 		}
 		if (mod == NULL) {
-			slapi_log_error(SLAPI_LOG_PLUGIN,
-					cbdata->state->plugin_desc->spd_id,
-					"no interesting changes for "
-					"\"%s\"/\"%s\" made in (\"%s\") "
-					"(%s not in %s)\n",
-					set_data->group,
-					set_data->set,
-					cbdata->ndn,
-					cbdata->modlist ? cbdata->modlist : "",
-					backend_shr_get_rel_attr_list(set_data));
-			return TRUE;
+			if (backend_shr_entry_matches_set(set_data, cbdata->pb,
+							  cbdata->e_pre) ==
+			    backend_shr_entry_matches_set(set_data, cbdata->pb,
+							  cbdata->e_post)) {
+				slapi_log_error(SLAPI_LOG_PLUGIN,
+						cbdata->state->plugin_desc->spd_id,
+						"no interesting changes for "
+						"\"%s\"/\"%s\" made in (\"%s\") "
+						"(%s not in %s)\n",
+						set_data->group,
+						set_data->set,
+						cbdata->ndn,
+						cbdata->modlist ? cbdata->modlist : "",
+						backend_shr_get_rel_attr_list(set_data));
+				return TRUE;
+			}
 		} else {
 			slapi_log_error(SLAPI_LOG_PLUGIN,
 					cbdata->state->plugin_desc->spd_id,
-- 
cgit