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/utils/net_rpc.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'source3/utils/net_rpc.c') diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index cbccc95b47..bf5e4c6b6d 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -1547,7 +1547,7 @@ static NTSTATUS rpc_sh_user_flag_edit_internals(TALLOC_CTX *mem_ctx, const char *username; const char *oldval = "unknown"; uint32 oldflags, newflags; - BOOL newval; + bool newval; if ((argc > 1) || ((argc == 1) && !strequal(argv[0], "yes") && @@ -1712,7 +1712,7 @@ static NTSTATUS rpc_group_delete_internals(const DOM_SID *domain_sid, const char **argv) { POLICY_HND connect_pol, domain_pol, group_pol, user_pol; - BOOL group_is_primary = False; + bool group_is_primary = False; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; uint32 *group_rids, num_rids, *name_types, num_members, @@ -2447,9 +2447,9 @@ static NTSTATUS rpc_group_list_internals(const DOM_SID *domain_sid, NTSTATUS result = NT_STATUS_UNSUCCESSFUL; uint32 start_idx=0, max_entries=250, num_entries, i, loop_count = 0; struct acct_info *groups; - BOOL global = False; - BOOL local = False; - BOOL builtin = False; + bool global = False; + bool local = False; + bool builtin = False; if (argc == 0) { global = True; @@ -3328,7 +3328,7 @@ static int rpc_share_list(int argc, const char **argv) return run_rpc_command(NULL, PI_SRVSVC, 0, rpc_share_list_internals, argc, argv); } -static BOOL check_share_availability(struct cli_state *cli, const char *netname) +static bool check_share_availability(struct cli_state *cli, const char *netname) { if (!cli_send_tconX(cli, netname, "A:", "", 0)) { d_printf("skipping [%s]: not a file share.\n", netname); @@ -3341,7 +3341,7 @@ static BOOL check_share_availability(struct cli_state *cli, const char *netname) return True; } -static BOOL check_share_sanity(struct cli_state *cli, fstring netname, uint32 type) +static bool check_share_sanity(struct cli_state *cli, fstring netname, uint32 type) { /* only support disk shares */ if (! ( type == STYPE_DISKTREE || type == (STYPE_DISKTREE | STYPE_HIDDEN)) ) { @@ -3588,7 +3588,7 @@ static void copy_fn(const char *mnt, file_info *f, const char *mask, void *state * * @return Boolean result **/ -BOOL sync_files(struct copy_clistate *cp_clistate, pstring mask) +bool sync_files(struct copy_clistate *cp_clistate, pstring mask) { struct cli_state *targetcli; pstring targetpath; @@ -3616,7 +3616,7 @@ BOOL sync_files(struct copy_clistate *cp_clistate, pstring mask) * Should set up ACL inheritance. **/ -BOOL copy_top_level_perms(struct copy_clistate *cp_clistate, +bool copy_top_level_perms(struct copy_clistate *cp_clistate, const char *sharename) { NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL; @@ -3677,8 +3677,8 @@ static NTSTATUS rpc_share_migrate_files_internals(const DOM_SID *domain_sid, uint32 i; uint32 level = 502; struct copy_clistate cp_clistate; - BOOL got_src_share = False; - BOOL got_dst_share = False; + bool got_src_share = False; + bool got_dst_share = False; pstring mask = "\\*"; char *dst = NULL; @@ -4184,7 +4184,7 @@ static void free_user_token(NT_USER_TOKEN *token) SAFE_FREE(token->user_sids); } -static BOOL is_sid_in_token(NT_USER_TOKEN *token, DOM_SID *sid) +static bool is_sid_in_token(NT_USER_TOKEN *token, DOM_SID *sid) { int i; @@ -4226,7 +4226,7 @@ static void dump_user_token(struct user_token *token) } } -static BOOL is_alias_member(DOM_SID *sid, struct full_alias *alias) +static bool is_alias_member(DOM_SID *sid, struct full_alias *alias) { int i; @@ -4265,7 +4265,7 @@ static void collect_alias_memberships(NT_USER_TOKEN *token) } } -static BOOL get_user_sids(const char *domain, const char *user, NT_USER_TOKEN *token) +static bool get_user_sids(const char *domain, const char *user, NT_USER_TOKEN *token) { struct winbindd_request request; struct winbindd_response response; @@ -4352,7 +4352,7 @@ static BOOL get_user_sids(const char *domain, const char *user, NT_USER_TOKEN *t * Get a list of all user tokens we want to look at **/ -static BOOL get_user_tokens(int *num_tokens, struct user_token **user_tokens) +static bool get_user_tokens(int *num_tokens, struct user_token **user_tokens) { struct winbindd_request request; struct winbindd_response response; @@ -4431,7 +4431,7 @@ static BOOL get_user_tokens(int *num_tokens, struct user_token **user_tokens) return True; } -static BOOL get_user_tokens_from_file(FILE *f, +static bool get_user_tokens_from_file(FILE *f, int *num_tokens, struct user_token **tokens) { @@ -4624,7 +4624,7 @@ static NTSTATUS rpc_share_allowedusers_internals(const DOM_SID *domain_sid, const char **argv) { int ret; - BOOL r; + bool r; ENUM_HND hnd; uint32 i; FILE *f; @@ -6310,12 +6310,12 @@ static int rpc_trustdom(int argc, const char **argv) * Check if a server will take rpc commands * @param flags Type of server to connect to (PDC, DMB, localhost) * if the host is not explicitly specified - * @return BOOL (true means rpc supported) + * @return bool (true means rpc supported) */ -BOOL net_rpc_check(unsigned flags) +bool net_rpc_check(unsigned flags) { struct cli_state *cli; - BOOL ret = False; + bool ret = False; struct in_addr server_ip; char *server_name = NULL; NTSTATUS status; -- cgit