More cleanup in ldap_pvt_tls_destroy()

[openldap] / libraries / libldap / search.c

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index 818f90e43cfc9b7a472becf4e88416ccfb19fa70..c8e276a6635af17e1f90e61675c094c103fb9e06 100644 (file)
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -212,7 +212,7 @@ ldap_build_search_req(
        LDAP *ld,
        LDAP_CONST char *base,
        ber_int_t scope,
-       LDAP_CONST char *filter_in,
+       LDAP_CONST char *filter,
        char **attrs,
        ber_int_t attrsonly,
        LDAPControl **sctrls,
@@ -222,7 +222,6 @@ ldap_build_search_req(
 {
        BerElement      *ber;
        int             err;
-       char    *filter;
 
        /*
         * Create the search request.  It looks like this:
@@ -292,13 +291,11 @@ ldap_build_search_req(
                return( NULL );
        }
 
-       if( filter_in != NULL ) {
-               filter = LDAP_STRDUP( filter_in );
-       } else {
-               filter = LDAP_STRDUP( "(objectclass=*)" );
+       if( filter == NULL ) {
+               filter = "(objectclass=*)";
        }
+
        err = ldap_int_put_filter( ber, filter );
-       LDAP_FREE( filter );
 
        if ( err  == -1 ) {
                ld->ld_errno = LDAP_FILTER_ERROR;