|
 |
ba46c7 |
From 6ed6227cb6cead962e36505c3094f5db302f1ffb Mon Sep 17 00:00:00 2001
|
|
|
ba46c7 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
ba46c7 |
Date: Tue, 10 Sep 2013 15:39:22 -0400
|
|
|
ba46c7 |
Subject: [PATCH 5/7] Ticket 47507 - automember rebuild task not working as
|
|
|
ba46c7 |
expected
|
|
|
ba46c7 |
|
|
|
ba46c7 |
Bug Description: If the basedn specified in the task is not beneath the automember scope,
|
|
|
ba46c7 |
the entry is skipped.
|
|
|
ba46c7 |
|
|
|
ba46c7 |
Example:
|
|
|
ba46c7 |
automember scope: ou=people,dc=example,dc=com
|
|
|
ba46c7 |
task basedn: dc=example,dc=com --> using this dn will cause
|
|
|
ba46c7 |
all the candidate entries
|
|
|
ba46c7 |
to be skipped.
|
|
|
ba46c7 |
|
|
|
ba46c7 |
Fix Description: Regardless what the task basedn is, the candidate entry dn needs to be
|
|
|
ba46c7 |
checked against the scope of the autommeber config.
|
|
|
ba46c7 |
|
|
|
ba46c7 |
https://fedorahosted.org/389/ticket/47507
|
|
|
ba46c7 |
|
|
|
ba46c7 |
Revewied by: nhosoi(Thanks!!)
|
|
|
ba46c7 |
(cherry picked from commit d2637ddddc73f66f8ad874a511b4880884d36950)
|
|
|
ba46c7 |
(cherry picked from commit 6bdc635caffe8bc031cbc1d7dba1a43f292249a8)
|
|
|
ba46c7 |
---
|
|
|
ba46c7 |
ldap/servers/plugins/automember/automember.c | 2 +-
|
|
|
ba46c7 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
ba46c7 |
|
|
|
ba46c7 |
diff --git a/ldap/servers/plugins/automember/automember.c b/ldap/servers/plugins/automember/automember.c
|
|
|
ba46c7 |
index 2ba3314..02dcc0d 100644
|
|
|
ba46c7 |
--- a/ldap/servers/plugins/automember/automember.c
|
|
|
ba46c7 |
+++ b/ldap/servers/plugins/automember/automember.c
|
|
|
ba46c7 |
@@ -2192,7 +2192,7 @@ void automember_rebuild_task_thread(void *arg){
|
|
|
ba46c7 |
while (list != g_automember_config) {
|
|
|
ba46c7 |
config = (struct configEntry *)list;
|
|
|
ba46c7 |
/* Does the entry meet scope and filter requirements? */
|
|
|
ba46c7 |
- if (slapi_dn_issuffix(slapi_sdn_get_dn(td->base_dn), config->scope) &&
|
|
|
ba46c7 |
+ if (slapi_dn_issuffix(slapi_entry_get_dn(entries[i]), config->scope) &&
|
|
|
ba46c7 |
(slapi_filter_test_simple(entries[i], config->filter) == 0))
|
|
|
ba46c7 |
{
|
|
|
ba46c7 |
automember_update_membership(config, entries[i], NULL);
|
|
|
ba46c7 |
--
|
|
|
ba46c7 |
1.8.1.4
|
|
|
ba46c7 |
|