ITS#5376,ITS#5378

[openldap] / servers / slapd / operational.c

diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index a32a32fd9a764656ef8bf2744c9f0fe436cbdba0..f1031295f3896d41ecddc946406c0eec8b6d1c2f 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-2008 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,20 +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 && !SLAP_FRONTEND(be) && 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 = NULL;
-#endif
+       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;
@@ -40,32 +49,47 @@ 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;
+       assert( e != NULL );
+       assert( !BER_BVISNULL( &e->e_name ) );
+       assert( !BER_BVISNULL( &e->e_nname ) );
 
-       } else {
-               val = "FALSE";
-               len = sizeof( "FALSE" ) - 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[ 0 ], &e->e_name );
+       BER_BVZERO( &a->a_vals[ 1 ] );
+
+       a->a_nvals = ch_malloc( 2 * sizeof( struct berval ) );
+       ber_dupbv( &a->a_nvals[ 0 ], &e->e_nname );
+       BER_BVZERO( &a->a_nvals[ 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 = NULL;
-#endif
+       a->a_nvals = a->a_vals;
 
        a->a_next = NULL;
        a->a_flags = 0;