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.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source3/utils/net.c') diff --git a/source3/utils/net.c b/source3/utils/net.c index f9af7a41ca..6cdc7f8671 100644 --- a/source3/utils/net.c +++ b/source3/utils/net.c @@ -59,7 +59,7 @@ const char *opt_requester_name = NULL; const char *opt_host = NULL; const char *opt_password = NULL; const char *opt_user_name = NULL; -BOOL opt_user_specified = False; +bool opt_user_specified = False; const char *opt_workgroup = NULL; int opt_long_list_entries = 0; int opt_reboot = 0; @@ -74,9 +74,9 @@ int opt_flags = -1; int opt_timeout = 0; const char *opt_target_workgroup = NULL; int opt_machine_pass = 0; -BOOL opt_localgroup = False; -BOOL opt_domaingroup = False; -static BOOL do_talloc_report=False; +bool opt_localgroup = False; +bool opt_domaingroup = False; +static bool do_talloc_report=False; const char *opt_newntname = ""; int opt_rid = 0; int opt_acls = 0; @@ -84,12 +84,12 @@ int opt_attrs = 0; int opt_timestamps = 0; const char *opt_exclude = NULL; const char *opt_destination = NULL; -BOOL opt_testmode = False; +bool opt_testmode = False; -BOOL opt_have_ip = False; +bool opt_have_ip = False; struct in_addr opt_dest_ip; -extern BOOL AllowDebugChange; +extern bool AllowDebugChange; uint32 get_sec_channel_type(const char *param) { @@ -381,7 +381,7 @@ int net_use_machine_account(void) return 0; } -BOOL net_find_server(const char *domain, unsigned flags, struct in_addr *server_ip, char **server_name) +bool net_find_server(const char *domain, unsigned flags, struct in_addr *server_ip, char **server_name) { const char *d = domain ? domain : opt_target_workgroup; @@ -449,7 +449,7 @@ BOOL net_find_server(const char *domain, unsigned flags, struct in_addr *server_ } -BOOL net_find_pdc(struct in_addr *server_ip, fstring server_name, const char *domain_name) +bool net_find_pdc(struct in_addr *server_ip, fstring server_name, const char *domain_name) { if (get_pdc_ip(domain_name, server_ip)) { if (is_zero_ip_v4(*server_ip)) @@ -809,7 +809,7 @@ static int net_afs(int argc, const char **argv) #endif /* WITH_FAKE_KASERVER */ -static BOOL search_maxrid(struct pdb_search *search, const char *type, +static bool search_maxrid(struct pdb_search *search, const char *type, uint32 *max_rid) { struct samr_displayentry *entries; -- cgit