ITS#2888 don't return LDAP_SIZELIMIT_EXCEEDED prematurely

[openldap] / servers / slapd / operational.c

diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index b40f3d9ef36ce96fb628670ca38aab6e9f30d3c3..eeeddaa3d6bbb9230fc54963e6f023b80e5705bb 100644 (file)
--- a/servers/slapd/operational.c
+++ b/servers/slapd/operational.c
@@ -1,7 +1,16 @@
 /* operational.c - routines to deal with on-the-fly operational attrs */
-/*
- * Copyright 2001-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2001-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -28,12 +37,10 @@ slap_operational_subschemaSubentry( Backend *be )
        a->a_vals[1].bv_len = 0;
        a->a_vals[1].bv_val = NULL;
 
-#ifdef SLAP_NVALUES
        a->a_nvals = ch_malloc( 2 * sizeof( struct berval ) );
        ber_dupbv( a->a_nvals, &global_schemandn );
        a->a_nvals[1].bv_len = 0;
        a->a_nvals[1].bv_val = NULL;
-#endif
 
        a->a_next = NULL;
        a->a_flags = 0;
@@ -45,29 +52,23 @@ Attribute *
 slap_operational_hasSubordinate( int hs )
 {
        Attribute       *a;
-       char            *val;
-       ber_len_t       len;
+       struct berval   val;
 
        if ( hs ) {
-               val = "TRUE";
-               len = sizeof( "TRUE" ) - 1;
+               val = slap_true_bv;
 
        } else {
-               val = "FALSE";
-               len = sizeof( "FALSE" ) - 1;
-
+               val = slap_false_bv;
        }
 
        a = ch_malloc( sizeof( Attribute ) );
        a->a_desc = slap_schema.si_ad_hasSubordinates;
        a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
 
-       ber_str2bv( val, len, 1, a->a_vals );
+       ber_dupbv( &a->a_vals[0], &val );
        a->a_vals[1].bv_val = NULL;
 
-#ifdef SLAP_NVALUES
        a->a_nvals = a->a_vals;
-#endif
 
        a->a_next = NULL;
        a->a_flags = 0;