clarify generated password issue

[openldap] / servers / slapd / back-ldap / search.c

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 1a30eb6960e81ca78596bff6596a93c6c5385bff..166e360d71e3ccc922d81d8a813f2f832363c4c0 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -258,7 +258,7 @@ retry:
         * but this is necessary for version matching, and for ACL processing.
         */
 
-       for ( rc = 0; rc != -1; rc = ldap_result( lc->lc_ld, msgid, 0, &tv, &res ) )
+       for ( rc = 0; rc != -1; rc = ldap_result( lc->lc_ld, msgid, LDAP_MSG_ONE, &tv, &res ) )
        {
                /* check for abandon */
                if ( op->o_abandon ) {
@@ -299,11 +299,11 @@ retry:
                                rc = rs->sr_err = send_search_entry( op, rs );
                                if ( !BER_BVISNULL( &ent.e_name ) ) {
                                        assert( ent.e_name.bv_val != bdn.bv_val );
-                                       free( ent.e_name.bv_val );
+                                       op->o_tmpfree( ent.e_name.bv_val, op->o_tmpmemctx );
                                        BER_BVZERO( &ent.e_name );
                                }
                                if ( !BER_BVISNULL( &ent.e_nname ) ) {
-                                       free( ent.e_nname.bv_val );
+                                       op->o_tmpfree( ent.e_nname.bv_val, op->o_tmpmemctx );
                                        BER_BVZERO( &ent.e_nname );
                                }
                                entry_clean( &ent );