Fixed slapd modify/delete by ordered index issue

diff --git a/CHANGES b/CHANGES
index 934f66294f74675c74dabf6f330d9dd5724f4120..342dcbc96e79f21278f11ea74f91c89f05a95dc5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.3.14 Engineering
        Fixed slapd sc_prev update after free bug (ITS#4237)
        Fixed slapd pid file creation (ITS#4241)
        Fixed slapd DEBUG dependency (ITS#4245)
+       Fixed slapd modify/delete by ordered index issue
        Fixed slapd-glue (ITS#4084,4133)
        Fixed slapd-hdb idl Delete bug (ITS#4250)
        Fixed slapd-hdb cache deadlock (ITS#4254)

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 54f7eaf296342e4ef4e7aba32484d6e4ef145139..0d0e7a27dfa4754555331662e0dc8e69598c5c22 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -282,7 +282,7 @@ str2entry2( char *s, int checkvals )
                                 * validate value per syntax
                                 */
 #ifdef SLAP_ORDERED_PRETTYNORM
-                               rc = ordered_value_validate( ad, &vals[i] );
+                               rc = ordered_value_validate( ad, &vals[i], LDAP_MOD_ADD );
 #else /* ! SLAP_ORDERED_PRETTYNORM */
                                rc = validate( ad->ad_type->sat_syntax, &vals[i] );
 #endif /* ! SLAP_ORDERED_PRETTYNORM */

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index e97c847ac5092dd3a6e2fdab4ee998a74e3d1ac4..116dc3cb17ca68280cbb01fcff74d6bc3fd278ae 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -665,7 +665,7 @@ int slap_mods_check(
                                } else {
 #ifdef SLAP_ORDERED_PRETTYNORM
                                        rc = ordered_value_validate( ad,
-                                               &ml->sml_values[nvals] );
+                                               &ml->sml_values[nvals], ml->sml_op );
 #else /* ! SLAP_ORDERED_PRETTYNORM */
                                        rc = validate( ad->ad_type->sat_syntax,
                                                &ml->sml_values[nvals] );

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 6727669d9996d57f1d8b6a6fe29ec7b89f7eef61..fee6bf45471e73a2921dab8a900ea1d2b06e05b3 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1632,7 +1632,8 @@ LDAP_SLAPD_F (int) ordered_value_add LDAP_P((
 
 LDAP_SLAPD_F (int) ordered_value_validate LDAP_P((
        AttributeDescription *ad,
-       struct berval *in ));
+       struct berval *in,
+       int mop ));
 
 LDAP_SLAPD_F (int) ordered_value_pretty LDAP_P((
        AttributeDescription *ad,

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index 2a544c050c0bcaba7538c50e94973d0610ce8f93..e81a72ed5deb7a17a765a21904acef477396319f 100644 (file)
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -409,12 +409,13 @@ ordered_value_sort( Attribute *a, int do_renumber )
 /*
  * wrapper for validate function
  * uses the validate function of the syntax after removing
- * the index, if allowed an present
+ * the index, if allowed and present
  */
 int
 ordered_value_validate(
        AttributeDescription *ad,
-       struct berval *in )
+       struct berval *in,
+       int mop )
 {
        struct berval   bv = *in;
 
@@ -435,6 +436,9 @@ ordered_value_validate(
                        bv.bv_len -= ptr - bv.bv_val;
                        bv.bv_val = ptr;
                        in = &bv;
+                       /* If deleting by index, just succeed */
+                       if ( mop == LDAP_MOD_DELETE && BER_BVISEMPTY( &bv ))
+                               return LDAP_SUCCESS;
                }
        }
 
@@ -544,6 +548,11 @@ ordered_value_normalize(
                        bv.bv_len -= idx.bv_len;
                        bv.bv_val = ptr;
 
+                       /* validator will already prevent this for Adds */
+                       if ( BER_BVISEMPTY( &bv )) {
+                               ber_dupbv_x( normalized, &idx, ctx );
+                               return LDAP_SUCCESS;
+                       }
                        val = &bv;
                }
        }