Attachment 312161 Details for Bug 455913 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 2.54 KB, created by Nathan Kinder on 2008-07-18 17:57:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2008-07-18 17:57:31 UTC

Size: 2.54 KB

patch

obsolete

>Index: ldap/servers/plugins/memberof/memberof.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof/memberof.c,v
>retrieving revision 1.12
>diff -u -5 -t -r1.12 memberof.c
>--- ldap/servers/plugins/memberof/memberof.c	8 Jul 2008 19:59:39 -0000	1.12
>+++ ldap/servers/plugins/memberof/memberof.c	18 Jul 2008 16:50:57 -0000
>@@ -2113,28 +2113,29 @@
>          * with the found values.  */
>         if (groups && slapi_valueset_count(groups))
>         {
>                 Slapi_PBlock *mod_pb = slapi_pblock_new();
>                 Slapi_Value *val = 0;
>-                Slapi_Mod smod;
>+                Slapi_Mod *smod;
>                 LDAPMod **mods = (LDAPMod **) slapi_ch_malloc(2 * sizeof(LDAPMod *));
>                 int hint = 0;
> 
>-                slapi_mod_init(&smod, 0);
>-                slapi_mod_set_operation(&smod, LDAP_MOD_REPLACE | LDAP_MOD_BVALUES);
>-                slapi_mod_set_type(&smod, config->memberof_attr);
>+                smod = slapi_mod_new();
>+                slapi_mod_init(smod, 0);
>+                slapi_mod_set_operation(smod, LDAP_MOD_REPLACE | LDAP_MOD_BVALUES);
>+                slapi_mod_set_type(smod, config->memberof_attr);
> 
>                 /* Loop through all of our values and add them to smod */
>                 hint = slapi_valueset_first_value(groups, &val);
>                 while (val)
>                 {
>                         /* this makes a copy of the berval */
>-                        slapi_mod_add_value(&smod, slapi_value_get_berval(val));
>+                        slapi_mod_add_value(smod, slapi_value_get_berval(val));
>                         hint = slapi_valueset_next_value(groups, hint, &val);
>                 }
>                 
>-                mods[0] = slapi_mod_get_ldapmod_passout(&smod);
>+                mods[0] = slapi_mod_get_ldapmod_passout(smod);
>                 mods[1] = 0;
> 
>                 slapi_modify_internal_set_pb(
>                         mod_pb, dn, mods, 0, 0,
>                         memberof_get_plugin_id(), 0);
>@@ -2142,11 +2143,11 @@
>                 slapi_modify_internal_pb(mod_pb);
> 
>                 slapi_pblock_get(mod_pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
> 
>                 ldap_mods_free(mods, 1);
>-                slapi_mod_done(&smod);
>+                slapi_mod_free(&smod);
>                 slapi_pblock_destroy(mod_pb);
>         } else { 
>                 /* No groups were found, so remove the memberOf attribute
>                  * from this entry. */
>                 memberof_del_dn_type_callback(e, &del_data);

Actions: View | Diff

Attachments on bug 455913: 312161