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/rpcclient/cmd_samr.c | 10 ++++----- source3/rpcclient/cmd_shutdown.c | 4 ++-- source3/rpcclient/cmd_spoolss.c | 48 ++++++++++++++++++++-------------------- source3/rpcclient/cmd_wkssvc.c | 2 +- source3/rpcclient/rpcclient.c | 2 +- 5 files changed, 33 insertions(+), 33 deletions(-) (limited to 'source3/rpcclient') diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index 3cef720ac5..931baf3534 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/source3/rpcclient/cmd_samr.c @@ -839,7 +839,7 @@ static NTSTATUS cmd_samr_enum_dom_users(struct rpc_pipe_client *cli, uint32 *dom_rids; uint32 access_mask = MAXIMUM_ALLOWED_ACCESS; uint32 acb_mask = ACB_NORMAL; - BOOL got_connect_pol = False, got_domain_pol = False; + bool got_connect_pol = False, got_domain_pol = False; if ((argc < 1) || (argc > 3)) { printf("Usage: %s [access_mask] [acb_mask]\n", argv[0]); @@ -914,7 +914,7 @@ static NTSTATUS cmd_samr_enum_dom_groups(struct rpc_pipe_client *cli, uint32 start_idx, size, num_dom_groups, i; uint32 access_mask = MAXIMUM_ALLOWED_ACCESS; struct acct_info *dom_groups; - BOOL got_connect_pol = False, got_domain_pol = False; + bool got_connect_pol = False, got_domain_pol = False; if ((argc < 1) || (argc > 2)) { printf("Usage: %s [access_mask]\n", argv[0]); @@ -987,7 +987,7 @@ static NTSTATUS cmd_samr_enum_als_groups(struct rpc_pipe_client *cli, uint32 start_idx, size, num_als_groups, i; uint32 access_mask = MAXIMUM_ALLOWED_ACCESS; struct acct_info *als_groups; - BOOL got_connect_pol = False, got_domain_pol = False; + bool got_connect_pol = False, got_domain_pol = False; if ((argc < 2) || (argc > 3)) { printf("Usage: %s builtin|domain [access mask]\n", argv[0]); @@ -1223,7 +1223,7 @@ static NTSTATUS cmd_samr_query_dispinfo(struct rpc_pipe_client *cli, SAM_DISPINFO_4 info4; SAM_DISPINFO_5 info5; int loop_count = 0; - BOOL got_params = False; /* Use get_query_dispinfo_params() or not? */ + bool got_params = False; /* Use get_query_dispinfo_params() or not? */ if (argc > 6) { printf("Usage: %s [info level] [start index] [max entries] [max size] [access mask]\n", argv[0]); @@ -1927,7 +1927,7 @@ static NTSTATUS cmd_samr_query_sec_obj(struct rpc_pipe_client *cli, uint32 user_rid = 0; TALLOC_CTX *ctx = NULL; SEC_DESC_BUF *sec_desc_buf=NULL; - BOOL domain = False; + bool domain = False; ctx=talloc_init("cmd_samr_query_sec_obj"); diff --git a/source3/rpcclient/cmd_shutdown.c b/source3/rpcclient/cmd_shutdown.c index 3da9b1d6d5..391627eda1 100644 --- a/source3/rpcclient/cmd_shutdown.c +++ b/source3/rpcclient/cmd_shutdown.c @@ -35,8 +35,8 @@ static NTSTATUS cmd_shutdown_init(struct cli_state *cli, TALLOC_CTX *mem_ctx, NTSTATUS result = NT_STATUS_UNSUCCESSFUL; fstring msg; uint32 timeout = 20; - BOOL force = False; - BOOL reboot = False; + bool force = False; + bool reboot = False; int opt; *msg = 0; diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index 1b0537f027..e573e92648 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -470,7 +470,7 @@ static WERROR cmd_spoolss_setprinter(struct rpc_pipe_client *cli, POLICY_HND pol; WERROR result; uint32 info_level = 2; - BOOL opened_hnd = False; + bool opened_hnd = False; PRINTER_INFO_CTR ctr; fstring printername, servername, @@ -536,7 +536,7 @@ static WERROR cmd_spoolss_setprintername(struct rpc_pipe_client *cli, POLICY_HND pol; WERROR result; uint32 info_level = 2; - BOOL opened_hnd = False; + bool opened_hnd = False; PRINTER_INFO_CTR ctr; fstring printername, servername, @@ -601,7 +601,7 @@ static WERROR cmd_spoolss_getprinter(struct rpc_pipe_client *cli, POLICY_HND pol; WERROR result; uint32 info_level = 1; - BOOL opened_hnd = False; + bool opened_hnd = False; PRINTER_INFO_CTR ctr; fstring printername, servername, @@ -737,7 +737,7 @@ static WERROR cmd_spoolss_getprinterdata(struct rpc_pipe_client *cli, { POLICY_HND pol; WERROR result; - BOOL opened_hnd = False; + bool opened_hnd = False; fstring printername, servername, user; @@ -802,7 +802,7 @@ static WERROR cmd_spoolss_getprinterdataex(struct rpc_pipe_client *cli, { POLICY_HND pol; WERROR result; - BOOL opened_hnd = False; + bool opened_hnd = False; fstring printername, servername, user; @@ -924,7 +924,7 @@ static void display_print_driver_3(DRIVER_INFO_3 *i1) fstring defaultdatatype = ""; int length=0; - BOOL valid = True; + bool valid = True; if (i1 == NULL) return; @@ -981,13 +981,13 @@ static WERROR cmd_spoolss_getdriver(struct rpc_pipe_client *cli, POLICY_HND pol; WERROR werror; uint32 info_level = 3; - BOOL opened_hnd = False; + bool opened_hnd = False; PRINTER_DRIVER_CTR ctr; fstring printername, servername, user; uint32 i; - BOOL success = False; + bool success = False; if ((argc == 1) || (argc > 3)) { @@ -1243,7 +1243,7 @@ static char* get_driver_3_param (char* str, const char* delim, UNISTR* dest) :::\ : *******************************************************************************/ -static BOOL init_drv_info_3_members ( TALLOC_CTX *mem_ctx, DRIVER_INFO_3 *info, +static bool init_drv_info_3_members ( TALLOC_CTX *mem_ctx, DRIVER_INFO_3 *info, char *args ) { char *str, *str2; @@ -1425,7 +1425,7 @@ static WERROR cmd_spoolss_setdriver(struct rpc_pipe_client *cli, POLICY_HND pol; WERROR result; uint32 level = 2; - BOOL opened_hnd = False; + bool opened_hnd = False; PRINTER_INFO_CTR ctr; PRINTER_INFO_2 info2; fstring servername, @@ -1638,7 +1638,7 @@ static WERROR cmd_spoolss_addform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c WERROR werror; char *servername = NULL, *printername = NULL; FORM form; - BOOL got_handle = False; + bool got_handle = False; /* Parse the command arguements */ @@ -1698,7 +1698,7 @@ static WERROR cmd_spoolss_setform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c WERROR werror; char *servername = NULL, *printername = NULL; FORM form; - BOOL got_handle = False; + bool got_handle = False; /* Parse the command arguements */ @@ -1795,7 +1795,7 @@ static WERROR cmd_spoolss_getform(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c WERROR werror; char *servername = NULL, *printername = NULL; FORM_1 form; - BOOL got_handle = False; + bool got_handle = False; /* Parse the command arguements */ @@ -1848,7 +1848,7 @@ static WERROR cmd_spoolss_deleteform(struct rpc_pipe_client *cli, POLICY_HND handle; WERROR werror; char *servername = NULL, *printername = NULL; - BOOL got_handle = False; + bool got_handle = False; /* Parse the command arguements */ @@ -1896,7 +1896,7 @@ static WERROR cmd_spoolss_enum_forms(struct rpc_pipe_client *cli, POLICY_HND handle; WERROR werror; char *servername = NULL, *printername = NULL; - BOOL got_handle = False; + bool got_handle = False; uint32 num_forms, level = 1, i; FORM_1 *forms; @@ -1957,7 +1957,7 @@ static WERROR cmd_spoolss_setprinterdata(struct rpc_pipe_client *cli, WERROR result; fstring servername, printername, user; POLICY_HND pol; - BOOL opened_hnd = False; + bool opened_hnd = False; PRINTER_INFO_CTR ctr; PRINTER_INFO_0 info; REGISTRY_VALUE value; @@ -2162,7 +2162,7 @@ static WERROR cmd_spoolss_enum_jobs(struct rpc_pipe_client *cli, { WERROR result; uint32 level = 1, num_jobs, i; - BOOL got_hnd = False; + bool got_hnd = False; pstring printername; fstring servername, user; POLICY_HND hnd; @@ -2232,7 +2232,7 @@ static WERROR cmd_spoolss_enum_data( struct rpc_pipe_client *cli, { WERROR result; uint32 i=0, val_needed, data_needed; - BOOL got_hnd = False; + bool got_hnd = False; pstring printername; fstring servername, user; POLICY_HND hnd; @@ -2292,7 +2292,7 @@ static WERROR cmd_spoolss_enum_data_ex( struct rpc_pipe_client *cli, { WERROR result; uint32 i; - BOOL got_hnd = False; + bool got_hnd = False; pstring printername; fstring servername, user; const char *keyname = NULL; @@ -2355,7 +2355,7 @@ static WERROR cmd_spoolss_enum_printerkey( struct rpc_pipe_client *cli, const char **argv) { WERROR result; - BOOL got_hnd = False; + bool got_hnd = False; pstring printername; fstring servername, user; const char *keyname = NULL; @@ -2425,7 +2425,7 @@ static WERROR cmd_spoolss_rffpcnex(struct rpc_pipe_client *cli, { fstring servername, printername; POLICY_HND hnd; - BOOL got_hnd = False; + bool got_hnd = False; WERROR result; SPOOL_NOTIFY_OPTION option; @@ -2504,7 +2504,7 @@ done: /**************************************************************************** ****************************************************************************/ -static BOOL compare_printer( struct rpc_pipe_client *cli1, POLICY_HND *hnd1, +static bool compare_printer( struct rpc_pipe_client *cli1, POLICY_HND *hnd1, struct rpc_pipe_client *cli2, POLICY_HND *hnd2 ) { PRINTER_INFO_CTR ctr1, ctr2; @@ -2537,14 +2537,14 @@ static BOOL compare_printer( struct rpc_pipe_client *cli1, POLICY_HND *hnd1, /**************************************************************************** ****************************************************************************/ -static BOOL compare_printer_secdesc( struct rpc_pipe_client *cli1, POLICY_HND *hnd1, +static bool compare_printer_secdesc( struct rpc_pipe_client *cli1, POLICY_HND *hnd1, struct rpc_pipe_client *cli2, POLICY_HND *hnd2 ) { PRINTER_INFO_CTR ctr1, ctr2; WERROR werror; TALLOC_CTX *mem_ctx = talloc_init("compare_printer_secdesc"); SEC_DESC *sd1, *sd2; - BOOL result = True; + bool result = True; printf("Retreiving printer security for %s...", cli1->cli->desthost); diff --git a/source3/rpcclient/cmd_wkssvc.c b/source3/rpcclient/cmd_wkssvc.c index 13f1f3f39e..de5b29880a 100644 --- a/source3/rpcclient/cmd_wkssvc.c +++ b/source3/rpcclient/cmd_wkssvc.c @@ -39,7 +39,7 @@ void cmd_wks_query_info(struct client_info *info) WKS_INFO_100 ctr; uint32 info_level = 100; - BOOL res = True; + bool res = True; memset((char *)&ctr, '\0', sizeof(ctr)); diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 7a7b463b71..27b2515169 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -135,7 +135,7 @@ static void fetch_machine_sid(struct cli_state *cli) NTSTATUS result = NT_STATUS_OK; uint32 info_class = 5; char *domain_name = NULL; - static BOOL got_domain_sid; + static bool got_domain_sid; TALLOC_CTX *mem_ctx; DOM_SID *dom_sid = NULL; struct rpc_pipe_client *lsapipe = NULL; -- cgit