need to move #define here; on by default

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 3d2bd8065fe6586802343584db1aa0e1680cc66e..b4e2a7d597e84212dd913b1da269fb0881a6c133 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -483,13 +483,6 @@ LDAP_SLAPD_F (int) get_vrFilter LDAP_P(( Connection *conn, BerElement *ber,
 LDAP_SLAPD_F (void) vrFilter_free LDAP_P(( ValuesReturnFilter *f ));
 LDAP_SLAPD_F (void) vrFilter2bv LDAP_P(( ValuesReturnFilter *f, struct berval *fstr ));
 
-/*
- * define to honor hasSubordinates operational attribute in search filters
- * (in previous use there was a flaw with back-bdb and back-ldbm; now it 
- * is fixed).
- */
-#undef SLAP_X_FILTER_HASSUBORDINATES
-
 #ifdef SLAP_X_FILTER_HASSUBORDINATES
 LDAP_SLAPD_F (int) filter_has_subordinates LDAP_P(( Filter *filter ));
 #endif /* SLAP_X_FILTER_HASSUBORDINATES */

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index e3cb7d55e609786679633826796f8f9e2224d4a5..bc923d12577591e9b9a56d2f113fbd85550fec40 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1206,6 +1206,14 @@ struct slap_backend_db {
 #define                be_group        bd_info->bi_acl_group
 #define                be_attribute    bd_info->bi_acl_attribute
 #define                be_operational  bd_info->bi_operational
+
+/*
+ * define to honor hasSubordinates operational attribute in search filters
+ * (in previous use there was a flaw with back-bdb and back-ldbm; now it 
+ * is fixed).
+ */
+#define SLAP_X_FILTER_HASSUBORDINATES
+
 #ifdef SLAP_X_FILTER_HASSUBORDINATES
 #define                be_has_subordinates bd_info->bi_has_subordinates
 #endif /* SLAP_X_FILTER_HASSUBORDINATES */