ITS#2368 - fix deleting key from range IDL

[openldap] / servers / slapd / entry.c

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 98f5842f8a45e66f9544ee3430d512900406c6dd..02683226849a75116c2a51ff0aa4708177a43441 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -1,7 +1,7 @@
 /* entry.c - routines for dealing with entries */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -24,7 +24,9 @@ static int            emaxsize;/* max size of ebuf                     */
 /*
  * Empty root entry
  */
-const Entry slap_entry_root = { NOID, { 0, "" }, { 0, "" }, NULL, 0, { 0, "" }, NULL };
+const Entry slap_entry_root = {
+       NOID, { 0, "" }, { 0, "" }, NULL, 0, { 0, "" }, NULL
+};
 
 int entry_destroy(void)
 {
@@ -43,6 +45,9 @@ str2entry( char *s )
        Entry           *e;
        char            *type;
        struct berval   vals[2];
+#ifdef SLAP_NVALUES
+       struct berval   nvals[2], *nvalsp;
+#endif
        AttributeDescription *ad;
        const char *text;
        char    *next;
@@ -87,6 +92,7 @@ str2entry( char *s )
        e->e_id = NOID;
 
        /* dn + attributes */
+       vals[1].bv_len = 0;
        vals[1].bv_val = NULL;
 
        next = s;
@@ -112,15 +118,13 @@ str2entry( char *s )
 #ifdef NEW_LOGGING
                                LDAP_LOG( OPERATION, DETAIL1, "str2entry: "
                                        "entry %ld has multiple DNs \"%s\" and \"%s\"\n",
-                                       (long) e->e_id, e->e_dn,
-                                       vals[0].bv_val != NULL ? vals[0].bv_val : ""  );
+                                       (long) e->e_id, e->e_dn, vals[0].bv_val );
 #else
                                Debug( LDAP_DEBUG_ANY, "str2entry: "
                                        "entry %ld has multiple DNs \"%s\" and \"%s\"\n",
-                                   (long) e->e_id, e->e_dn,
-                                       vals[0].bv_val != NULL ? vals[0].bv_val : "" );
+                                   (long) e->e_id, e->e_dn, vals[0].bv_val );
 #endif
-                               if( vals[0].bv_val != NULL ) free( vals[0].bv_val );
+                               free( vals[0].bv_val );
                                entry_free( e );
                                return NULL;
                        }
@@ -235,7 +239,46 @@ str2entry( char *s )
                        }
                }
 
+#ifdef SLAP_NVALUES
+               nvalsp = NULL;
+               nvals[0].bv_val = NULL;
+
+               if( ad->ad_type->sat_equality &&
+                       ad->ad_type->sat_equality->smr_normalize )
+               {
+                       rc = ad->ad_type->sat_equality->smr_normalize(
+                               SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+                               ad->ad_type->sat_syntax,
+                               ad->ad_type->sat_equality,
+                               &vals[0], &nvals[0] );
+
+                       if( rc ) {
+#ifdef NEW_LOGGING
+                               LDAP_LOG( OPERATION, DETAIL1,
+                                       "str2entry:  NULL (smr_normalize %d)\n" , rc, 0, 0 );
+#else
+                               Debug( LDAP_DEBUG_ANY,
+                                       "<= str2entry NULL (smr_normalize %d)\n", rc, 0, 0 );
+#endif
+
+                               entry_free( e );
+                               free( vals[0].bv_val );
+                               free( type );
+                               return NULL;
+                       }
+
+                       nvals[1].bv_len = 0;
+                       nvals[1].bv_val = NULL;
+
+                       nvalsp = &nvals[0];
+               }
+#endif
+
+#ifdef SLAP_NVALUES
+               rc = attr_merge( e, ad, vals, nvalsp );
+#else
                rc = attr_merge( e, ad, vals );
+#endif
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG( OPERATION, DETAIL1,
@@ -252,6 +295,9 @@ str2entry( char *s )
 
                free( type );
                free( vals[0].bv_val );
+#ifdef SLAP_NVALUES
+               free( nvals[0].bv_val );
+#endif
        }
 
        /* check to make sure there was a dn: line */
@@ -264,7 +310,7 @@ str2entry( char *s )
                    (long) e->e_id, 0, 0 );
 #endif
                entry_free( e );
-               return( NULL );
+               return NULL;
        }
 
 #ifdef NEW_LOGGING
@@ -390,17 +436,19 @@ entry_cmp( Entry *e1, Entry *e2 )
 }
 
 int
-entry_dn_cmp( Entry *e1, Entry *e2 )
+entry_dn_cmp( const void *v_e1, const void *v_e2 )
 {
        /* compare their normalized UPPERCASED dn's */
+       const Entry *e1 = v_e1, *e2 = v_e2;
        int rc = e1->e_nname.bv_len - e2->e_nname.bv_len;
        if (rc) return rc;
        return( strcmp( e1->e_ndn, e2->e_ndn ) );
 }
 
 int
-entry_id_cmp( Entry *e1, Entry *e2 )
+entry_id_cmp( const void *v_e1, const void *v_e2 )
 {
+       const Entry *e1 = v_e1, *e2 = v_e2;
        return( e1->e_id < e2->e_id ? -1 : (e1->e_id > e2->e_id ? 1 : 0) );
 }
 
@@ -547,7 +595,7 @@ int entry_encode(Entry *e, struct berval *bv)
  */
 int entry_decode(struct berval *bv, Entry **e)
 {
-       int i, j;
+       int i, j, count;
        int rc;
        Attribute *a;
        Entry *x;
@@ -620,7 +668,7 @@ int entry_decode(struct berval *bv, Entry **e)
                bptr = (BerVarray)(a+1);
                a->a_vals = bptr;
                a->a_flags = 0;
-               j = entry_getlen(&ptr);
+               count = j = entry_getlen(&ptr);
 
                while (j) {
                        i = entry_getlen(&ptr);
@@ -633,9 +681,42 @@ int entry_decode(struct berval *bv, Entry **e)
                bptr->bv_val = NULL;
                bptr->bv_len = 0;
                bptr++;
+
+#ifdef SLAP_NVALUES
+               if( count && ad->ad_type->sat_equality &&
+                       ad->ad_type->sat_equality->smr_normalize )
+               {
+                       a->a_nvals = ch_malloc((count+1)*sizeof(struct berval));
+
+                       for(j=0; j<count; j++) {
+                               rc = ad->ad_type->sat_equality->smr_normalize(
+                                       SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+                                       ad->ad_type->sat_syntax,
+                                       ad->ad_type->sat_equality,
+                                       &a->a_vals[j], &a->a_nvals[j] );
+
+                               if( rc ) {
+#ifdef NEW_LOGGING
+                                       LDAP_LOG( OPERATION, DETAIL1,
+                                               "entry_decode: NULL (smr_normalize %d)\n",
+                                               rc, 0, 0 );
+#else
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "<= entry_decode NULL (smr_normalize %d)\n",
+                                               rc, 0, 0 );
+#endif
+
+                                       return rc;
+                               }
+                       }
+                       a->a_nvals[j].bv_val = NULL;
+                       a->a_nvals[j].bv_len = 0;
+               }
+#endif
+
        }
-       if (a)
-               a->a_next = NULL;
+
+       if (a) a->a_next = NULL;
 #ifdef NEW_LOGGING
        LDAP_LOG( OPERATION, DETAIL1, "entry_decode:  %s\n", x->e_dn, 0, 0 );
 #else