ITS#2368 - fix deleting key from range IDL

[openldap] / servers / slapd / operational.c

diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index f6b45221f8e889bb4aaf1df6469752877122b818..a32a32fd9a764656ef8bf2744c9f0fe436cbdba0 100644 (file)
--- a/servers/slapd/operational.c
+++ b/servers/slapd/operational.c
@@ -1,6 +1,6 @@
 /* operational.c - routines to deal with on-the-fly operational attrs */
 /*
- * Copyright 2001-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2001-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -12,7 +12,6 @@
  * helpers for on-the-fly operational attribute generation
  */
 
-#ifdef SLAPD_SCHEMA_DN
 Attribute *
 slap_operational_subschemaSubentry( Backend *be )
 {
@@ -27,14 +26,18 @@ slap_operational_subschemaSubentry( Backend *be )
 
        a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
        ber_dupbv( a->a_vals, &global_schemadn );
+       a->a_vals[1].bv_len = 0;
        a->a_vals[1].bv_val = NULL;
 
+#ifdef SLAP_NVALUES
+       a->a_nvals = NULL;
+#endif
+
        a->a_next = NULL;
        a->a_flags = 0;
 
        return a;
 }
-#endif /* SLAPD_SCHEMA_DN */
 
 Attribute *
 slap_operational_hasSubordinate( int hs )
@@ -60,6 +63,10 @@ slap_operational_hasSubordinate( int hs )
        ber_str2bv( val, len, 1, a->a_vals );
        a->a_vals[1].bv_val = NULL;
 
+#ifdef SLAP_NVALUES
+       a->a_nvals = NULL;
+#endif
+
        a->a_next = NULL;
        a->a_flags = 0;