X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperational.c;h=f938076f0c5f3de69abb341473209ade25cc4168;hb=5c3a4e176e9539f58a1ac666ad370b4c204cd44c;hp=b40f3d9ef36ce96fb628670ca38aab6e9f30d3c3;hpb=5ad51b6150311e38fb8fe872880e1b20dd0425a1;p=openldap

diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index b40f3d9ef3..f938076f0c 100644
--- 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-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"
@@ -18,22 +27,20 @@ slap_operational_subschemaSubentry( Backend *be )
 	Attribute	*a;
 
 	/* The backend wants to take care of it */
-	if ( be && be->be_schemadn.bv_val ) return NULL;
+	if ( be && be!= frontendDB && be->be_schemadn.bv_val ) return NULL;
 
 	a = ch_malloc( sizeof( Attribute ) );
 	a->a_desc = slap_schema.si_ad_subschemaSubentry;
 
 	a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
-	ber_dupbv( a->a_vals, &global_schemadn );
+	ber_dupbv( a->a_vals, &frontendDB->be_schemadn );
 	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 );
+	ber_dupbv( a->a_nvals, &frontendDB->be_schemandn );
 	a->a_nvals[1].bv_len = 0;
 	a->a_nvals[1].bv_val = NULL;
-#endif
 
 	a->a_next = NULL;
 	a->a_flags = 0;
@@ -42,32 +49,45 @@ slap_operational_subschemaSubentry( Backend *be )
 }
 
 Attribute *
-slap_operational_hasSubordinate( int hs )
+slap_operational_entryDN( Entry *e )
 {
 	Attribute	*a;
-	char		*val;
-	ber_len_t	len;
 
-	if ( hs ) {
-		val = "TRUE";
-		len = sizeof( "TRUE" ) - 1;
+	a = ch_malloc( sizeof( Attribute ) );
+	a->a_desc = slap_schema.si_ad_entryDN;
+
+	a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
+	ber_dupbv( a->a_vals, &e->e_name );
+	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, &e->e_nname );
+	a->a_nvals[1].bv_len = 0;
+	a->a_nvals[1].bv_val = NULL;
 
-	} else {
-		val = "FALSE";
-		len = sizeof( "FALSE" ) - 1;
+	a->a_next = NULL;
+	a->a_flags = 0;
+
+	return a;
+}
+
+Attribute *
+slap_operational_hasSubordinate( int hs )
+{
+	Attribute	*a;
+	struct berval	val;
 
-	}
+	val = hs ? slap_true_bv : 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;