]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/overlays/dds.c
Fix last commit: C90 rejects declaration after code
[openldap] / servers / slapd / overlays / dds.c
index d235327a2a283d3f84c6b88bd1cc117abca8350e..fda9d70edb4dc4a7a38727bb6713b357a95a55af 100644 (file)
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2005-2008 The OpenLDAP Foundation.
+ * Copyright 2005-2009 The OpenLDAP Foundation.
  * Portions Copyright 2005-2006 SysNet s.n.c.
  * All rights reserved.
  *
@@ -185,7 +185,7 @@ dds_expire( void *ctx, dds_info_t *di )
 
 done_search:;
        op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
-       filter_free_x( op, op->ors_filter );
+       filter_free_x( op, op->ors_filter, 1 );
 
        rc = rs.sr_err;
        switch ( rs.sr_err ) {
@@ -243,10 +243,9 @@ done_search:;
                                        de->de_ndn.bv_val, rs.sr_err );
                                break;
                        }
-       
+
                        if ( de != NULL ) {
                                *dep = de->de_next;
-                               dep = &de->de_next;
                                op->o_tmpfree( de, op->o_tmpmemctx );
                        }
                }
@@ -1671,7 +1670,7 @@ dds_count( void *ctx, BackendDB *be )
 
 done_search:;
        op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
-       filter_free_x( op, op->ors_filter );
+       filter_free_x( op, op->ors_filter, 1 );
 
        rc = rs.sr_err;
        switch ( rs.sr_err ) {