Attachment 309879 Details for Bug 452169 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 1.83 KB, created by Nathan Kinder on 2008-06-19 20:32:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2008-06-19 20:32:39 UTC

Size: 1.83 KB

patch

obsolete

>Index: index.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/index.c,v
>retrieving revision 1.13
>diff -u -5 -t -r1.13 index.c
>--- index.c	4 Oct 2007 03:28:19 -0000	1.13
>+++ index.c	19 Jun 2008 20:30:48 -0000
>@@ -650,17 +650,25 @@
> 
>                 /* If the same value doesn't exist in a subtype, set
>                  * BE_INDEX_EQUALITY flag so the equality index is
>                  * removed.
>                  */
>-                slapi_entry_attr_find( olde->ep_entry, mods[i]->mod_type, &curr_attr);
>-                for (j = 0; mods_valueArray[j] != NULL; j++ ) {
>-                    if ( valuearray_find(curr_attr, evals, mods_valueArray[j]) == -1 ) {
>-                        if (!(flags & BE_INDEX_EQUALITY)) {
>-                            flags |= BE_INDEX_EQUALITY;
>+                slapi_entry_attr_find( newe->ep_entry, mods[i]->mod_type, &curr_attr);
>+                if (curr_attr) {
>+                    for (j = 0; mods_valueArray[j] != NULL; j++ ) {
>+                        if ( valuearray_find(curr_attr, evals, mods_valueArray[j]) == -1 ) {
>+                            if (!(flags & BE_INDEX_EQUALITY)) {
>+                                flags |= BE_INDEX_EQUALITY;
>+                            }
>                         }
>                     }
>+                } else {
>+                    /* If we didn't find the attribute in the new
>+                     * entry, we should remove the equality index. */
>+                    if (!(flags & BE_INDEX_EQUALITY)) {
>+                        flags |= BE_INDEX_EQUALITY;
>+                    }
>                 }
> 
>                 rc = index_addordel_values_sv( be, basetype,
>                                                mods_valueArray,
>                                                evals, id, flags, txn );

Actions: View | Diff

Attachments on bug 452169: 309879 | 314595