diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-05-05 18:50:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:00 -0500 |
| commit | 52fb06edc25e8538c413df1aaabba18c859a00cf (patch) | |
| tree | 20c409c9930232a023ad73672da38f50e29f61c1 /source4/lib/ldb/modules/ldb_map_outbound.c | |
| parent | be7eb080fe0a2c44187e693681d3478a3dc0c0ee (diff) | |
| download | samba-52fb06edc25e8538c413df1aaabba18c859a00cf.tar.gz samba-52fb06edc25e8538c413df1aaabba18c859a00cf.tar.bz2 samba-52fb06edc25e8538c413df1aaabba18c859a00cf.zip | |
r22681: Fix standalone ldb build when parent directory name != ldb.
(This used to be commit 1093875d59f1ea9b8bd82277d4f9d8366e584952)
Diffstat (limited to 'source4/lib/ldb/modules/ldb_map_outbound.c')
| -rw-r--r-- | source4/lib/ldb/modules/ldb_map_outbound.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source4/lib/ldb/modules/ldb_map_outbound.c b/source4/lib/ldb/modules/ldb_map_outbound.c index 615cdc40ca..1ef1b36b20 100644 --- a/source4/lib/ldb/modules/ldb_map_outbound.c +++ b/source4/lib/ldb/modules/ldb_map_outbound.c @@ -24,11 +24,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" -#include "ldb/modules/ldb_map.h" -#include "ldb/modules/ldb_map_private.h" +#include "ldb_map.h" +#include "ldb_map_private.h" /* Mapping attributes @@ -488,10 +487,10 @@ static int map_reply_remote(struct map_context *ac, struct ldb_reply *ares) * =================== */ /* Check whether a parse tree can safely be split in two. */ -static BOOL ldb_parse_tree_check_splittable(const struct ldb_parse_tree *tree) +static bool ldb_parse_tree_check_splittable(const struct ldb_parse_tree *tree) { const struct ldb_parse_tree *subtree = tree; - BOOL negate = False; + bool negate = false; while (subtree) { switch (subtree->operation) { @@ -507,11 +506,11 @@ static BOOL ldb_parse_tree_check_splittable(const struct ldb_parse_tree *tree) return negate; /* if negate: True */ default: - return True; /* simple parse tree */ + return true; /* simple parse tree */ } } - return True; /* no parse tree */ + return true; /* no parse tree */ } /* Collect a list of attributes required to match a given parse tree. */ |