X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperational.c;h=4838b11739385dc0567b297e8d02d33b3663745c;hb=62b6b326338d5162b0f570eaeb8a227fbc5a9c62;hp=d03d4f3e16dedb1a7d85e3378c6df41be6f783c0;hpb=3a5cd746b79a675e6901fc6c9e22fa66d6547478;p=openldap

diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index d03d4f3e16..4838b11739 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-2004 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"
@@ -24,12 +33,36 @@ slap_operational_subschemaSubentry( Backend *be )
 	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;
+
+	a->a_nvals = ch_malloc( 2 * sizeof( struct berval ) );
+	ber_dupbv( a->a_nvals, &frontendDB->be_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;
+}
+
+Attribute *
+slap_operational_entryDN( Entry *e )
+{
+	Attribute	*a;
+
+	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, &global_schemandn );
+	ber_dupbv( a->a_nvals, &e->e_nname );
 	a->a_nvals[1].bv_len = 0;
 	a->a_nvals[1].bv_val = NULL;
 
@@ -45,12 +78,7 @@ slap_operational_hasSubordinate( int hs )
 	Attribute	*a;
 	struct berval	val;
 
-	if ( hs ) {
-		val = slap_true_bv;
-
-	} else {
-		val = slap_false_bv;
-	}
+	val = hs ? slap_true_bv : slap_false_bv;
 
 	a = ch_malloc( sizeof( Attribute ) );
 	a->a_desc = slap_schema.si_ad_hasSubordinates;