Import ITS#4158 fixes from HEAD

[openldap] / servers / slapd / operational.c

diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index 1c37cec54365c67dc863ebeb3ef1887463646ccc..a891bf3f0a0b59c6c6e308fa8181d8ff71448023 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-2002 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-2005 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"
@@ -12,41 +21,57 @@
  * helpers for on-the-fly operational attribute generation
  */
 
-#ifdef SLAPD_SCHEMA_DN
 Attribute *
-slap_operational_subschemaSubentry( void )
+slap_operational_subschemaSubentry( Backend *be )
 {
        Attribute       *a;
 
+       /* The backend wants to take care of it */
+       if ( be && be->be_schemadn.bv_val ) return NULL;
+
        a = ch_malloc( sizeof( Attribute ) );
        a->a_desc = slap_schema.si_ad_subschemaSubentry;
 
-       /* Should be backend specific */
        a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
-       ber_str2bv( SLAPD_SCHEMA_DN, sizeof(SLAPD_SCHEMA_DN)-1, 1, a->a_vals );
+       ber_dupbv( a->a_vals, &global_schemadn );
+       a->a_vals[1].bv_len = 0;
        a->a_vals[1].bv_val = NULL;
 
+       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;
+
        a->a_next = NULL;
+       a->a_flags = 0;
 
        return a;
 }
-#endif /* SLAPD_SCHEMA_DN */
 
 Attribute *
 slap_operational_hasSubordinate( int hs )
 {
        Attribute       *a;
-       
+       struct berval   val;
+
+       if ( hs ) {
+               val = slap_true_bv;
+
+       } else {
+               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( hs ? "TRUE" : "FALSE",
-               hs ? sizeof("TRUE")-1 : sizeof("FALSE")-1,
-               1, a->a_vals );
+
+       ber_dupbv( &a->a_vals[0], &val );
        a->a_vals[1].bv_val = NULL;
 
+       a->a_nvals = a->a_vals;
+
        a->a_next = NULL;
+       a->a_flags = 0;
 
        return a;
 }