diff options
Diffstat (limited to 'source4/lib')
46 files changed, 110 insertions, 130 deletions
diff --git a/source4/lib/ldb/common/attrib_handlers.c b/source4/lib/ldb/common/attrib_handlers.c index 223f2b5c16..2d3b6135c8 100644 --- a/source4/lib/ldb/common/attrib_handlers.c +++ b/source4/lib/ldb/common/attrib_handlers.c @@ -26,10 +26,9 @@ see rfc2252 */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" #include "system/locale.h" -#include "ldb/include/ldb_handlers.h" +#include "ldb_handlers.h" /* default handler that just copies a ldb_val. diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index 26213facf2..da085af747 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -33,8 +33,7 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" /* initialise a ldb context diff --git a/source4/lib/ldb/common/ldb_attributes.c b/source4/lib/ldb/common/ldb_attributes.c index 0cd92576dc..b8ae2f6131 100644 --- a/source4/lib/ldb/common/ldb_attributes.c +++ b/source4/lib/ldb/common/ldb_attributes.c @@ -29,8 +29,7 @@ message matching logic generic */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" /* add a attribute to the ldb_schema diff --git a/source4/lib/ldb/common/ldb_controls.c b/source4/lib/ldb/common/ldb_controls.c index 32bf4bd9d8..022691ae1e 100644 --- a/source4/lib/ldb/common/ldb_controls.c +++ b/source4/lib/ldb/common/ldb_controls.c @@ -32,8 +32,7 @@ * Author: Simo Sorce */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" /* check if a control with the specified "oid" exist and return it */ /* returns NULL if not found */ diff --git a/source4/lib/ldb/common/ldb_debug.c b/source4/lib/ldb/common/ldb_debug.c index 2548a5495a..78b056c649 100644 --- a/source4/lib/ldb/common/ldb_debug.c +++ b/source4/lib/ldb/common/ldb_debug.c @@ -32,8 +32,7 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" /* this allows the user to choose their own debug function diff --git a/source4/lib/ldb/common/ldb_dn.c b/source4/lib/ldb/common/ldb_dn.c index 93f466c72d..766f8a174c 100644 --- a/source4/lib/ldb/common/ldb_dn.c +++ b/source4/lib/ldb/common/ldb_dn.c @@ -34,9 +34,8 @@ * Author: Simo Sorce */ -#include "includes.h" #include <ctype.h> -#include "ldb/include/includes.h" +#include "ldb_includes.h" #define LDB_DN_NULL_FAILED(x) if (!(x)) goto failed diff --git a/source4/lib/ldb/common/ldb_ldif.c b/source4/lib/ldb/common/ldb_ldif.c index 572e677b44..6daeff7a90 100644 --- a/source4/lib/ldb/common/ldb_ldif.c +++ b/source4/lib/ldb/common/ldb_ldif.c @@ -36,8 +36,7 @@ see RFC2849 for the LDIF format definition */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" #include "system/locale.h" /* diff --git a/source4/lib/ldb/common/ldb_match.c b/source4/lib/ldb/common/ldb_match.c index df11107402..a9de08eeb6 100644 --- a/source4/lib/ldb/common/ldb_match.c +++ b/source4/lib/ldb/common/ldb_match.c @@ -33,8 +33,7 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" /* check if the scope matches in a search result diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index e10332a0e1..dc49d8d12b 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/lib/ldb/common/ldb_modules.c @@ -33,10 +33,10 @@ * Author: Simo Sorce */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" #if (_SAMBA_BUILD_ >= 4) +#include "includes.h" #include "build.h" #include "dynconfig.h" #endif diff --git a/source4/lib/ldb/common/ldb_msg.c b/source4/lib/ldb/common/ldb_msg.c index 077446f8ca..1d02fb0f3e 100644 --- a/source4/lib/ldb/common/ldb_msg.c +++ b/source4/lib/ldb/common/ldb_msg.c @@ -32,8 +32,7 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" /* create a new ldb_message in a given memory context (NULL for top level) diff --git a/source4/lib/ldb/common/ldb_parse.c b/source4/lib/ldb/common/ldb_parse.c index 26f88769e6..b0baaa2f7b 100644 --- a/source4/lib/ldb/common/ldb_parse.c +++ b/source4/lib/ldb/common/ldb_parse.c @@ -41,8 +41,7 @@ */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" #include "system/locale.h" /* diff --git a/source4/lib/ldb/common/ldb_utf8.c b/source4/lib/ldb/common/ldb_utf8.c index 99043ae2af..832f91a6ba 100644 --- a/source4/lib/ldb/common/ldb_utf8.c +++ b/source4/lib/ldb/common/ldb_utf8.c @@ -32,8 +32,7 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" #include "system/locale.h" diff --git a/source4/lib/ldb/common/qsort.c b/source4/lib/ldb/common/qsort.c index ef7be2c14e..5a83cdacc2 100644 --- a/source4/lib/ldb/common/qsort.c +++ b/source4/lib/ldb/common/qsort.c @@ -25,8 +25,7 @@ * Simo Sorce <idra@samba.org> 2005 */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" /* Byte-wise swap two items of size SIZE. */ #define SWAP(a, b, size) \ diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index bb9a257fa0..e73250d7a7 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -2,6 +2,7 @@ # Start MODULE ldb_asq [MODULE::ldb_asq] PRIVATE_DEPENDENCIES = LIBTALLOC +CFLAGS = -Ilib/ldb/include INIT_FUNCTION = ldb_asq_init SUBSYSTEM = ldb OBJ_FILES = \ @@ -13,6 +14,7 @@ OBJ_FILES = \ # Start MODULE ldb_server_sort [MODULE::ldb_server_sort] PRIVATE_DEPENDENCIES = LIBTALLOC +CFLAGS = -Ilib/ldb/include INIT_FUNCTION = ldb_sort_init SUBSYSTEM = ldb OBJ_FILES = \ @@ -24,6 +26,7 @@ OBJ_FILES = \ # Start MODULE ldb_paged_results [MODULE::ldb_paged_results] INIT_FUNCTION = ldb_paged_results_init +CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC SUBSYSTEM = ldb OBJ_FILES = \ @@ -35,6 +38,7 @@ OBJ_FILES = \ # Start MODULE ldb_paged_results [MODULE::ldb_paged_searches] INIT_FUNCTION = ldb_paged_searches_init +CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC SUBSYSTEM = ldb OBJ_FILES = \ @@ -46,6 +50,7 @@ OBJ_FILES = \ # Start MODULE ldb_operational [MODULE::ldb_operational] SUBSYSTEM = ldb +CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = ldb_operational_init OBJ_FILES = \ @@ -57,6 +62,7 @@ OBJ_FILES = \ # Start MODULE ldb_objectclass [MODULE::ldb_objectclass] INIT_FUNCTION = ldb_objectclass_init +CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC SUBSYSTEM = ldb OBJ_FILES = \ @@ -68,6 +74,7 @@ OBJ_FILES = \ # Start MODULE ldb_rdn_name [MODULE::ldb_rdn_name] SUBSYSTEM = ldb +CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = ldb_rdn_name_init OBJ_FILES = \ @@ -79,6 +86,7 @@ OBJ_FILES = \ # Start MODULE ldb_ildap [MODULE::ldb_ildap] SUBSYSTEM = ldb +CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP INIT_FUNCTION = ldb_ildap_init ALIASES = ldapi ldaps ldap @@ -91,6 +99,7 @@ OBJ_FILES = \ # Start MODULE ldb_map [MODULE::ldb_map] PRIVATE_DEPENDENCIES = LIBTALLOC +CFLAGS = -Ilib/ldb/include -Ilib/ldb/modules SUBSYSTEM = ldb OBJ_FILES = \ modules/ldb_map_inbound.o \ @@ -103,6 +112,7 @@ OBJ_FILES = \ # Start MODULE ldb_skel [MODULE::ldb_skel] SUBSYSTEM = ldb +CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC INIT_FUNCTION = ldb_skel_init OBJ_FILES = modules/skel.o @@ -113,6 +123,7 @@ OBJ_FILES = modules/skel.o # Start MODULE ldb_sqlite3 [MODULE::ldb_sqlite3] SUBSYSTEM = ldb +CFLAGS = -Ilib/ldb/include PRIVATE_DEPENDENCIES = LIBTALLOC SQLITE3 LIBTALLOC INIT_FUNCTION = ldb_sqlite3_init OBJ_FILES = \ @@ -124,6 +135,7 @@ OBJ_FILES = \ # Start MODULE ldb_tdb [MODULE::ldb_tdb] SUBSYSTEM = ldb +CFLAGS = -Ilib/ldb/include -Ilib/ldb/ldb_tdb INIT_FUNCTION = ldb_tdb_init OBJ_FILES = \ ldb_tdb/ldb_tdb.o \ @@ -139,13 +151,14 @@ PRIVATE_DEPENDENCIES = \ ./lib/ldb/common/ldb_modules.o: lib/ldb/common/ldb_modules.c Makefile @echo Compiling $< - @$(CC) -Iinclude $(CFLAGS) -Ilib/replace -Ilib/talloc -Ilib/ldb $(PICFLAG) -DLDBMODULESDIR=\"$(MODULESDIR)/ldb\" -DSHLIBEXT=\"$(SHLIBEXT)\" -c $< -o $@ + @$(CC) -Iinclude $(CFLAGS) -Ilib/replace -Ilib/talloc -Ilib/ldb/include $(PICFLAG) -DLDBMODULESDIR=\"$(MODULESDIR)/ldb\" -DSHLIBEXT=\"$(SHLIBEXT)\" -c $< -o $@ ################################################ # Start SUBSYSTEM ldb [LIBRARY::ldb] VERSION = 0.0.1 SO_VERSION = 0 +CFLAGS = -Ilib/ldb/include DESCRIPTION = LDAP-like embedded database library INIT_FUNCTION_TYPE = int (*) (void) OBJ_FILES = \ @@ -177,6 +190,7 @@ PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h # Start SUBSYSTEM LDBSAMBA [SUBSYSTEM::LDBSAMBA] PRIVATE_DEPENDENCIES = ldb +CFLAGS = -Ilib/ldb/include PRIVATE_PROTO_HEADER = samba/ldif_handlers.h PRIVATE_DEPENDENCIES = LIBSECURITY SAMDB OBJ_FILES = \ diff --git a/source4/lib/ldb/examples/ldbreader.c b/source4/lib/ldb/examples/ldbreader.c index 207c6c3d42..4fdc3ef92f 100644 --- a/source4/lib/ldb/examples/ldbreader.c +++ b/source4/lib/ldb/examples/ldbreader.c @@ -31,9 +31,9 @@ It lists / dumps the records in a LDB database to standard output. */ -#include "includes.h" -#include "ldb/include/ldb.h" -#include "ldb/include/ldb_errors.h" +#include "ldb_includes.h" +#include "ldb.h" +#include "ldb_errors.h" /* ldb_ldif_write takes a function pointer to a custom output diff --git a/source4/lib/ldb/examples/ldifreader.c b/source4/lib/ldb/examples/ldifreader.c index 3b8591e73f..c392f311e5 100644 --- a/source4/lib/ldb/examples/ldifreader.c +++ b/source4/lib/ldb/examples/ldifreader.c @@ -31,9 +31,9 @@ It lists / dumps the entries in an LDIF file to standard output. */ -#include "includes.h" -#include "ldb/include/ldb.h" -#include "ldb/include/ldb_errors.h" +#include "ldb_includes.h" +#include "ldb.h" +#include "ldb_errors.h" /* ldb_ldif_write takes a function pointer to a custom output diff --git a/source4/lib/ldb/include/includes.h b/source4/lib/ldb/include/ldb_includes.h index e2bcca2b04..e2bcca2b04 100644 --- a/source4/lib/ldb/include/includes.h +++ b/source4/lib/ldb/include/ldb_includes.h diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c index f5642f8303..cf380303bc 100644 --- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c +++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c @@ -43,7 +43,7 @@ #include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" #include "lib/events/events.h" #include "libcli/ldap/ldap.h" diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/source4/lib/ldb/ldb_ldap/ldb_ldap.c index 20ad6c46c1..44789b73f8 100644 --- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c +++ b/source4/lib/ldb/ldb_ldap/ldb_ldap.c @@ -39,8 +39,7 @@ * author: Simo Sorce */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" #define LDAP_DEPRECATED 1 #include <ldap.h> diff --git a/source4/lib/ldb/ldb_tdb/ldb_cache.c b/source4/lib/ldb/ldb_tdb/ldb_cache.c index 52e3d2f4e9..3600bae4ef 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_cache.c +++ b/source4/lib/ldb/ldb_tdb/ldb_cache.c @@ -32,10 +32,9 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" -#include "ldb/ldb_tdb/ldb_tdb.h" +#include "ldb_tdb.h" #define LTDB_FLAG_CASE_INSENSITIVE (1<<0) #define LTDB_FLAG_INTEGER (1<<1) diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c index e3682afac7..caa410775c 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_index.c +++ b/source4/lib/ldb/ldb_tdb/ldb_index.c @@ -32,10 +32,9 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" -#include "ldb/ldb_tdb/ldb_tdb.h" +#include "ldb_tdb.h" /* find an element in a list, using the given comparison function and diff --git a/source4/lib/ldb/ldb_tdb/ldb_pack.c b/source4/lib/ldb/ldb_tdb/ldb_pack.c index 6a00fb13c7..563f687b60 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_pack.c +++ b/source4/lib/ldb/ldb_tdb/ldb_pack.c @@ -32,10 +32,8 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" - -#include "ldb/ldb_tdb/ldb_tdb.h" +#include "ldb_includes.h" +#include "ldb_tdb.h" /* change this if the data format ever changes */ #define LTDB_PACKING_FORMAT 0x26011967 diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/source4/lib/ldb/ldb_tdb/ldb_search.c index 838f599642..419fa9d69b 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_search.c +++ b/source4/lib/ldb/ldb_tdb/ldb_search.c @@ -32,10 +32,9 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" -#include "ldb/ldb_tdb/ldb_tdb.h" +#include "ldb_tdb.h" /* add one element to a message diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c index 8a6d26ff98..dee61308d3 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c @@ -42,10 +42,9 @@ * Author: Simo Sorce */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" -#include "ldb/ldb_tdb/ldb_tdb.h" +#include "ldb_tdb.h" /* diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c b/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c index c9eac013fc..8c232175f4 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c @@ -22,10 +22,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" -#include "ldb/ldb_tdb/ldb_tdb.h" +#include "ldb_tdb.h" /* the purpose of this code is to work around the braindead posix locking diff --git a/source4/lib/ldb/modules/asq.c b/source4/lib/ldb/modules/asq.c index 0c31727909..f8438d98b8 100644 --- a/source4/lib/ldb/modules/asq.c +++ b/source4/lib/ldb/modules/asq.c @@ -33,8 +33,7 @@ * Author: Simo Sorce */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" struct asq_context { diff --git a/source4/lib/ldb/modules/ldb_map.c b/source4/lib/ldb/modules/ldb_map.c index 6387ffc5b7..0fccbba702 100644 --- a/source4/lib/ldb/modules/ldb_map.c +++ b/source4/lib/ldb/modules/ldb_map.c @@ -34,11 +34,14 @@ * Author: Jelmer Vernooij, Martin Kuehl */ -#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" + +#ifndef _PUBLIC_ +#define _PUBLIC_ +#endif /* Description of the provided ldb requests: - special attribute 'isMapped' @@ -170,15 +173,15 @@ struct ldb_handle *map_init_handle(struct ldb_request *req, struct ldb_module *m * ========================================= */ /* Check whether any data should be stored in the local partition. */ -BOOL map_check_local_db(struct ldb_module *module) +bool map_check_local_db(struct ldb_module *module) { const struct ldb_map_context *data = map_get_context(module); if (!data->remote_base_dn || !data->local_base_dn) { - return False; + return false; } - return True; + return true; } /* Copy a DN with the base DN of the local partition. */ @@ -386,18 +389,18 @@ const struct ldb_map_attribute *map_attr_find_remote(const struct ldb_map_contex * ================== */ /* Check whether an attribute will be mapped into the remote partition. */ -BOOL map_attr_check_remote(const struct ldb_map_context *data, const char *attr) +bool map_attr_check_remote(const struct ldb_map_context *data, const char *attr) { const struct ldb_map_attribute *map = map_attr_find_local(data, attr); if (map == NULL) { - return False; + return false; } if (map->type == MAP_IGNORE) { - return False; + return false; } - return True; + return true; } /* Map an attribute name into the remote partition. */ @@ -489,12 +492,12 @@ struct ldb_val ldb_val_map_remote(struct ldb_module *module, void *mem_ctx, * =========== */ /* Check whether a DN is below the local baseDN. */ -BOOL ldb_dn_check_local(struct ldb_module *module, struct ldb_dn *dn) +bool ldb_dn_check_local(struct ldb_module *module, struct ldb_dn *dn) { const struct ldb_map_context *data = map_get_context(module); if (!data->local_base_dn) { - return True; + return true; } return ldb_dn_compare_base(data->local_base_dn, dn) == 0; @@ -736,7 +739,7 @@ static void map_objectclass_generate_remote(struct ldb_module *module, const cha { struct ldb_message_element *el, *oc; struct ldb_val val; - BOOL found_extensibleObject = False; + bool found_extensibleObject = false; int i; /* Find old local objectClass */ @@ -768,7 +771,7 @@ static void map_objectclass_generate_remote(struct ldb_module *module, const cha for (i = 0; i < el->num_values - 1; i++) { el->values[i] = map_objectclass_convert_local(module, el->values, &oc->values[i]); if (ldb_attr_cmp((char *)el->values[i].data, "extensibleObject") == 0) { - found_extensibleObject = True; + found_extensibleObject = true; } } diff --git a/source4/lib/ldb/modules/ldb_map_inbound.c b/source4/lib/ldb/modules/ldb_map_inbound.c index 7e5583c9e2..9cc1b4e89f 100644 --- a/source4/lib/ldb/modules/ldb_map_inbound.c +++ b/source4/lib/ldb/modules/ldb_map_inbound.c @@ -23,11 +23,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 message elements @@ -137,10 +136,10 @@ local: * ================ */ /* Check whether a message will be (partially) mapped into the remote partition. */ -static BOOL ldb_msg_check_remote(struct ldb_module *module, const struct ldb_message *msg) +static bool ldb_msg_check_remote(struct ldb_module *module, const struct ldb_message *msg) { const struct ldb_map_context *data = map_get_context(module); - BOOL ret; + bool ret; int i; for (i = 0; i < msg->num_elements; i++) { @@ -150,7 +149,7 @@ static BOOL ldb_msg_check_remote(struct ldb_module *module, const struct ldb_mes } } - return False; + return false; } /* Split message elements that stay in the local partition from those 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. */ diff --git a/source4/lib/ldb/modules/ldb_map_private.h b/source4/lib/ldb/modules/ldb_map_private.h index 1f4fecee8b..2c35097069 100644 --- a/source4/lib/ldb/modules/ldb_map_private.h +++ b/source4/lib/ldb/modules/ldb_map_private.h @@ -68,9 +68,9 @@ struct ldb_handle *map_init_handle(struct ldb_request *req, struct ldb_module *m int ldb_next_remote_request(struct ldb_module *module, struct ldb_request *request); -BOOL map_check_local_db(struct ldb_module *module); -BOOL map_attr_check_remote(const struct ldb_map_context *data, const char *attr); -BOOL ldb_dn_check_local(struct ldb_module *module, struct ldb_dn *dn); +bool map_check_local_db(struct ldb_module *module); +bool map_attr_check_remote(const struct ldb_map_context *data, const char *attr); +bool ldb_dn_check_local(struct ldb_module *module, struct ldb_dn *dn); const struct ldb_map_attribute *map_attr_find_local(const struct ldb_map_context *data, const char *name); const struct ldb_map_attribute *map_attr_find_remote(const struct ldb_map_context *data, const char *name); diff --git a/source4/lib/ldb/modules/objectclass.c b/source4/lib/ldb/modules/objectclass.c index 191238f9c9..1690af644c 100644 --- a/source4/lib/ldb/modules/objectclass.c +++ b/source4/lib/ldb/modules/objectclass.c @@ -33,8 +33,7 @@ * Author: Andrew Bartlett */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" struct oc_context { diff --git a/source4/lib/ldb/modules/operational.c b/source4/lib/ldb/modules/operational.c index 4fa572501f..96590a49a9 100644 --- a/source4/lib/ldb/modules/operational.c +++ b/source4/lib/ldb/modules/operational.c @@ -74,8 +74,7 @@ modifiersName: not supported by w2k3? */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" /* construct a canonical name from a message diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c index 8ad1f01c8c..2f54d9bf8c 100644 --- a/source4/lib/ldb/modules/paged_results.c +++ b/source4/lib/ldb/modules/paged_results.c @@ -33,8 +33,7 @@ * Author: Simo Sorce */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" struct message_store { /* keep the whole ldb_reply as an optimization diff --git a/source4/lib/ldb/modules/paged_searches.c b/source4/lib/ldb/modules/paged_searches.c index 02d85e4c23..f4a06e841f 100644 --- a/source4/lib/ldb/modules/paged_searches.c +++ b/source4/lib/ldb/modules/paged_searches.c @@ -34,7 +34,7 @@ */ #include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" #define PS_DEFAULT_PAGE_SIZE 500 /* 500 objects per query seem to be a decent compromise diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c index cb5add2875..322f05c00e 100644 --- a/source4/lib/ldb/modules/rdn_name.c +++ b/source4/lib/ldb/modules/rdn_name.c @@ -37,8 +37,7 @@ * Simo Sorce Mar 2006 */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" static struct ldb_message_element *rdn_name_find_attribute(const struct ldb_message *msg, const char *name) { diff --git a/source4/lib/ldb/modules/skel.c b/source4/lib/ldb/modules/skel.c index 8622a22638..3496142419 100644 --- a/source4/lib/ldb/modules/skel.c +++ b/source4/lib/ldb/modules/skel.c @@ -32,8 +32,7 @@ * Author: Simo Sorce */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" struct private_data { diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c index f8ee788d6c..dcd979fd20 100644 --- a/source4/lib/ldb/modules/sort.c +++ b/source4/lib/ldb/modules/sort.c @@ -32,8 +32,7 @@ * Author: Simo Sorce */ -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" struct opaque { struct ldb_context *ldb; diff --git a/source4/lib/ldb/samba/ldif_handlers.c b/source4/lib/ldb/samba/ldif_handlers.c index 961312afb6..5535c3caa2 100644 --- a/source4/lib/ldb/samba/ldif_handlers.c +++ b/source4/lib/ldb/samba/ldif_handlers.c @@ -23,8 +23,8 @@ */ #include "includes.h" -#include "ldb/include/includes.h" -#include "ldb/include/ldb_handlers.h" +#include "ldb_includes.h" +#include "ldb_handlers.h" #include "librpc/gen_ndr/ndr_security.h" #include "librpc/gen_ndr/ndr_misc.h" diff --git a/source4/lib/ldb/tools/convert.c b/source4/lib/ldb/tools/convert.c index ed1330debc..5ebb71bf01 100644 --- a/source4/lib/ldb/tools/convert.c +++ b/source4/lib/ldb/tools/convert.c @@ -23,8 +23,7 @@ */ #include "convert.h" -#include "includes.h" -#include "ldb/include/includes.h" +#include "ldb_includes.h" /* Shared map for converting syntax between formats */ static const struct syntax_map syntax_map[] = { diff --git a/source4/lib/ldb/tools/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c index c6c691d875..187a0de7af 100644 --- a/source4/lib/ldb/tools/ldbdel.c +++ b/source4/lib/ldb/tools/ldbdel.c @@ -32,9 +32,8 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" -#include "ldb/tools/cmdline.h" +#include "ldb_includes.h" +#include "tools/cmdline.h" static int ldb_delete_recursive(struct ldb_context *ldb, struct ldb_dn *dn) { diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c index 2edbe34b6f..80ffbb5915 100644 --- a/source4/lib/ldb/tools/ldbedit.c +++ b/source4/lib/ldb/tools/ldbedit.c @@ -32,9 +32,8 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" -#include "ldb/tools/cmdline.h" +#include "ldb_includes.h" +#include "tools/cmdline.h" static struct ldb_cmdline *options; diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c index cc7219a156..66ed3c8b5f 100644 --- a/source4/lib/ldb/tools/ldbmodify.c +++ b/source4/lib/ldb/tools/ldbmodify.c @@ -32,9 +32,8 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" -#include "ldb/tools/cmdline.h" +#include "ldb_includes.h" +#include "tools/cmdline.h" static int failures; diff --git a/source4/lib/ldb/tools/ldbrename.c b/source4/lib/ldb/tools/ldbrename.c index d7e1347fea..d2d285449d 100644 --- a/source4/lib/ldb/tools/ldbrename.c +++ b/source4/lib/ldb/tools/ldbrename.c @@ -34,9 +34,8 @@ * Author: Stefan Metzmacher */ -#include "includes.h" -#include "ldb/include/includes.h" -#include "ldb/tools/cmdline.h" +#include "ldb_includes.h" +#include "tools/cmdline.h" static void usage(void) { diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c index e5b9091b5c..d492f98d44 100644 --- a/source4/lib/ldb/tools/ldbsearch.c +++ b/source4/lib/ldb/tools/ldbsearch.c @@ -32,9 +32,8 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" -#include "ldb/tools/cmdline.h" +#include "ldb_includes.h" +#include "tools/cmdline.h" static void usage(void) { diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c index fbabd56878..d7714acb90 100644 --- a/source4/lib/ldb/tools/ldbtest.c +++ b/source4/lib/ldb/tools/ldbtest.c @@ -32,9 +32,8 @@ * Author: Andrew Tridgell */ -#include "includes.h" -#include "ldb/include/includes.h" -#include "ldb/tools/cmdline.h" +#include "ldb_includes.h" +#include "tools/cmdline.h" static struct timeval tp1,tp2; static struct ldb_cmdline *options; diff --git a/source4/lib/ldb/tools/oLschema2ldif.c b/source4/lib/ldb/tools/oLschema2ldif.c index 7863f5dcb7..e14f3624ee 100644 --- a/source4/lib/ldb/tools/oLschema2ldif.c +++ b/source4/lib/ldb/tools/oLschema2ldif.c @@ -32,10 +32,9 @@ * Author: Simo Sorce */ -#include "includes.h" -#include "ldb/include/includes.h" -#include "ldb/tools/cmdline.h" -#include "ldb/tools/convert.h" +#include "ldb_includes.h" +#include "tools/cmdline.h" +#include "tools/convert.h" #define SCHEMA_UNKNOWN 0 #define SCHEMA_NAME 1 |