From f07cabad0f58c7be0db53a315294073b6bc2b86a Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 26 Oct 2002 16:32:11 +0000 Subject: [PATCH] need to move #define here; on by default --- servers/slapd/proto-slap.h | 7 ------- servers/slapd/slap.h | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 3d2bd8065f..b4e2a7d597 100644 --- 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 e3cb7d55e6..bc923d1257 100644 --- 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 */