[389-commits] ldap/servers

ldap/servers/plugins/posix-winsync/posix-group-func.c | 4
ldap/servers/plugins/posix-winsync/posix-group-func.h | 1
ldap/servers/plugins/posix-winsync/posix-group-task.c | 72 +++++++++++---
ldap/servers/plugins/posix-winsync/posix-winsync-config.c | 3
ldap/servers/plugins/posix-winsync/posix-winsync.c | 4
ldap/servers/plugins/posix-winsync/posix-wsp-ident.h | 2
6 files changed, 69 insertions(+), 17 deletions(-)

New commits:
commit 8d5410e2e08f2e6fdabe9ab1dc3e97b20842a34d
Author: Noriko Hosoi <nhosoi@redhat.com>
Date: Mon Jun 2 12:42:42 2014 -0700

Ticket #47770 - #481 breaks possibility to reassemble memberuid list

Description: Patch to implement #481 "expand nested posix groups"
wiped out the code in posix_group_fix_memberuid_callback (posix-
group-task.c) to add memberuid if the entry is a posix group.
This patch adds the code back.

Plus fixed a couple of memory leaks and renamed a posix winsync
local function plugin_op_all_finished to posix_winsync_plugin_op_
all_finished not to confuse valgrind.

https://fedorahosted.org/389/ticket/47770

Reviewed by rmeggins@redhat.com (Thank you, Rich!!)

diff --git a/ldap/servers/plugins/posix-winsync/posix-group-func.c b/ldap/servers/plugins/posix-winsync/posix-group-func.c
index 11e9a7f..5f841e5 100644
--- a/ldap/servers/plugins/posix-winsync/posix-group-func.c
+++ b/ldap/servers/plugins/posix-winsync/posix-group-func.c
@@ -21,12 +21,12 @@
#include <nspr.h>
#include "slapi-plugin.h"
#include "posix-wsp-ident.h"
+#include "posix-group-func.h"

#define MAX_RECURSION_DEPTH (5)

Slapi_Value **
valueset_get_valuearray(const Slapi_ValueSet *vs); /* stolen from proto-slap.h */
-static int hasObjectClass(Slapi_Entry *entry, const char *objectClass);

static PRMonitor *memberuid_operation_lock = 0;

@@ -257,7 +257,7 @@ smods_has_mod(Slapi_Mods *smods, int modtype, const char *type, const char *val)
return rc;
}

-static int
+int
hasObjectClass(Slapi_Entry *entry, const char *objectClass)
{
int rc = 0;
diff --git a/ldap/servers/plugins/posix-winsync/posix-group-func.h b/ldap/servers/plugins/posix-winsync/posix-group-func.h
index e9db3a2..c37740c 100644
--- a/ldap/servers/plugins/posix-winsync/posix-group-func.h
+++ b/ldap/servers/plugins/posix-winsync/posix-group-func.h
@@ -20,5 +20,6 @@ int memberUidLockInit();
void memberUidLockDestroy();
int addUserToGroupMembership(Slapi_Entry *entry);
void propogateDeletionsUpward(Slapi_Entry *, const Slapi_DN *, Slapi_ValueSet*, Slapi_ValueSet *, int);
+int hasObjectClass(Slapi_Entry *entry, const char *objectClass);