ITS#5376,ITS#5378

[openldap] / servers / slapd / operational.c

diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index 8e19cc9860dd0feb37d2b0cf815a718a2b2b1ad9..f1031295f3896d41ecddc946406c0eec8b6d1c2f 100644 (file)
--- a/servers/slapd/operational.c
+++ b/servers/slapd/operational.c
@@ -1,7 +1,7 @@
 /* operational.c - routines to deal with on-the-fly operational attrs */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,18 +27,18 @@ 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;
 
        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;
 
@@ -48,18 +48,39 @@ slap_operational_subschemaSubentry( Backend *be )
        return a;
 }
 
+Attribute *
+slap_operational_entryDN( Entry *e )
+{
+       Attribute       *a;
+
+       assert( e != NULL );
+       assert( !BER_BVISNULL( &e->e_name ) );
+       assert( !BER_BVISNULL( &e->e_nname ) );
+
+       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;
 
-       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;