X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperational.c;h=3eca598b574101df9131aa395b7db14d3d1fdbf8;hb=8975676fa435f4178c62e4d213697906ff81059f;hp=989b11b155d8cbb863ee8d514488c7181646f5f0;hpb=328d38713ae9b3a6b57160d36b9fa3a2dc992d8a;p=openldap

diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index 989b11b155..3eca598b57 100644
--- 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 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2001-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -12,39 +12,54 @@
  * 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 * ) );
-	a->a_vals[0] = ber_bvstrdup( SLAPD_SCHEMA_DN );
-	a->a_vals[1] = NULL;
+	a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
+	ber_dupbv( a->a_vals, &global_schemadn );
+	a->a_vals[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;
-	
+	char		*val;
+	ber_len_t	len;
+
+	if ( hs ) {
+		val = "TRUE";
+		len = sizeof( "TRUE" ) - 1;
+
+	} else {
+		val = "FALSE";
+		len = sizeof( "FALSE" ) - 1;
+
+	}
+
 	a = ch_malloc( sizeof( Attribute ) );
 	a->a_desc = slap_schema.si_ad_hasSubordinates;
+	a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
 
-	a->a_vals = ch_malloc( 2 * sizeof( struct berval * ) );
-	a->a_vals[0] = ber_bvstrdup( hs ? "TRUE" : "FALSE" );
-	a->a_vals[1] = NULL;
+	ber_str2bv( val, len, 1, a->a_vals );
+	a->a_vals[1].bv_val = NULL;
 
 	a->a_next = NULL;
+	a->a_flags = 0;
 
 	return a;
 }