Clean up some #else #if 'ing

[openldap] / servers / slapd / operational.c

diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index 1c37cec54365c67dc863ebeb3ef1887463646ccc..3eca598b574101df9131aa395b7db14d3d1fdbf8 100644 (file)
--- a/servers/slapd/operational.c
+++ b/servers/slapd/operational.c
@@ -12,41 +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 ) );
-       ber_str2bv( SLAPD_SCHEMA_DN, sizeof(SLAPD_SCHEMA_DN)-1, 1, a->a_vals );
+       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 ) );
-       ber_str2bv( hs ? "TRUE" : "FALSE",
-               hs ? sizeof("TRUE")-1 : sizeof("FALSE")-1,
-               1, a->a_vals );
+
+       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;
 }