cleanup hasSubordinate operational attr merge

diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index b9396b2473fd194affd1174765a1349981bedb1e..f6b45221f8e889bb4aaf1df6469752877122b818 100644 (file)
--- a/servers/slapd/operational.c
+++ b/servers/slapd/operational.c
@@ -40,14 +40,24 @@ 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;