minor naming cleanup; improvements to DN mapping layer; major docs update

[openldap] / servers / slapd / slapcat.c

diff --git a/servers/slapd/slapcat.c b/servers/slapd/slapcat.c
index 665ee153886f1fde9d86837f16ed9bcf02367da4..92bed82c810adbf32b2e28acd90d1f98174d4d35 100644 (file)
--- a/servers/slapd/slapcat.c
+++ b/servers/slapd/slapcat.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -79,6 +79,14 @@ slapcat( int argc, char **argv )
                        continue;
                }
 
+               if( filter != NULL ) {
+                       int rc = test_filter( NULL, e, filter );
+                       if( rc != LDAP_COMPARE_TRUE ) {
+                               be_entry_release_r( &op, e );
+                               continue;
+                       }
+               }
+
                if ( retrieve_ctxcsn == 0 ) {
                        if ( is_entry_syncProviderSubentry( e ) ) {
                                be_entry_release_r( &op, e );