Attachment 696298 Details for Bug 908861 – git diff posix-winsync/posix-group-task.c

git diff posix-winsync/posix-group-task.c

diffs.txt (text/plain), 1.73 KB, created by Noriko Hosoi on 2013-02-11 21:47:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2013-02-11 21:47:35 UTC

Size: 1.73 KB

patch

obsolete

>diff --git a/ldap/servers/plugins/posix-winsync/posix-group-task.c b/ldap/servers/plugins/posix-winsync/posix-group-task.c
>index 92ac342..1d9135d 100644
>--- a/ldap/servers/plugins/posix-winsync/posix-group-task.c
>+++ b/ldap/servers/plugins/posix-winsync/posix-group-task.c
>@@ -250,6 +250,7 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data)
> 
>     char *dn = slapi_entry_get_dn(e);
>     Slapi_DN *sdn = slapi_entry_get_sdn(e);
>+    LDAPMod **mods = NULL;
> 
> /* Clean out memberuids and dsonlymemberuids without a valid referant */
>     rc = slapi_entry_attr_find(e, "memberuid", &muid_attr);
>@@ -380,17 +381,19 @@ posix_group_fix_memberuid_callback(Slapi_Entry *e, void *callback_data)
>         }
>     }
> 
>-    Slapi_PBlock *mod_pb = slapi_pblock_new();
>+    mods = slapi_mods_get_ldapmods_passout(smods);
>+    if (mods) {
>+        Slapi_PBlock *mod_pb = NULL;
>+        mod_pb = slapi_pblock_new();
>+        slapi_modify_internal_set_pb_ext(mod_pb, sdn, mods, 0, 0,
>+                                        posix_winsync_get_plugin_identity(), 0);
> 
>-    slapi_modify_internal_set_pb_ext(mod_pb, sdn, slapi_mods_get_ldapmods_passout(smods), 0, 0,
>-                                     posix_winsync_get_plugin_identity(), 0);
>-
>-    slapi_pblock_set(mod_pb, SLAPI_TXN, the_cb_data->txn);
>-    slapi_modify_internal_pb(mod_pb);
>-
>-    slapi_pblock_get(mod_pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
>-    slapi_pblock_destroy(mod_pb);
>+        slapi_pblock_set(mod_pb, SLAPI_TXN, the_cb_data->txn);
>+        slapi_modify_internal_pb(mod_pb);
> 
>+        slapi_pblock_get(mod_pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
>+        slapi_pblock_destroy(mod_pb);
>+    }
>     slapi_mods_free(&smods);
> 
>     slapi_log_error(SLAPI_LOG_PLUGIN, POSIX_WINSYNC_PLUGIN_NAME,

Actions: View

Attachments on bug 908861: 696298