Install *.schema only

[openldap] / servers / slapd / filter.c

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 4a4f592cf4b928725647fb1de5bffbf3c65c20e8..e9cfa1fe3b9d0077917dbb28325c10ab40c68426 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -312,17 +312,28 @@ get_filter(
                break;
        }
 
+       free( ftmp );
+
        if ( err != LDAP_SUCCESS ) {
-               free( (char *) f );
                if ( *fstr != NULL ) {
                        free( *fstr );
                }
+
+               if( err != SLAPD_DISCONNECT ) {
+                       /* ignore error */
+                       f->f_choice = SLAPD_FILTER_COMPUTED;
+                       f->f_result = SLAPD_COMPARE_UNDEFINED;
+                       *fstr = ch_strdup( "(badfilter)" );
+                       err = LDAP_SUCCESS;
+                       *filt = f;
+
+               } else {
+                       free(f);
+               }
        } else {
                *filt = f;
        }
 
-       free( ftmp );
-
        Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );
        return( err );
 }
@@ -394,6 +405,7 @@ get_substring_filter(
        }
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
+       f->f_sub = ch_calloc( 1, sizeof(SubstringsAssertion) );
        f->f_sub_desc = NULL;
        rc = slap_bv2ad( &type, &f->f_sub_desc, text );
 
@@ -401,6 +413,7 @@ get_substring_filter(
 
        if( rc != LDAP_SUCCESS ) {
                text = NULL;
+               ch_free( f->f_sub );
                f->f_choice = SLAPD_FILTER_COMPUTED;
                f->f_result = SLAPD_COMPARE_UNDEFINED;
                *fstr = ch_strdup( "(undefined)" );
@@ -565,6 +578,9 @@ return_error:
                        ber_bvfree( f->f_sub_initial );
                        ber_bvecfree( f->f_sub_any );
                        ber_bvfree( f->f_sub_final );
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+                       ch_free( f->f_sub );
+#endif
                        return rc;
                }
        }