From 30191d1a5704ad2b158386b511558972d539ce47 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 18 Oct 2007 17:40:25 -0700 Subject: RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f) --- source3/libgpo/gpo_filesync.c | 2 +- source3/libgpo/gpo_ldap.c | 8 ++++---- source3/libgpo/gpo_sec.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'source3/libgpo') diff --git a/source3/libgpo/gpo_filesync.c b/source3/libgpo/gpo_filesync.c index 81fdab3ee9..c4b65210c1 100644 --- a/source3/libgpo/gpo_filesync.c +++ b/source3/libgpo/gpo_filesync.c @@ -106,7 +106,7 @@ static NTSTATUS gpo_copy_dir(const char *unix_path) sync files ****************************************************************/ -static BOOL gpo_sync_files(struct sync_context *ctx) +static bool gpo_sync_files(struct sync_context *ctx) { DEBUG(3,("calling cli_list with mask: %s\n", ctx->mask)); diff --git a/source3/libgpo/gpo_ldap.c b/source3/libgpo/gpo_ldap.c index 69587d94a8..7c59e8e5dc 100644 --- a/source3/libgpo/gpo_ldap.c +++ b/source3/libgpo/gpo_ldap.c @@ -23,11 +23,11 @@ parse the raw extension string into a GP_EXT structure ****************************************************************/ -BOOL ads_parse_gp_ext(TALLOC_CTX *mem_ctx, +bool ads_parse_gp_ext(TALLOC_CTX *mem_ctx, const char *extension_raw, struct GP_EXT **gp_ext) { - BOOL ret = False; + bool ret = False; struct GP_EXT *ext = NULL; char **ext_list = NULL; char **ext_strings = NULL; @@ -553,7 +553,7 @@ static ADS_STATUS add_gplink_to_gpo_list(ADS_STRUCT *ads, const char *link_dn, struct GP_LINK *gp_link, enum GPO_LINK_TYPE link_type, - BOOL only_add_forced_gpos, + bool only_add_forced_gpos, const struct nt_user_token *token) { ADS_STATUS status; @@ -714,7 +714,7 @@ ADS_STATUS ads_get_gpo_list(ADS_STRUCT *ads, ADS_STATUS status; struct GP_LINK gp_link; const char *parent_dn, *site_dn, *tmp_dn; - BOOL add_only_forced_gpos = False; + bool add_only_forced_gpos = False; ZERO_STRUCTP(gpo_list); diff --git a/source3/libgpo/gpo_sec.c b/source3/libgpo/gpo_sec.c index 54811c1123..72ef098fec 100644 --- a/source3/libgpo/gpo_sec.c +++ b/source3/libgpo/gpo_sec.c @@ -22,7 +22,7 @@ /**************************************************************** ****************************************************************/ -static BOOL gpo_sd_check_agp_object_guid(const struct security_ace_object *object) +static bool gpo_sd_check_agp_object_guid(const struct security_ace_object *object) { struct GUID ext_right_apg_guid; NTSTATUS status; @@ -58,7 +58,7 @@ static BOOL gpo_sd_check_agp_object_guid(const struct security_ace_object *objec /**************************************************************** ****************************************************************/ -static BOOL gpo_sd_check_agp_object(const SEC_ACE *ace) +static bool gpo_sd_check_agp_object(const SEC_ACE *ace) { if (!sec_ace_object(ace->type)) { return False; @@ -70,7 +70,7 @@ static BOOL gpo_sd_check_agp_object(const SEC_ACE *ace) /**************************************************************** ****************************************************************/ -static BOOL gpo_sd_check_agp_access_bits(uint32_t access_mask) +static bool gpo_sd_check_agp_access_bits(uint32_t access_mask) { return (access_mask & SEC_RIGHTS_EXTENDED); } @@ -79,7 +79,7 @@ static BOOL gpo_sd_check_agp_access_bits(uint32_t access_mask) /**************************************************************** ****************************************************************/ -static BOOL gpo_sd_check_read_access_bits(uint32_t access_mask) +static bool gpo_sd_check_read_access_bits(uint32_t access_mask) { uint32_t read_bits = SEC_RIGHTS_LIST_CONTENTS | SEC_RIGHTS_READ_ALL_PROP | -- cgit