In backend_operational don't add subschemaSubentry unless it was

requested. In send_search_entry don't malloc vrFilter flags unless
a matchedValue filter was given; malloc 1 contiguous block instead
of multiple sub-arrays.

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 3389fceddd787c5ef4cc25a028c3bec3df7a3f3f..133f9fd82e8c52b57c9cd87e4ccb706490135038 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -1105,16 +1105,18 @@ Attribute *backend_operational(
 {
        Attribute *a = NULL, **ap = &a;
 
-#ifdef SLAPD_SCHEMA_DN
-       *ap = slap_operational_subschemaSubentry();
-       ap = &(*ap)->a_next;
-#endif
-
        /*
         * If operational attributes (allegedly) are required, 
         * and the backend supports specific operational attributes, 
         * add them to the attribute list
         */
+#ifdef SLAPD_SCHEMA_DN
+       if ( opattrs || ( attrs &&
+               ad_inlist( slap_schema.si_ad_subschemaSubentry, attrs )) ) {
+               *ap = slap_operational_subschemaSubentry();
+               ap = &(*ap)->a_next;
+       }
+#endif
        if ( ( opattrs || attrs ) && be && be->be_operational != NULL ) {
                ( void )be->be_operational( be, conn, op, e, attrs, opattrs, ap );
        }

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 96a2ef1337cc44fe3b510cb16f7f0d9bd72f9fff..8d0c5636848f070c5d3cb7fc7f35e75dd4124cb2 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -637,7 +637,7 @@ send_search_entry(
         *          returned or filtered out
         * e_flags: array of a_flags
         */
-       char *a_flags, **e_flags;
+       char **e_flags = NULL;
 
        if (op->o_callback && op->o_callback->sc_sendentry) {
                return op->o_callback->sc_sendentry( be, conn, op, e, attrs,
@@ -726,27 +726,22 @@ send_search_entry(
         * to particular value of attribute and equals 1 if value matches
         * to ValuesReturnFilter or 0 if not
         */     
-       for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next ) i++;
-       e_flags = ch_malloc ( i * sizeof(a_flags) );
-       
-       for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
-               for ( j = 0; a->a_vals[j].bv_val != NULL; j++ );
-
-               if( j ) {
-                       a_flags = ch_calloc ( j, sizeof(char) );
-                       /* If no ValuesReturnFilter control return everything */
-                       if ( op->vrFilter == NULL ) {
-                               memset(a_flags, 1, j);
-                       }
-               } else {
-                       a_flags = NULL;
+       if ( op->vrFilter != NULL ) {
+               int k = 0;
+               char *a_flags;
+
+               for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
+                       for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) k++;
+               }
+               e_flags = ch_calloc ( 1, i * sizeof(char *) + k );
+               a_flags = (char *)(e_flags + i);
+               for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
+                       for ( j = 0; a->a_vals[j].bv_val != NULL; j++ );
+                       e_flags[i] = a_flags;
+                       a_flags += j;
                }
-               e_flags[i] = a_flags; 
-       }
 
-       if ( op->vrFilter != NULL ) { 
                rc = filter_matched_values(be, conn, op, e->e_attrs, &e_flags) ; 
-           
                if ( rc == -1 ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG( OPERATION, ERR, 
@@ -758,12 +753,6 @@ send_search_entry(
 #endif
                        ber_free( ber, 1 );
 
-                       /* free e_flags */
-                       for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
-                               free( e_flags[i] );
-                       }
-                       free( e_flags );
-
                        send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, "matched values filtering error", 
                                NULL, NULL );
@@ -821,11 +810,6 @@ send_search_entry(
 #endif
 
                        ber_free_buf( ber );
-                       /* free e_flags */
-                       for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
-                               free( e_flags[i] );
-                       }
-                       free( e_flags );
                        send_ldap_result( conn, op, LDAP_OTHER,
                            NULL, "encoding description error", NULL, NULL );
                        goto error_return;
@@ -851,7 +835,7 @@ send_search_entry(
                                        continue;
                                }
 
-                               if ( e_flags[j][i] == 0 ){
+                               if ( op->vrFilter && e_flags[j][i] == 0 ){
                                        continue;
                                }
 
@@ -866,11 +850,6 @@ send_search_entry(
 #endif
 
                                        ber_free_buf( ber );
-                                       /* free e_flags */
-                                       for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
-                                               free( e_flags[i] );
-                                       }
-                                       free( e_flags );
                                        send_ldap_result( conn, op, LDAP_OTHER,
                                                NULL, "encoding values error",
                                                NULL, NULL );
@@ -889,11 +868,6 @@ send_search_entry(
 #endif
 
                        ber_free_buf( ber );
-                       /* free e_flags */
-                       for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
-                               free( e_flags[i] );
-                       }
-                       free( e_flags );
                        send_ldap_result( conn, op, LDAP_OTHER,
                            NULL, "encode end error", NULL, NULL );
                        goto error_return;
@@ -901,30 +875,29 @@ send_search_entry(
        }
 
        /* free e_flags */
-       for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
-               free( e_flags[i] );
+       if ( e_flags ) {
+               free( e_flags );
+               e_flags = NULL;
        }
-       free( e_flags );
 
        /* eventually will loop through generated operational attributes */
        /* only have subschemaSubentry implemented */
        aa = backend_operational( be, conn, op, e, attrs, opattrs );
 
-       for ( a = aa, i=0; a != NULL; a = a->a_next ) i++;
-       e_flags = ch_malloc ( i * sizeof(a_flags) );
-       
-       for ( a = aa, i=0; a != NULL; a = a->a_next, i++ ) {
-               for ( j = 0; a->a_vals[j].bv_val != NULL; j++ );
+       if ( aa != NULL && op->vrFilter != NULL ) {
+               int k = 0;
+               char *a_flags;
 
-               a_flags = ch_calloc ( j, sizeof(char) );
-               /* If no ValuesReturnFilter control return everything */
-               if ( op->vrFilter == NULL ){
-                   memset(a_flags, 1, j);
+               for ( a = aa, i=0; a != NULL; a = a->a_next, i++ ) {
+                       for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) k++;
+               }
+               e_flags = ch_calloc ( 1, i * sizeof(char *) + k );
+               a_flags = (char *)(e_flags + i);
+               for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
+                       for ( j = 0; a->a_vals[j].bv_val != NULL; j++ );
+                       e_flags[i] = a_flags;
+                       a_flags += j;
                }
-               e_flags[i] = a_flags; 
-       }
-
-       if ( op->vrFilter != NULL ) {
                rc = filter_matched_values(be, conn, op, aa, &e_flags) ; 
            
                if ( rc == -1 ) {
@@ -939,12 +912,6 @@ send_search_entry(
 #endif
                        ber_free( ber, 1 );
 
-                       /* free e_flags */
-                       for ( a = aa, i=0; a != NULL; a = a->a_next, i++ ) {
-                               free( e_flags[i] );
-                       }
-                       free( e_flags );
-
                        send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, "matched values filtering error", 
                                NULL, NULL );
@@ -1007,11 +974,6 @@ send_search_entry(
                        ber_free_buf( ber );
                        send_ldap_result( conn, op, LDAP_OTHER,
                            NULL, "encoding description error", NULL, NULL );
-                       /* free e_flags */
-                       for ( a = aa, i=0; a != NULL; a = a->a_next, i++ ) {
-                               free( e_flags[i] );
-                       }
-                       free( e_flags );
 
                        attrs_free( aa );
                        goto error_return;
@@ -1037,7 +999,7 @@ send_search_entry(
                                        continue;
                                }
 
-                               if ( e_flags[j][i] == 0 ){
+                               if ( op->vrFilter && e_flags[j][i] == 0 ){
                                        continue;
                                }
 
@@ -1055,11 +1017,6 @@ send_search_entry(
                                        send_ldap_result( conn, op, LDAP_OTHER,
                                                NULL, "encoding values error", 
                                                NULL, NULL );
-                                       /* free e_flags */
-                                       for ( a = aa, i=0; a != NULL; a = a->a_next, i++ ) {
-                                               free( e_flags[i] );
-                                       }
-                                       free( e_flags );
 
                                        attrs_free( aa );
                                        goto error_return;
@@ -1079,11 +1036,6 @@ send_search_entry(
                        ber_free_buf( ber );
                        send_ldap_result( conn, op, LDAP_OTHER,
                            NULL, "encode end error", NULL, NULL );
-                       /* free e_flags */
-                       for ( a = aa, i=0; a != NULL; a = a->a_next, i++ ) {
-                               free( e_flags[i] );
-                       }
-                       free( e_flags );
 
                        attrs_free( aa );
                        goto error_return;
@@ -1091,10 +1043,10 @@ send_search_entry(
        }
 
        /* free e_flags */
-       for ( a = aa, i=0; a != NULL; a = a->a_next, i++ ) {
-               free( e_flags[i] );
+       if ( e_flags ) {
+               free( e_flags );
+               e_flags = NULL;
        }
-       free( e_flags );
 
        attrs_free( aa );
        rc = ber_printf( ber, /*{{{*/ "}N}N}" );
@@ -1154,6 +1106,7 @@ send_search_entry(
        rc = 0;
 
 error_return:;
+       if ( e_flags ) free( e_flags );
        return( rc );
 }