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/rpc_server/srv_dfs_nt.c | 20 +++---- source3/rpc_server/srv_eventlog.c | 14 ++--- source3/rpc_server/srv_eventlog_lib.c | 14 ++--- source3/rpc_server/srv_eventlog_nt.c | 14 ++--- source3/rpc_server/srv_lsa.c | 72 +++++++++++------------ source3/rpc_server/srv_lsa_ds.c | 4 +- source3/rpc_server/srv_lsa_hnd.c | 12 ++-- source3/rpc_server/srv_netlog.c | 22 +++---- source3/rpc_server/srv_netlog_nt.c | 10 ++-- source3/rpc_server/srv_ntsvcs.c | 14 ++--- source3/rpc_server/srv_pipe.c | 52 ++++++++--------- source3/rpc_server/srv_pipe_hnd.c | 26 ++++----- source3/rpc_server/srv_samr.c | 96 +++++++++++++++---------------- source3/rpc_server/srv_samr_nt.c | 86 ++++++++++++++-------------- source3/rpc_server/srv_spoolss.c | 104 +++++++++++++++++----------------- source3/rpc_server/srv_spoolss_nt.c | 80 +++++++++++++------------- source3/rpc_server/srv_srvsvc.c | 40 ++++++------- source3/rpc_server/srv_srvsvc_nt.c | 22 +++---- source3/rpc_server/srv_svcctl.c | 34 +++++------ source3/rpc_server/srv_svcctl_nt.c | 2 +- source3/rpc_server/srv_winreg_nt.c | 10 ++-- 21 files changed, 374 insertions(+), 374 deletions(-) mode change 100755 => 100644 source3/rpc_server/srv_spoolss.c (limited to 'source3/rpc_server') diff --git a/source3/rpc_server/srv_dfs_nt.c b/source3/rpc_server/srv_dfs_nt.c index 6ed5dbd3b5..8a1cdedb4f 100644 --- a/source3/rpc_server/srv_dfs_nt.c +++ b/source3/rpc_server/srv_dfs_nt.c @@ -42,9 +42,9 @@ WERROR _dfs_Add(pipes_struct *p, struct dfs_Add *r) { struct junction_map *jn = NULL; struct referral *old_referral_list = NULL; - BOOL self_ref = False; + bool self_ref = False; int consumedcnt = 0; - BOOL exists = False; + bool exists = False; char *altpath = NULL; NTSTATUS status; TALLOC_CTX *ctx = talloc_tos(); @@ -113,9 +113,9 @@ WERROR _dfs_Add(pipes_struct *p, struct dfs_Add *r) WERROR _dfs_Remove(pipes_struct *p, struct dfs_Remove *r) { struct junction_map *jn = NULL; - BOOL self_ref = False; + bool self_ref = False; int consumedcnt = 0; - BOOL found = False; + bool found = False; TALLOC_CTX *ctx = talloc_tos(); char *altpath = NULL; @@ -195,7 +195,7 @@ WERROR _dfs_Remove(pipes_struct *p, struct dfs_Remove *r) return WERR_OK; } -static BOOL init_reply_dfs_info_1(TALLOC_CTX *mem_ctx, struct junction_map* j,struct dfs_Info1* dfs1) +static bool init_reply_dfs_info_1(TALLOC_CTX *mem_ctx, struct junction_map* j,struct dfs_Info1* dfs1) { dfs1->path = talloc_asprintf(mem_ctx, "\\\\%s\\%s\\%s", global_myname(), @@ -207,7 +207,7 @@ static BOOL init_reply_dfs_info_1(TALLOC_CTX *mem_ctx, struct junction_map* j,st return True; } -static BOOL init_reply_dfs_info_2(TALLOC_CTX *mem_ctx, struct junction_map* j, struct dfs_Info2* dfs2) +static bool init_reply_dfs_info_2(TALLOC_CTX *mem_ctx, struct junction_map* j, struct dfs_Info2* dfs2) { dfs2->path = talloc_asprintf(mem_ctx, "\\\\%s\\%s\\%s", global_myname(), j->service_name, j->volume_name); @@ -219,7 +219,7 @@ static BOOL init_reply_dfs_info_2(TALLOC_CTX *mem_ctx, struct junction_map* j, s return True; } -static BOOL init_reply_dfs_info_3(TALLOC_CTX *mem_ctx, struct junction_map* j, struct dfs_Info3* dfs3) +static bool init_reply_dfs_info_3(TALLOC_CTX *mem_ctx, struct junction_map* j, struct dfs_Info3* dfs3) { int ii; if (j->volume_name[0] == '\0') @@ -271,7 +271,7 @@ static BOOL init_reply_dfs_info_3(TALLOC_CTX *mem_ctx, struct junction_map* j, s return True; } -static BOOL init_reply_dfs_info_100(TALLOC_CTX *mem_ctx, struct junction_map* j, struct dfs_Info100* dfs100) +static bool init_reply_dfs_info_100(TALLOC_CTX *mem_ctx, struct junction_map* j, struct dfs_Info100* dfs100) { dfs100->comment = talloc_strdup(mem_ctx, j->comment); return True; @@ -355,9 +355,9 @@ WERROR _dfs_GetInfo(pipes_struct *p, struct dfs_GetInfo *r) { int consumedcnt = strlen(r->in.dfs_entry_path); struct junction_map *jn = NULL; - BOOL self_ref = False; + bool self_ref = False; TALLOC_CTX *ctx = talloc_tos(); - BOOL ret; + bool ret; jn = TALLOC_ZERO_P(ctx, struct junction_map); if (!jn) { diff --git a/source3/rpc_server/srv_eventlog.c b/source3/rpc_server/srv_eventlog.c index fcba6a1268..516ea134f2 100644 --- a/source3/rpc_server/srv_eventlog.c +++ b/source3/rpc_server/srv_eventlog.c @@ -23,7 +23,7 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV -static BOOL proxy_eventlog_call(pipes_struct *p, uint8 opnum) +static bool proxy_eventlog_call(pipes_struct *p, uint8 opnum) { struct api_struct *fns; int n_fns; @@ -40,7 +40,7 @@ static BOOL proxy_eventlog_call(pipes_struct *p, uint8 opnum) return fns[opnum].fn(p); } -static BOOL api_eventlog_open_eventlog(pipes_struct *p) +static bool api_eventlog_open_eventlog(pipes_struct *p) { EVENTLOG_Q_OPEN_EVENTLOG q_u; EVENTLOG_R_OPEN_EVENTLOG r_u; @@ -65,12 +65,12 @@ static BOOL api_eventlog_open_eventlog(pipes_struct *p) return True; } -static BOOL api_eventlog_close_eventlog(pipes_struct *p) +static bool api_eventlog_close_eventlog(pipes_struct *p) { return proxy_eventlog_call( p, NDR_EVENTLOG_CLOSEEVENTLOG ); } -static BOOL api_eventlog_get_num_records(pipes_struct *p) +static bool api_eventlog_get_num_records(pipes_struct *p) { EVENTLOG_Q_GET_NUM_RECORDS q_u; EVENTLOG_R_GET_NUM_RECORDS r_u; @@ -95,7 +95,7 @@ static BOOL api_eventlog_get_num_records(pipes_struct *p) return True; } -static BOOL api_eventlog_get_oldest_entry(pipes_struct *p) +static bool api_eventlog_get_oldest_entry(pipes_struct *p) { EVENTLOG_Q_GET_OLDEST_ENTRY q_u; EVENTLOG_R_GET_OLDEST_ENTRY r_u; @@ -120,7 +120,7 @@ static BOOL api_eventlog_get_oldest_entry(pipes_struct *p) return True; } -static BOOL api_eventlog_read_eventlog(pipes_struct *p) +static bool api_eventlog_read_eventlog(pipes_struct *p) { EVENTLOG_Q_READ_EVENTLOG q_u; EVENTLOG_R_READ_EVENTLOG r_u; @@ -145,7 +145,7 @@ static BOOL api_eventlog_read_eventlog(pipes_struct *p) return True; } -static BOOL api_eventlog_clear_eventlog(pipes_struct *p) +static bool api_eventlog_clear_eventlog(pipes_struct *p) { EVENTLOG_Q_CLEAR_EVENTLOG q_u; EVENTLOG_R_CLEAR_EVENTLOG r_u; diff --git a/source3/rpc_server/srv_eventlog_lib.c b/source3/rpc_server/srv_eventlog_lib.c index f21e983eb7..3f06f0f39f 100644 --- a/source3/rpc_server/srv_eventlog_lib.c +++ b/source3/rpc_server/srv_eventlog_lib.c @@ -141,8 +141,8 @@ int elog_tdb_size( TDB_CONTEXT * tdb, int *MaxSize, int *Retention ) return True if we made enough room to accommodate needed bytes ********************************************************************/ -BOOL make_way_for_eventlogs( TDB_CONTEXT * the_tdb, int32 needed, - BOOL whack_by_date ) +bool make_way_for_eventlogs( TDB_CONTEXT * the_tdb, int32 needed, + bool whack_by_date ) { int start_record, i, new_start; int end_record; @@ -247,7 +247,7 @@ BOOL make_way_for_eventlogs( TDB_CONTEXT * the_tdb, int32 needed, calculate how many bytes we need to remove ********************************************************************/ -BOOL prune_eventlog( TDB_CONTEXT * tdb ) +bool prune_eventlog( TDB_CONTEXT * tdb ) { int MaxSize, Retention, CalcdSize; @@ -272,7 +272,7 @@ BOOL prune_eventlog( TDB_CONTEXT * tdb ) /******************************************************************** ********************************************************************/ -BOOL can_write_to_eventlog( TDB_CONTEXT * tdb, int32 needed ) +bool can_write_to_eventlog( TDB_CONTEXT * tdb, int32 needed ) { int calcd_size; int MaxSize, Retention; @@ -315,7 +315,7 @@ BOOL can_write_to_eventlog( TDB_CONTEXT * tdb, int32 needed ) /******************************************************************* *******************************************************************/ -ELOG_TDB *elog_open_tdb( char *logname, BOOL force_clear ) +ELOG_TDB *elog_open_tdb( char *logname, bool force_clear ) { TDB_CONTEXT *tdb = NULL; uint32 vers_id; @@ -412,7 +412,7 @@ ELOG_TDB *elog_open_tdb( char *logname, BOOL force_clear ) Wrapper to handle reference counts to the tdb *******************************************************************/ -int elog_close_tdb( ELOG_TDB *etdb, BOOL force_close ) +int elog_close_tdb( ELOG_TDB *etdb, bool force_close ) { TDB_CONTEXT *tdb; @@ -591,7 +591,7 @@ void fixup_eventlog_entry( Eventlog_entry * ee ) going in. ********************************************************************/ -BOOL parse_logentry( char *line, Eventlog_entry * entry, BOOL * eor ) +bool parse_logentry( char *line, Eventlog_entry * entry, bool * eor ) { char *start = NULL, *stop = NULL; pstring temp; diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/srv_eventlog_nt.c index 32940b3417..d86da9054c 100644 --- a/source3/rpc_server/srv_eventlog_nt.c +++ b/source3/rpc_server/srv_eventlog_nt.c @@ -67,11 +67,11 @@ static EVENTLOG_INFO *find_eventlog_info_by_hnd( pipes_struct * p, /******************************************************************** ********************************************************************/ -static BOOL elog_check_access( EVENTLOG_INFO *info, NT_USER_TOKEN *token ) +static bool elog_check_access( EVENTLOG_INFO *info, NT_USER_TOKEN *token ) { char *tdbname = elog_tdbname( info->logname ); SEC_DESC *sec_desc; - BOOL ret; + bool ret; NTSTATUS ntstatus; if ( !tdbname ) @@ -117,7 +117,7 @@ static BOOL elog_check_access( EVENTLOG_INFO *info, NT_USER_TOKEN *token ) /******************************************************************** ********************************************************************/ -static BOOL elog_validate_logname( const char *name ) +static bool elog_validate_logname( const char *name ) { int i; const char **elogs = lp_eventlog_list(); @@ -137,7 +137,7 @@ static BOOL elog_validate_logname( const char *name ) /******************************************************************** ********************************************************************/ -static BOOL get_num_records_hook( EVENTLOG_INFO * info ) +static bool get_num_records_hook( EVENTLOG_INFO * info ) { int next_record; int oldest_record; @@ -167,7 +167,7 @@ static BOOL get_num_records_hook( EVENTLOG_INFO * info ) /******************************************************************** ********************************************************************/ -static BOOL get_oldest_entry_hook( EVENTLOG_INFO * info ) +static bool get_oldest_entry_hook( EVENTLOG_INFO * info ) { /* it's the same thing */ return get_num_records_hook( info ); @@ -385,7 +385,7 @@ static Eventlog_entry *get_eventlog_record( prs_struct * ps, TDB_CONTEXT * tdb, since it uses the table to find the tdb handle ********************************************************************/ -static BOOL sync_eventlog_params( EVENTLOG_INFO *info ) +static bool sync_eventlog_params( EVENTLOG_INFO *info ) { pstring path; uint32 uiMaxSize; @@ -543,7 +543,7 @@ static Eventlog_entry *read_package_entry( prs_struct * ps, /******************************************************************** ********************************************************************/ -static BOOL add_record_to_resp( EVENTLOG_R_READ_EVENTLOG * r_u, +static bool add_record_to_resp( EVENTLOG_R_READ_EVENTLOG * r_u, Eventlog_entry * ee_new ) { Eventlog_entry *insert_point; diff --git a/source3/rpc_server/srv_lsa.c b/source3/rpc_server/srv_lsa.c index 484e964068..b433ac2c8f 100644 --- a/source3/rpc_server/srv_lsa.c +++ b/source3/rpc_server/srv_lsa.c @@ -29,7 +29,7 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV -static BOOL proxy_lsa_call(pipes_struct *p, uint8 opnum) +static bool proxy_lsa_call(pipes_struct *p, uint8 opnum) { struct api_struct *fns; int n_fns; @@ -50,7 +50,7 @@ static BOOL proxy_lsa_call(pipes_struct *p, uint8 opnum) api_lsa_open_policy2 ***************************************************************************/ -static BOOL api_lsa_open_policy2(pipes_struct *p) +static bool api_lsa_open_policy2(pipes_struct *p) { LSA_Q_OPEN_POL2 q_u; LSA_R_OPEN_POL2 r_u; @@ -81,7 +81,7 @@ static BOOL api_lsa_open_policy2(pipes_struct *p) api_lsa_open_policy ***************************************************************************/ -static BOOL api_lsa_open_policy(pipes_struct *p) +static bool api_lsa_open_policy(pipes_struct *p) { LSA_Q_OPEN_POL q_u; LSA_R_OPEN_POL r_u; @@ -112,7 +112,7 @@ static BOOL api_lsa_open_policy(pipes_struct *p) api_lsa_enum_trust_dom ***************************************************************************/ -static BOOL api_lsa_enum_trust_dom(pipes_struct *p) +static bool api_lsa_enum_trust_dom(pipes_struct *p) { LSA_Q_ENUM_TRUST_DOM q_u; LSA_R_ENUM_TRUST_DOM r_u; @@ -140,7 +140,7 @@ static BOOL api_lsa_enum_trust_dom(pipes_struct *p) api_lsa_query_info ***************************************************************************/ -static BOOL api_lsa_query_info(pipes_struct *p) +static bool api_lsa_query_info(pipes_struct *p) { LSA_Q_QUERY_INFO q_u; LSA_R_QUERY_INFO r_u; @@ -171,7 +171,7 @@ static BOOL api_lsa_query_info(pipes_struct *p) api_lsa_lookup_sids ***************************************************************************/ -static BOOL api_lsa_lookup_sids(pipes_struct *p) +static bool api_lsa_lookup_sids(pipes_struct *p) { LSA_Q_LOOKUP_SIDS q_u; LSA_R_LOOKUP_SIDS r_u; @@ -201,7 +201,7 @@ static BOOL api_lsa_lookup_sids(pipes_struct *p) api_lsa_lookup_names ***************************************************************************/ -static BOOL api_lsa_lookup_names(pipes_struct *p) +static bool api_lsa_lookup_names(pipes_struct *p) { LSA_Q_LOOKUP_NAMES q_u; LSA_R_LOOKUP_NAMES r_u; @@ -232,7 +232,7 @@ static BOOL api_lsa_lookup_names(pipes_struct *p) api_lsa_close. ***************************************************************************/ -static BOOL api_lsa_close(pipes_struct *p) +static bool api_lsa_close(pipes_struct *p) { return proxy_lsa_call(p, NDR_LSA_CLOSE); } @@ -241,7 +241,7 @@ static BOOL api_lsa_close(pipes_struct *p) api_lsa_open_secret. ***************************************************************************/ -static BOOL api_lsa_open_secret(pipes_struct *p) +static bool api_lsa_open_secret(pipes_struct *p) { return proxy_lsa_call(p, NDR_LSA_OPENSECRET); } @@ -250,7 +250,7 @@ static BOOL api_lsa_open_secret(pipes_struct *p) api_lsa_open_secret. ***************************************************************************/ -static BOOL api_lsa_enum_privs(pipes_struct *p) +static bool api_lsa_enum_privs(pipes_struct *p) { LSA_Q_ENUM_PRIVS q_u; LSA_R_ENUM_PRIVS r_u; @@ -280,7 +280,7 @@ static BOOL api_lsa_enum_privs(pipes_struct *p) api_lsa_open_secret. ***************************************************************************/ -static BOOL api_lsa_priv_get_dispname(pipes_struct *p) +static bool api_lsa_priv_get_dispname(pipes_struct *p) { LSA_Q_PRIV_GET_DISPNAME q_u; LSA_R_PRIV_GET_DISPNAME r_u; @@ -310,7 +310,7 @@ static BOOL api_lsa_priv_get_dispname(pipes_struct *p) api_lsa_open_secret. ***************************************************************************/ -static BOOL api_lsa_enum_accounts(pipes_struct *p) +static bool api_lsa_enum_accounts(pipes_struct *p) { LSA_Q_ENUM_ACCOUNTS q_u; LSA_R_ENUM_ACCOUNTS r_u; @@ -340,7 +340,7 @@ static BOOL api_lsa_enum_accounts(pipes_struct *p) api_lsa_UNK_GET_CONNUSER ***************************************************************************/ -static BOOL api_lsa_unk_get_connuser(pipes_struct *p) +static bool api_lsa_unk_get_connuser(pipes_struct *p) { LSA_Q_UNK_GET_CONNUSER q_u; LSA_R_UNK_GET_CONNUSER r_u; @@ -371,7 +371,7 @@ static BOOL api_lsa_unk_get_connuser(pipes_struct *p) api_lsa_create_user ***************************************************************************/ -static BOOL api_lsa_create_account(pipes_struct *p) +static bool api_lsa_create_account(pipes_struct *p) { LSA_Q_CREATEACCOUNT q_u; LSA_R_CREATEACCOUNT r_u; @@ -402,7 +402,7 @@ static BOOL api_lsa_create_account(pipes_struct *p) api_lsa_open_user ***************************************************************************/ -static BOOL api_lsa_open_account(pipes_struct *p) +static bool api_lsa_open_account(pipes_struct *p) { LSA_Q_OPENACCOUNT q_u; LSA_R_OPENACCOUNT r_u; @@ -433,7 +433,7 @@ static BOOL api_lsa_open_account(pipes_struct *p) api_lsa_get_privs ***************************************************************************/ -static BOOL api_lsa_enum_privsaccount(pipes_struct *p) +static bool api_lsa_enum_privsaccount(pipes_struct *p) { LSA_Q_ENUMPRIVSACCOUNT q_u; LSA_R_ENUMPRIVSACCOUNT r_u; @@ -464,7 +464,7 @@ static BOOL api_lsa_enum_privsaccount(pipes_struct *p) api_lsa_getsystemaccount ***************************************************************************/ -static BOOL api_lsa_getsystemaccount(pipes_struct *p) +static bool api_lsa_getsystemaccount(pipes_struct *p) { LSA_Q_GETSYSTEMACCOUNT q_u; LSA_R_GETSYSTEMACCOUNT r_u; @@ -496,7 +496,7 @@ static BOOL api_lsa_getsystemaccount(pipes_struct *p) api_lsa_setsystemaccount ***************************************************************************/ -static BOOL api_lsa_setsystemaccount(pipes_struct *p) +static bool api_lsa_setsystemaccount(pipes_struct *p) { LSA_Q_SETSYSTEMACCOUNT q_u; LSA_R_SETSYSTEMACCOUNT r_u; @@ -527,7 +527,7 @@ static BOOL api_lsa_setsystemaccount(pipes_struct *p) api_lsa_addprivs ***************************************************************************/ -static BOOL api_lsa_addprivs(pipes_struct *p) +static bool api_lsa_addprivs(pipes_struct *p) { LSA_Q_ADDPRIVS q_u; LSA_R_ADDPRIVS r_u; @@ -558,7 +558,7 @@ static BOOL api_lsa_addprivs(pipes_struct *p) api_lsa_removeprivs ***************************************************************************/ -static BOOL api_lsa_removeprivs(pipes_struct *p) +static bool api_lsa_removeprivs(pipes_struct *p) { LSA_Q_REMOVEPRIVS q_u; LSA_R_REMOVEPRIVS r_u; @@ -589,7 +589,7 @@ static BOOL api_lsa_removeprivs(pipes_struct *p) api_lsa_query_secobj ***************************************************************************/ -static BOOL api_lsa_query_secobj(pipes_struct *p) +static bool api_lsa_query_secobj(pipes_struct *p) { LSA_Q_QUERY_SEC_OBJ q_u; LSA_R_QUERY_SEC_OBJ r_u; @@ -620,7 +620,7 @@ static BOOL api_lsa_query_secobj(pipes_struct *p) api_lsa_add_acct_rights ***************************************************************************/ -static BOOL api_lsa_add_acct_rights(pipes_struct *p) +static bool api_lsa_add_acct_rights(pipes_struct *p) { LSA_Q_ADD_ACCT_RIGHTS q_u; LSA_R_ADD_ACCT_RIGHTS r_u; @@ -651,7 +651,7 @@ static BOOL api_lsa_add_acct_rights(pipes_struct *p) api_lsa_remove_acct_rights ***************************************************************************/ -static BOOL api_lsa_remove_acct_rights(pipes_struct *p) +static bool api_lsa_remove_acct_rights(pipes_struct *p) { LSA_Q_REMOVE_ACCT_RIGHTS q_u; LSA_R_REMOVE_ACCT_RIGHTS r_u; @@ -682,7 +682,7 @@ static BOOL api_lsa_remove_acct_rights(pipes_struct *p) api_lsa_enum_acct_rights ***************************************************************************/ -static BOOL api_lsa_enum_acct_rights(pipes_struct *p) +static bool api_lsa_enum_acct_rights(pipes_struct *p) { LSA_Q_ENUM_ACCT_RIGHTS q_u; LSA_R_ENUM_ACCT_RIGHTS r_u; @@ -713,7 +713,7 @@ static BOOL api_lsa_enum_acct_rights(pipes_struct *p) api_lsa_lookup_priv_value ***************************************************************************/ -static BOOL api_lsa_lookup_priv_value(pipes_struct *p) +static bool api_lsa_lookup_priv_value(pipes_struct *p) { LSA_Q_LOOKUP_PRIV_VALUE q_u; LSA_R_LOOKUP_PRIV_VALUE r_u; @@ -743,7 +743,7 @@ static BOOL api_lsa_lookup_priv_value(pipes_struct *p) /*************************************************************************** ***************************************************************************/ -static BOOL api_lsa_open_trust_dom(pipes_struct *p) +static bool api_lsa_open_trust_dom(pipes_struct *p) { return proxy_lsa_call(p, NDR_LSA_OPENTRUSTEDDOMAIN); } @@ -751,7 +751,7 @@ static BOOL api_lsa_open_trust_dom(pipes_struct *p) /*************************************************************************** ***************************************************************************/ -static BOOL api_lsa_create_trust_dom(pipes_struct *p) +static bool api_lsa_create_trust_dom(pipes_struct *p) { return proxy_lsa_call(p, NDR_LSA_CREATETRUSTEDDOMAIN); } @@ -759,7 +759,7 @@ static BOOL api_lsa_create_trust_dom(pipes_struct *p) /*************************************************************************** ***************************************************************************/ -static BOOL api_lsa_create_secret(pipes_struct *p) +static bool api_lsa_create_secret(pipes_struct *p) { return proxy_lsa_call(p, NDR_LSA_CREATESECRET); } @@ -767,7 +767,7 @@ static BOOL api_lsa_create_secret(pipes_struct *p) /*************************************************************************** ***************************************************************************/ -static BOOL api_lsa_set_secret(pipes_struct *p) +static bool api_lsa_set_secret(pipes_struct *p) { return proxy_lsa_call(p, NDR_LSA_SETSECRET); } @@ -775,7 +775,7 @@ static BOOL api_lsa_set_secret(pipes_struct *p) /*************************************************************************** ***************************************************************************/ -static BOOL api_lsa_delete_object(pipes_struct *p) +static bool api_lsa_delete_object(pipes_struct *p) { LSA_Q_DELETE_OBJECT q_u; LSA_R_DELETE_OBJECT r_u; @@ -806,7 +806,7 @@ static BOOL api_lsa_delete_object(pipes_struct *p) api_lsa_lookup_sids2 ***************************************************************************/ -static BOOL api_lsa_lookup_sids2(pipes_struct *p) +static bool api_lsa_lookup_sids2(pipes_struct *p) { LSA_Q_LOOKUP_SIDS2 q_u; LSA_R_LOOKUP_SIDS2 r_u; @@ -836,7 +836,7 @@ static BOOL api_lsa_lookup_sids2(pipes_struct *p) api_lsa_lookup_sids3 ***************************************************************************/ -static BOOL api_lsa_lookup_sids3(pipes_struct *p) +static bool api_lsa_lookup_sids3(pipes_struct *p) { LSA_Q_LOOKUP_SIDS3 q_u; LSA_R_LOOKUP_SIDS3 r_u; @@ -866,7 +866,7 @@ static BOOL api_lsa_lookup_sids3(pipes_struct *p) api_lsa_lookup_names2 ***************************************************************************/ -static BOOL api_lsa_lookup_names2(pipes_struct *p) +static bool api_lsa_lookup_names2(pipes_struct *p) { LSA_Q_LOOKUP_NAMES2 q_u; LSA_R_LOOKUP_NAMES2 r_u; @@ -897,7 +897,7 @@ static BOOL api_lsa_lookup_names2(pipes_struct *p) api_lsa_lookup_names3 ***************************************************************************/ -static BOOL api_lsa_lookup_names3(pipes_struct *p) +static bool api_lsa_lookup_names3(pipes_struct *p) { LSA_Q_LOOKUP_NAMES3 q_u; LSA_R_LOOKUP_NAMES3 r_u; @@ -928,7 +928,7 @@ static BOOL api_lsa_lookup_names3(pipes_struct *p) api_lsa_lookup_names4 ***************************************************************************/ -static BOOL api_lsa_lookup_names4(pipes_struct *p) +static bool api_lsa_lookup_names4(pipes_struct *p) { LSA_Q_LOOKUP_NAMES4 q_u; LSA_R_LOOKUP_NAMES4 r_u; @@ -961,7 +961,7 @@ static BOOL api_lsa_lookup_names4(pipes_struct *p) api_lsa_query_info2 ***************************************************************************/ -static BOOL api_lsa_query_info2(pipes_struct *p) +static bool api_lsa_query_info2(pipes_struct *p) { LSA_Q_QUERY_INFO2 q_u; LSA_R_QUERY_INFO2 r_u; diff --git a/source3/rpc_server/srv_lsa_ds.c b/source3/rpc_server/srv_lsa_ds.c index 52fd06cd51..55baa40261 100644 --- a/source3/rpc_server/srv_lsa_ds.c +++ b/source3/rpc_server/srv_lsa_ds.c @@ -27,7 +27,7 @@ /******************************************************************* ********************************************************************/ -static BOOL api_dsrole_get_primary_dominfo(pipes_struct *p) +static bool api_dsrole_get_primary_dominfo(pipes_struct *p) { DS_Q_GETPRIMDOMINFO q_u; DS_R_GETPRIMDOMINFO r_u; @@ -54,7 +54,7 @@ static BOOL api_dsrole_get_primary_dominfo(pipes_struct *p) stub functions for unimplemented RPC *******************************************************************/ -static BOOL api_dsrole_stub( pipes_struct *p ) +static bool api_dsrole_stub( pipes_struct *p ) { DEBUG(0,("api_dsrole_stub: Hmmm....didn't know this RPC existed...\n")); diff --git a/source3/rpc_server/srv_lsa_hnd.c b/source3/rpc_server/srv_lsa_hnd.c index 45b4fb9a5c..fa63c8091e 100644 --- a/source3/rpc_server/srv_lsa_hnd.c +++ b/source3/rpc_server/srv_lsa_hnd.c @@ -34,7 +34,7 @@ pipe is open. JRA. ****************************************************************************/ -static BOOL is_samr_lsa_pipe(const char *pipe_name) +static bool is_samr_lsa_pipe(const char *pipe_name) { return (strstr(pipe_name, "samr") || strstr(pipe_name, "lsa")); } @@ -44,7 +44,7 @@ static BOOL is_samr_lsa_pipe(const char *pipe_name) pipes of the same name. ****************************************************************************/ -BOOL init_pipe_handle_list(pipes_struct *p, const char *pipe_name) +bool init_pipe_handle_list(pipes_struct *p, const char *pipe_name) { pipes_struct *plist = get_first_internal_pipe(); struct handle_list *hl = NULL; @@ -98,7 +98,7 @@ BOOL init_pipe_handle_list(pipes_struct *p, const char *pipe_name) find first available policy slot. creates a policy handle for you. ****************************************************************************/ -BOOL create_policy_hnd(pipes_struct *p, POLICY_HND *hnd, void (*free_fn)(void *), void *data_ptr) +bool create_policy_hnd(pipes_struct *p, POLICY_HND *hnd, void (*free_fn)(void *), void *data_ptr) { static uint32 pol_hnd_low = 0; static uint32 pol_hnd_high = 0; @@ -184,7 +184,7 @@ static struct policy *find_policy_by_hnd_internal(pipes_struct *p, POLICY_HND *h find policy by handle ****************************************************************************/ -BOOL find_policy_by_hnd(pipes_struct *p, POLICY_HND *hnd, void **data_p) +bool find_policy_by_hnd(pipes_struct *p, POLICY_HND *hnd, void **data_p) { return find_policy_by_hnd_internal(p, hnd, data_p) == NULL ? False : True; } @@ -193,7 +193,7 @@ BOOL find_policy_by_hnd(pipes_struct *p, POLICY_HND *hnd, void **data_p) Close a policy. ****************************************************************************/ -BOOL close_policy_hnd(pipes_struct *p, POLICY_HND *hnd) +bool close_policy_hnd(pipes_struct *p, POLICY_HND *hnd) { struct policy *pol = find_policy_by_hnd_internal(p, hnd, NULL); @@ -249,7 +249,7 @@ will be checking a security descriptor to determine whether a user token has enough access to access the pipe. ********************************************************************/ -BOOL pipe_access_check(pipes_struct *p) +bool pipe_access_check(pipes_struct *p) { /* Don't let anonymous users access this RPC if restrict anonymous > 0 */ diff --git a/source3/rpc_server/srv_netlog.c b/source3/rpc_server/srv_netlog.c index 3f2dbe6747..6d9859a9ae 100644 --- a/source3/rpc_server/srv_netlog.c +++ b/source3/rpc_server/srv_netlog.c @@ -32,7 +32,7 @@ api_net_req_chal: *************************************************************************/ -static BOOL api_net_req_chal(pipes_struct *p) +static bool api_net_req_chal(pipes_struct *p) { NET_Q_REQ_CHAL q_u; NET_R_REQ_CHAL r_u; @@ -63,7 +63,7 @@ static BOOL api_net_req_chal(pipes_struct *p) api_net_auth: *************************************************************************/ -static BOOL api_net_auth(pipes_struct *p) +static bool api_net_auth(pipes_struct *p) { NET_Q_AUTH q_u; NET_R_AUTH r_u; @@ -94,7 +94,7 @@ static BOOL api_net_auth(pipes_struct *p) api_net_auth_2: *************************************************************************/ -static BOOL api_net_auth_2(pipes_struct *p) +static bool api_net_auth_2(pipes_struct *p) { NET_Q_AUTH_2 q_u; NET_R_AUTH_2 r_u; @@ -125,7 +125,7 @@ static BOOL api_net_auth_2(pipes_struct *p) api_net_srv_pwset: *************************************************************************/ -static BOOL api_net_srv_pwset(pipes_struct *p) +static bool api_net_srv_pwset(pipes_struct *p) { NET_Q_SRV_PWSET q_u; NET_R_SRV_PWSET r_u; @@ -156,7 +156,7 @@ static BOOL api_net_srv_pwset(pipes_struct *p) api_net_sam_logoff: *************************************************************************/ -static BOOL api_net_sam_logoff(pipes_struct *p) +static bool api_net_sam_logoff(pipes_struct *p) { NET_Q_SAM_LOGOFF q_u; NET_R_SAM_LOGOFF r_u; @@ -186,7 +186,7 @@ static BOOL api_net_sam_logoff(pipes_struct *p) api_net_sam_logon: *************************************************************************/ -static BOOL api_net_sam_logon(pipes_struct *p) +static bool api_net_sam_logon(pipes_struct *p) { NET_Q_SAM_LOGON q_u; NET_R_SAM_LOGON r_u; @@ -216,7 +216,7 @@ static BOOL api_net_sam_logon(pipes_struct *p) api_net_trust_dom_list: *************************************************************************/ -static BOOL api_net_trust_dom_list(pipes_struct *p) +static bool api_net_trust_dom_list(pipes_struct *p) { NET_Q_TRUST_DOM_LIST q_u; NET_R_TRUST_DOM_LIST r_u; @@ -248,7 +248,7 @@ static BOOL api_net_trust_dom_list(pipes_struct *p) api_net_logon_ctrl2: *************************************************************************/ -static BOOL api_net_logon_ctrl2(pipes_struct *p) +static bool api_net_logon_ctrl2(pipes_struct *p) { NET_Q_LOGON_CTRL2 q_u; NET_R_LOGON_CTRL2 r_u; @@ -279,7 +279,7 @@ static BOOL api_net_logon_ctrl2(pipes_struct *p) api_net_logon_ctrl: *************************************************************************/ -static BOOL api_net_logon_ctrl(pipes_struct *p) +static bool api_net_logon_ctrl(pipes_struct *p) { NET_Q_LOGON_CTRL q_u; NET_R_LOGON_CTRL r_u; @@ -309,7 +309,7 @@ static BOOL api_net_logon_ctrl(pipes_struct *p) api_net_sam_logon_ex: *************************************************************************/ -static BOOL api_net_sam_logon_ex(pipes_struct *p) +static bool api_net_sam_logon_ex(pipes_struct *p) { NET_Q_SAM_LOGON_EX q_u; NET_R_SAM_LOGON_EX r_u; @@ -341,7 +341,7 @@ static BOOL api_net_sam_logon_ex(pipes_struct *p) *************************************************************************/ #if 0 /* JERRY */ -static BOOL api_ds_enum_dom_trusts(pipes_struct *p) +static bool api_ds_enum_dom_trusts(pipes_struct *p) { DS_Q_ENUM_DOM_TRUSTS q_u; DS_R_ENUM_DOM_TRUSTS r_u; diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index 3f1b0916df..b651fdaac3 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -194,7 +194,7 @@ static NTSTATUS get_md4pw(char *md4pw, char *mach_acct, uint16 sec_chan_type) { struct samu *sampass = NULL; const uint8 *pass; - BOOL ret; + bool ret; uint32 acct_ctrl; #if 0 @@ -498,7 +498,7 @@ NTSTATUS _net_srv_pwset(pipes_struct *p, NET_Q_SRV_PWSET *q_u, NET_R_SRV_PWSET * { fstring remote_machine; struct samu *sampass=NULL; - BOOL ret = False; + bool ret = False; unsigned char pwd[16]; int i; uint32 acct_ctrl; @@ -654,7 +654,7 @@ NTSTATUS _net_sam_logoff(pipes_struct *p, NET_Q_SAM_LOGOFF *q_u, NET_R_SAM_LOGOF if (!p->dc) { /* Restore the saved state of the netlogon creds. */ - BOOL ret; + bool ret; become_root(); ret = secrets_restore_schannel_session_info(p->pipe_state_mem_ctx, @@ -728,7 +728,7 @@ static NTSTATUS nt_token_to_group_list(TALLOC_CTX *mem_ctx, static NTSTATUS _net_sam_logon_internal(pipes_struct *p, NET_Q_SAM_LOGON *q_u, NET_R_SAM_LOGON *r_u, - BOOL process_creds) + bool process_creds) { NTSTATUS status = NT_STATUS_OK; NET_USER_INFO_3 *usr_info = NULL; @@ -784,7 +784,7 @@ static NTSTATUS _net_sam_logon_internal(pipes_struct *p, if (!p->dc) { /* Restore the saved state of the netlogon creds. */ - BOOL ret; + bool ret; become_root(); ret = secrets_restore_schannel_session_info(p->pipe_state_mem_ctx, diff --git a/source3/rpc_server/srv_ntsvcs.c b/source3/rpc_server/srv_ntsvcs.c index 9d4c02500f..b3e93ac459 100644 --- a/source3/rpc_server/srv_ntsvcs.c +++ b/source3/rpc_server/srv_ntsvcs.c @@ -25,7 +25,7 @@ /******************************************************************* ********************************************************************/ -static BOOL api_ntsvcs_get_version(pipes_struct *p) +static bool api_ntsvcs_get_version(pipes_struct *p) { NTSVCS_Q_GET_VERSION q_u; NTSVCS_R_GET_VERSION r_u; @@ -49,7 +49,7 @@ static BOOL api_ntsvcs_get_version(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_ntsvcs_get_device_list_size(pipes_struct *p) +static bool api_ntsvcs_get_device_list_size(pipes_struct *p) { NTSVCS_Q_GET_DEVICE_LIST_SIZE q_u; NTSVCS_R_GET_DEVICE_LIST_SIZE r_u; @@ -73,7 +73,7 @@ static BOOL api_ntsvcs_get_device_list_size(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_ntsvcs_get_device_list(pipes_struct *p) +static bool api_ntsvcs_get_device_list(pipes_struct *p) { NTSVCS_Q_GET_DEVICE_LIST q_u; NTSVCS_R_GET_DEVICE_LIST r_u; @@ -97,7 +97,7 @@ static BOOL api_ntsvcs_get_device_list(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_ntsvcs_validate_device_instance(pipes_struct *p) +static bool api_ntsvcs_validate_device_instance(pipes_struct *p) { NTSVCS_Q_VALIDATE_DEVICE_INSTANCE q_u; NTSVCS_R_VALIDATE_DEVICE_INSTANCE r_u; @@ -121,7 +121,7 @@ static BOOL api_ntsvcs_validate_device_instance(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_ntsvcs_get_device_reg_property(pipes_struct *p) +static bool api_ntsvcs_get_device_reg_property(pipes_struct *p) { NTSVCS_Q_GET_DEVICE_REG_PROPERTY q_u; NTSVCS_R_GET_DEVICE_REG_PROPERTY r_u; @@ -145,7 +145,7 @@ static BOOL api_ntsvcs_get_device_reg_property(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_ntsvcs_get_hw_profile_info(pipes_struct *p) +static bool api_ntsvcs_get_hw_profile_info(pipes_struct *p) { NTSVCS_Q_GET_HW_PROFILE_INFO q_u; NTSVCS_R_GET_HW_PROFILE_INFO r_u; @@ -169,7 +169,7 @@ static BOOL api_ntsvcs_get_hw_profile_info(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_ntsvcs_hw_profile_flags(pipes_struct *p) +static bool api_ntsvcs_hw_profile_flags(pipes_struct *p) { NTSVCS_Q_HW_PROFILE_FLAGS q_u; NTSVCS_R_HW_PROFILE_FLAGS r_u; diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index c213ec556a..49ffcf13a6 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -55,7 +55,7 @@ static DATA_BLOB generic_session_key(void) Handle NTLMSSP. ********************************************************************/ -static BOOL create_next_pdu_ntlmssp(pipes_struct *p) +static bool create_next_pdu_ntlmssp(pipes_struct *p) { RPC_HDR_RESP hdr_resp; uint32 ss_padding_len = 0; @@ -272,7 +272,7 @@ static BOOL create_next_pdu_ntlmssp(pipes_struct *p) Return an schannel authenticated fragment. ********************************************************************/ -static BOOL create_next_pdu_schannel(pipes_struct *p) +static bool create_next_pdu_schannel(pipes_struct *p) { RPC_HDR_RESP hdr_resp; uint32 ss_padding_len = 0; @@ -450,7 +450,7 @@ static BOOL create_next_pdu_schannel(pipes_struct *p) No authentication done. ********************************************************************/ -static BOOL create_next_pdu_noauth(pipes_struct *p) +static bool create_next_pdu_noauth(pipes_struct *p) { RPC_HDR_RESP hdr_resp; uint32 data_len; @@ -571,7 +571,7 @@ static BOOL create_next_pdu_noauth(pipes_struct *p) Generate the next PDU to be returned from the data in p->rdata. ********************************************************************/ -BOOL create_next_pdu(pipes_struct *p) +bool create_next_pdu(pipes_struct *p) { switch(p->auth.auth_level) { case PIPE_AUTH_LEVEL_NONE: @@ -604,7 +604,7 @@ BOOL create_next_pdu(pipes_struct *p) the pipe struct. *******************************************************************/ -static BOOL pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob) +static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob) { DATA_BLOB reply; NTSTATUS status; @@ -725,7 +725,7 @@ static int rpc_lookup_size; This is the "stage3" NTLMSSP response after a bind request and reply. *******************************************************************/ -BOOL api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p) +bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p) { RPC_HDR_AUTH auth_info; uint32 pad; @@ -797,7 +797,7 @@ BOOL api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p) Marshall a bind_nak pdu. *******************************************************************/ -static BOOL setup_bind_nak(pipes_struct *p) +static bool setup_bind_nak(pipes_struct *p) { prs_struct outgoing_rpc; RPC_HDR nak_hdr; @@ -859,7 +859,7 @@ static BOOL setup_bind_nak(pipes_struct *p) Marshall a fault pdu. *******************************************************************/ -BOOL setup_fault_pdu(pipes_struct *p, NTSTATUS status) +bool setup_fault_pdu(pipes_struct *p, NTSTATUS status) { prs_struct outgoing_pdu; RPC_HDR fault_hdr; @@ -930,7 +930,7 @@ BOOL setup_fault_pdu(pipes_struct *p, NTSTATUS status) We should probably check the auth-verifier here. *******************************************************************/ -BOOL setup_cancel_ack_reply(pipes_struct *p, prs_struct *rpc_in_p) +bool setup_cancel_ack_reply(pipes_struct *p, prs_struct *rpc_in_p) { prs_struct outgoing_pdu; RPC_HDR ack_reply_hdr; @@ -978,7 +978,7 @@ BOOL setup_cancel_ack_reply(pipes_struct *p, prs_struct *rpc_in_p) Used to reject unknown binds from Win2k. *******************************************************************/ -BOOL check_bind_req(struct pipes_struct *p, RPC_IFACE* abstract, +bool check_bind_req(struct pipes_struct *p, RPC_IFACE* abstract, RPC_IFACE* transfer, uint32 context_id) { char *pipe_name = p->name; @@ -1089,7 +1089,7 @@ NTSTATUS rpc_pipe_register_commands(int version, const char *clnt, const char *s Handle a SPNEGO krb5 bind auth. *******************************************************************/ -static BOOL pipe_spnego_auth_bind_kerberos(pipes_struct *p, prs_struct *rpc_in_p, RPC_HDR_AUTH *pauth_info, +static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p, prs_struct *rpc_in_p, RPC_HDR_AUTH *pauth_info, DATA_BLOB *psecblob, prs_struct *pout_auth) { return False; @@ -1099,7 +1099,7 @@ static BOOL pipe_spnego_auth_bind_kerberos(pipes_struct *p, prs_struct *rpc_in_p Handle the first part of a SPNEGO bind auth. *******************************************************************/ -static BOOL pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_p, +static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_p, RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth) { DATA_BLOB blob; @@ -1109,7 +1109,7 @@ static BOOL pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_ char *OIDs[ASN1_MAX_OIDS]; int i; NTSTATUS status; - BOOL got_kerberos_mechanism = False; + bool got_kerberos_mechanism = False; AUTH_NTLMSSP_STATE *a = NULL; RPC_HDR_AUTH auth_info; @@ -1147,7 +1147,7 @@ static BOOL pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_ DEBUG(3,("pipe_spnego_auth_bind_negotiate: Got secblob of size %lu\n", (unsigned long)secblob.length)); if ( got_kerberos_mechanism && ((lp_security()==SEC_ADS) || lp_use_kerberos_keytab()) ) { - BOOL ret = pipe_spnego_auth_bind_kerberos(p, rpc_in_p, pauth_info, &secblob, pout_auth); + bool ret = pipe_spnego_auth_bind_kerberos(p, rpc_in_p, pauth_info, &secblob, pout_auth); data_blob_free(&secblob); data_blob_free(&blob); return ret; @@ -1220,7 +1220,7 @@ static BOOL pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_ Handle the second part of a SPNEGO bind auth. *******************************************************************/ -static BOOL pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p, +static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p, RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth) { RPC_HDR_AUTH auth_info; @@ -1310,13 +1310,13 @@ static BOOL pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p Handle an schannel bind auth. *******************************************************************/ -static BOOL pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p, +static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p, RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth) { RPC_HDR_AUTH auth_info; RPC_AUTH_SCHANNEL_NEG neg; RPC_AUTH_VERIFIER auth_verifier; - BOOL ret; + bool ret; struct dcinfo *pdcinfo; uint32 flags; @@ -1410,7 +1410,7 @@ static BOOL pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p, Handle an NTLMSSP bind auth. *******************************************************************/ -static BOOL pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p, +static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p, RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth) { RPC_HDR_AUTH auth_info; @@ -1491,7 +1491,7 @@ static BOOL pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p, Respond to a pipe bind request. *******************************************************************/ -BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p) +bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p) { RPC_HDR_BA hdr_ba; RPC_HDR_RB hdr_rb; @@ -1771,7 +1771,7 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p) SPNEGO calls. ****************************************************************************/ -BOOL api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p) +bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p) { RPC_HDR_BA hdr_ba; RPC_HDR_RB hdr_rb; @@ -1962,7 +1962,7 @@ BOOL api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p) Deal with NTLMSSP sign & seal processing on an RPC request. ****************************************************************************/ -BOOL api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in, +bool api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in, uint32 *p_ss_padding_len, NTSTATUS *pstatus) { RPC_HDR_AUTH auth_info; @@ -2078,7 +2078,7 @@ BOOL api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in, Deal with schannel processing on an RPC request. ****************************************************************************/ -BOOL api_pipe_schannel_process(pipes_struct *p, prs_struct *rpc_in, uint32 *p_ss_padding_len) +bool api_pipe_schannel_process(pipes_struct *p, prs_struct *rpc_in, uint32 *p_ss_padding_len) { uint32 data_len; uint32 auth_len; @@ -2230,10 +2230,10 @@ void free_pipe_rpc_context( PIPE_RPC_FNS *list ) before doing the call. ****************************************************************************/ -BOOL api_pipe_request(pipes_struct *p) +bool api_pipe_request(pipes_struct *p) { - BOOL ret = False; - BOOL changed_user = False; + bool ret = False; + bool changed_user = False; PIPE_RPC_FNS *pipe_fns; if (p->pipe_bound && @@ -2273,7 +2273,7 @@ BOOL api_pipe_request(pipes_struct *p) Calls the underlying RPC function for a named pipe. ********************************************************************/ -BOOL api_rpcTNP(pipes_struct *p, const char *rpc_name, +bool api_rpcTNP(pipes_struct *p, const char *rpc_name, const struct api_struct *api_rpc_cmds, int n_cmds) { int fn_num; diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c index 91814979c5..c3197c3f0d 100644 --- a/source3/rpc_server/srv_pipe_hnd.c +++ b/source3/rpc_server/srv_pipe_hnd.c @@ -62,9 +62,9 @@ static struct bitmap *bmap; */ static ssize_t read_from_internal_pipe(void *np_conn, char *data, size_t n, - BOOL *is_data_outstanding); + bool *is_data_outstanding); static ssize_t write_to_internal_pipe(void *np_conn, char *data, size_t n); -static BOOL close_internal_rpc_pipe_hnd(void *np_conn); +static bool close_internal_rpc_pipe_hnd(void *np_conn); static void *make_internal_rpc_pipe_p(const char *pipe_name, connection_struct *conn, uint16 vuid); @@ -137,7 +137,7 @@ void init_rpc_pipe_hnd(void) Initialise an outgoing packet. ****************************************************************************/ -static BOOL pipe_init_outgoing_data(pipes_struct *p) +static bool pipe_init_outgoing_data(pipes_struct *p) { output_data *o_data = &p->out_data; @@ -173,7 +173,7 @@ smb_np_struct *open_rpc_pipe_p(const char *pipe_name, int i; smb_np_struct *p, *p_it; static int next_pipe; - BOOL is_spoolss_pipe = False; + bool is_spoolss_pipe = False; DEBUG(4,("Open pipe requested %s (pipes_open=%d)\n", pipe_name, pipes_open)); @@ -540,7 +540,7 @@ static void free_pipe_context(pipes_struct *p) appends the data into the complete stream if the LAST flag is not set. ****************************************************************************/ -static BOOL process_request_pdu(pipes_struct *p, prs_struct *rpc_in_p) +static bool process_request_pdu(pipes_struct *p, prs_struct *rpc_in_p) { uint32 ss_padding_len = 0; size_t data_len = p->hdr.frag_len - RPC_HEADER_LEN - RPC_HDR_REQ_LEN - @@ -629,7 +629,7 @@ static BOOL process_request_pdu(pipes_struct *p, prs_struct *rpc_in_p) } if(p->hdr.flags & RPC_FLG_LAST) { - BOOL ret = False; + bool ret = False; /* * Ok - we finally have a complete RPC stream. * Call the rpc command to process it. @@ -692,7 +692,7 @@ static void process_complete_pdu(pipes_struct *p) prs_struct rpc_in; size_t data_len = p->in_data.pdu_received_len - RPC_HEADER_LEN; char *data_p = (char *)&p->in_data.current_in_pdu[RPC_HEADER_LEN]; - BOOL reply = False; + bool reply = False; if(p->fault_state) { DEBUG(10,("process_complete_pdu: pipe %s in fault state.\n", @@ -984,7 +984,7 @@ static ssize_t write_to_internal_pipe(void *np_conn, char *data, size_t n) ****************************************************************************/ ssize_t read_from_pipe(smb_np_struct *p, char *data, size_t n, - BOOL *is_data_outstanding) + bool *is_data_outstanding) { if (!p || !p->open) { DEBUG(0,("read_from_pipe: pipe not open\n")); @@ -1008,7 +1008,7 @@ ssize_t read_from_pipe(smb_np_struct *p, char *data, size_t n, ****************************************************************************/ static ssize_t read_from_internal_pipe(void *np_conn, char *data, size_t n, - BOOL *is_data_outstanding) + bool *is_data_outstanding) { pipes_struct *p = (pipes_struct*)np_conn; uint32 pdu_remaining = 0; @@ -1102,7 +1102,7 @@ returning %d bytes.\n", p->name, (unsigned int)p->out_data.current_pdu_len, Wait device state on a pipe. Exactly what this is for is unknown... ****************************************************************************/ -BOOL wait_rpc_pipe_hnd_state(smb_np_struct *p, uint16 priority) +bool wait_rpc_pipe_hnd_state(smb_np_struct *p, uint16 priority) { if (p == NULL) { return False; @@ -1127,7 +1127,7 @@ BOOL wait_rpc_pipe_hnd_state(smb_np_struct *p, uint16 priority) Set device state on a pipe. Exactly what this is for is unknown... ****************************************************************************/ -BOOL set_rpc_pipe_hnd_state(smb_np_struct *p, uint16 device_state) +bool set_rpc_pipe_hnd_state(smb_np_struct *p, uint16 device_state) { if (p == NULL) { return False; @@ -1152,7 +1152,7 @@ BOOL set_rpc_pipe_hnd_state(smb_np_struct *p, uint16 device_state) Close an rpc pipe. ****************************************************************************/ -BOOL close_rpc_pipe_hnd(smb_np_struct *p) +bool close_rpc_pipe_hnd(smb_np_struct *p) { if (!p) { DEBUG(0,("Invalid pipe in close_rpc_pipe_hnd\n")); @@ -1204,7 +1204,7 @@ void pipe_close_conn(connection_struct *conn) Close an rpc pipe. ****************************************************************************/ -static BOOL close_internal_rpc_pipe_hnd(void *np_conn) +static bool close_internal_rpc_pipe_hnd(void *np_conn) { pipes_struct *p = (pipes_struct *)np_conn; if (!p) { diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c index bdc082f647..a1deac083d 100644 --- a/source3/rpc_server/srv_samr.c +++ b/source3/rpc_server/srv_samr.c @@ -39,7 +39,7 @@ api_samr_close_hnd ********************************************************************/ -static BOOL api_samr_close_hnd(pipes_struct *p) +static bool api_samr_close_hnd(pipes_struct *p) { SAMR_Q_CLOSE_HND q_u; SAMR_R_CLOSE_HND r_u; @@ -69,7 +69,7 @@ static BOOL api_samr_close_hnd(pipes_struct *p) api_samr_open_domain ********************************************************************/ -static BOOL api_samr_open_domain(pipes_struct *p) +static bool api_samr_open_domain(pipes_struct *p) { SAMR_Q_OPEN_DOMAIN q_u; SAMR_R_OPEN_DOMAIN r_u; @@ -100,7 +100,7 @@ static BOOL api_samr_open_domain(pipes_struct *p) api_samr_get_usrdom_pwinfo ********************************************************************/ -static BOOL api_samr_get_usrdom_pwinfo(pipes_struct *p) +static bool api_samr_get_usrdom_pwinfo(pipes_struct *p) { SAMR_Q_GET_USRDOM_PWINFO q_u; SAMR_R_GET_USRDOM_PWINFO r_u; @@ -130,7 +130,7 @@ static BOOL api_samr_get_usrdom_pwinfo(pipes_struct *p) api_samr_set_sec_obj ********************************************************************/ -static BOOL api_samr_set_sec_obj(pipes_struct *p) +static bool api_samr_set_sec_obj(pipes_struct *p) { SAMR_Q_SET_SEC_OBJ q_u; SAMR_R_SET_SEC_OBJ r_u; @@ -160,7 +160,7 @@ static BOOL api_samr_set_sec_obj(pipes_struct *p) api_samr_query_sec_obj ********************************************************************/ -static BOOL api_samr_query_sec_obj(pipes_struct *p) +static bool api_samr_query_sec_obj(pipes_struct *p) { SAMR_Q_QUERY_SEC_OBJ q_u; SAMR_R_QUERY_SEC_OBJ r_u; @@ -190,7 +190,7 @@ static BOOL api_samr_query_sec_obj(pipes_struct *p) api_samr_enum_dom_users ********************************************************************/ -static BOOL api_samr_enum_dom_users(pipes_struct *p) +static bool api_samr_enum_dom_users(pipes_struct *p) { SAMR_Q_ENUM_DOM_USERS q_u; SAMR_R_ENUM_DOM_USERS r_u; @@ -221,7 +221,7 @@ static BOOL api_samr_enum_dom_users(pipes_struct *p) api_samr_enum_dom_groups ********************************************************************/ -static BOOL api_samr_enum_dom_groups(pipes_struct *p) +static bool api_samr_enum_dom_groups(pipes_struct *p) { SAMR_Q_ENUM_DOM_GROUPS q_u; SAMR_R_ENUM_DOM_GROUPS r_u; @@ -252,7 +252,7 @@ static BOOL api_samr_enum_dom_groups(pipes_struct *p) api_samr_enum_dom_aliases ********************************************************************/ -static BOOL api_samr_enum_dom_aliases(pipes_struct *p) +static bool api_samr_enum_dom_aliases(pipes_struct *p) { SAMR_Q_ENUM_DOM_ALIASES q_u; SAMR_R_ENUM_DOM_ALIASES r_u; @@ -283,7 +283,7 @@ static BOOL api_samr_enum_dom_aliases(pipes_struct *p) api_samr_query_dispinfo ********************************************************************/ -static BOOL api_samr_query_dispinfo(pipes_struct *p) +static bool api_samr_query_dispinfo(pipes_struct *p) { SAMR_Q_QUERY_DISPINFO q_u; SAMR_R_QUERY_DISPINFO r_u; @@ -313,7 +313,7 @@ static BOOL api_samr_query_dispinfo(pipes_struct *p) api_samr_query_aliasinfo ********************************************************************/ -static BOOL api_samr_query_aliasinfo(pipes_struct *p) +static bool api_samr_query_aliasinfo(pipes_struct *p) { SAMR_Q_QUERY_ALIASINFO q_u; SAMR_R_QUERY_ALIASINFO r_u; @@ -344,7 +344,7 @@ static BOOL api_samr_query_aliasinfo(pipes_struct *p) api_samr_lookup_names ********************************************************************/ -static BOOL api_samr_lookup_names(pipes_struct *p) +static bool api_samr_lookup_names(pipes_struct *p) { SAMR_Q_LOOKUP_NAMES q_u; SAMR_R_LOOKUP_NAMES r_u; @@ -375,7 +375,7 @@ static BOOL api_samr_lookup_names(pipes_struct *p) api_samr_chgpasswd_user ********************************************************************/ -static BOOL api_samr_chgpasswd_user(pipes_struct *p) +static bool api_samr_chgpasswd_user(pipes_struct *p) { SAMR_Q_CHGPASSWD_USER q_u; SAMR_R_CHGPASSWD_USER r_u; @@ -406,7 +406,7 @@ static BOOL api_samr_chgpasswd_user(pipes_struct *p) api_samr_lookup_rids ********************************************************************/ -static BOOL api_samr_lookup_rids(pipes_struct *p) +static bool api_samr_lookup_rids(pipes_struct *p) { SAMR_Q_LOOKUP_RIDS q_u; SAMR_R_LOOKUP_RIDS r_u; @@ -437,7 +437,7 @@ static BOOL api_samr_lookup_rids(pipes_struct *p) api_samr_open_user ********************************************************************/ -static BOOL api_samr_open_user(pipes_struct *p) +static bool api_samr_open_user(pipes_struct *p) { SAMR_Q_OPEN_USER q_u; SAMR_R_OPEN_USER r_u; @@ -467,7 +467,7 @@ static BOOL api_samr_open_user(pipes_struct *p) api_samr_query_userinfo ********************************************************************/ -static BOOL api_samr_query_userinfo(pipes_struct *p) +static bool api_samr_query_userinfo(pipes_struct *p) { SAMR_Q_QUERY_USERINFO q_u; SAMR_R_QUERY_USERINFO r_u; @@ -497,7 +497,7 @@ static BOOL api_samr_query_userinfo(pipes_struct *p) api_samr_query_usergroups ********************************************************************/ -static BOOL api_samr_query_usergroups(pipes_struct *p) +static bool api_samr_query_usergroups(pipes_struct *p) { SAMR_Q_QUERY_USERGROUPS q_u; SAMR_R_QUERY_USERGROUPS r_u; @@ -527,7 +527,7 @@ static BOOL api_samr_query_usergroups(pipes_struct *p) api_samr_query_domain_info ********************************************************************/ -static BOOL api_samr_query_domain_info(pipes_struct *p) +static bool api_samr_query_domain_info(pipes_struct *p) { SAMR_Q_QUERY_DOMAIN_INFO q_u; SAMR_R_QUERY_DOMAIN_INFO r_u; @@ -557,7 +557,7 @@ static BOOL api_samr_query_domain_info(pipes_struct *p) api_samr_create_user ********************************************************************/ -static BOOL api_samr_create_user(pipes_struct *p) +static bool api_samr_create_user(pipes_struct *p) { prs_struct *data = &p->in_data.data; prs_struct *rdata = &p->out_data.rdata; @@ -589,7 +589,7 @@ static BOOL api_samr_create_user(pipes_struct *p) api_samr_connect_anon ********************************************************************/ -static BOOL api_samr_connect_anon(pipes_struct *p) +static bool api_samr_connect_anon(pipes_struct *p) { SAMR_Q_CONNECT_ANON q_u; SAMR_R_CONNECT_ANON r_u; @@ -620,7 +620,7 @@ static BOOL api_samr_connect_anon(pipes_struct *p) api_samr_connect ********************************************************************/ -static BOOL api_samr_connect(pipes_struct *p) +static bool api_samr_connect(pipes_struct *p) { SAMR_Q_CONNECT q_u; SAMR_R_CONNECT r_u; @@ -651,7 +651,7 @@ static BOOL api_samr_connect(pipes_struct *p) api_samr_connect4 ********************************************************************/ -static BOOL api_samr_connect4(pipes_struct *p) +static bool api_samr_connect4(pipes_struct *p) { SAMR_Q_CONNECT4 q_u; SAMR_R_CONNECT4 r_u; @@ -682,7 +682,7 @@ static BOOL api_samr_connect4(pipes_struct *p) api_samr_chgpasswd_user3 ********************************************************************/ -static BOOL api_samr_chgpasswd_user3(pipes_struct *p) +static bool api_samr_chgpasswd_user3(pipes_struct *p) { SAMR_Q_CHGPASSWD_USER3 q_u; SAMR_R_CHGPASSWD_USER3 r_u; @@ -713,7 +713,7 @@ static BOOL api_samr_chgpasswd_user3(pipes_struct *p) api_samr_connect5 ********************************************************************/ -static BOOL api_samr_connect5(pipes_struct *p) +static bool api_samr_connect5(pipes_struct *p) { SAMR_Q_CONNECT5 q_u; SAMR_R_CONNECT5 r_u; @@ -744,7 +744,7 @@ static BOOL api_samr_connect5(pipes_struct *p) api_samr_lookup_domain **********************************************************************/ -static BOOL api_samr_lookup_domain(pipes_struct *p) +static bool api_samr_lookup_domain(pipes_struct *p) { SAMR_Q_LOOKUP_DOMAIN q_u; SAMR_R_LOOKUP_DOMAIN r_u; @@ -773,7 +773,7 @@ static BOOL api_samr_lookup_domain(pipes_struct *p) api_samr_enum_domains **********************************************************************/ -static BOOL api_samr_enum_domains(pipes_struct *p) +static bool api_samr_enum_domains(pipes_struct *p) { SAMR_Q_ENUM_DOMAINS q_u; SAMR_R_ENUM_DOMAINS r_u; @@ -802,7 +802,7 @@ static BOOL api_samr_enum_domains(pipes_struct *p) api_samr_open_alias ********************************************************************/ -static BOOL api_samr_open_alias(pipes_struct *p) +static bool api_samr_open_alias(pipes_struct *p) { SAMR_Q_OPEN_ALIAS q_u; SAMR_R_OPEN_ALIAS r_u; @@ -833,7 +833,7 @@ static BOOL api_samr_open_alias(pipes_struct *p) api_samr_set_userinfo ********************************************************************/ -static BOOL api_samr_set_userinfo(pipes_struct *p) +static bool api_samr_set_userinfo(pipes_struct *p) { SAMR_Q_SET_USERINFO q_u; SAMR_R_SET_USERINFO r_u; @@ -868,7 +868,7 @@ static BOOL api_samr_set_userinfo(pipes_struct *p) api_samr_set_userinfo2 ********************************************************************/ -static BOOL api_samr_set_userinfo2(pipes_struct *p) +static bool api_samr_set_userinfo2(pipes_struct *p) { SAMR_Q_SET_USERINFO2 q_u; SAMR_R_SET_USERINFO2 r_u; @@ -898,7 +898,7 @@ static BOOL api_samr_set_userinfo2(pipes_struct *p) api_samr_query_useraliases ********************************************************************/ -static BOOL api_samr_query_useraliases(pipes_struct *p) +static bool api_samr_query_useraliases(pipes_struct *p) { SAMR_Q_QUERY_USERALIASES q_u; SAMR_R_QUERY_USERALIASES r_u; @@ -928,7 +928,7 @@ static BOOL api_samr_query_useraliases(pipes_struct *p) api_samr_query_aliasmem ********************************************************************/ -static BOOL api_samr_query_aliasmem(pipes_struct *p) +static bool api_samr_query_aliasmem(pipes_struct *p) { SAMR_Q_QUERY_ALIASMEM q_u; SAMR_R_QUERY_ALIASMEM r_u; @@ -958,7 +958,7 @@ static BOOL api_samr_query_aliasmem(pipes_struct *p) api_samr_query_groupmem ********************************************************************/ -static BOOL api_samr_query_groupmem(pipes_struct *p) +static bool api_samr_query_groupmem(pipes_struct *p) { SAMR_Q_QUERY_GROUPMEM q_u; SAMR_R_QUERY_GROUPMEM r_u; @@ -988,7 +988,7 @@ static BOOL api_samr_query_groupmem(pipes_struct *p) api_samr_add_aliasmem ********************************************************************/ -static BOOL api_samr_add_aliasmem(pipes_struct *p) +static bool api_samr_add_aliasmem(pipes_struct *p) { SAMR_Q_ADD_ALIASMEM q_u; SAMR_R_ADD_ALIASMEM r_u; @@ -1018,7 +1018,7 @@ static BOOL api_samr_add_aliasmem(pipes_struct *p) api_samr_del_aliasmem ********************************************************************/ -static BOOL api_samr_del_aliasmem(pipes_struct *p) +static bool api_samr_del_aliasmem(pipes_struct *p) { SAMR_Q_DEL_ALIASMEM q_u; SAMR_R_DEL_ALIASMEM r_u; @@ -1048,7 +1048,7 @@ static BOOL api_samr_del_aliasmem(pipes_struct *p) api_samr_add_groupmem ********************************************************************/ -static BOOL api_samr_add_groupmem(pipes_struct *p) +static bool api_samr_add_groupmem(pipes_struct *p) { SAMR_Q_ADD_GROUPMEM q_u; SAMR_R_ADD_GROUPMEM r_u; @@ -1078,7 +1078,7 @@ static BOOL api_samr_add_groupmem(pipes_struct *p) api_samr_del_groupmem ********************************************************************/ -static BOOL api_samr_del_groupmem(pipes_struct *p) +static bool api_samr_del_groupmem(pipes_struct *p) { SAMR_Q_DEL_GROUPMEM q_u; SAMR_R_DEL_GROUPMEM r_u; @@ -1108,7 +1108,7 @@ static BOOL api_samr_del_groupmem(pipes_struct *p) api_samr_delete_dom_user ********************************************************************/ -static BOOL api_samr_delete_dom_user(pipes_struct *p) +static bool api_samr_delete_dom_user(pipes_struct *p) { SAMR_Q_DELETE_DOM_USER q_u; SAMR_R_DELETE_DOM_USER r_u; @@ -1138,7 +1138,7 @@ static BOOL api_samr_delete_dom_user(pipes_struct *p) api_samr_delete_dom_group ********************************************************************/ -static BOOL api_samr_delete_dom_group(pipes_struct *p) +static bool api_samr_delete_dom_group(pipes_struct *p) { SAMR_Q_DELETE_DOM_GROUP q_u; SAMR_R_DELETE_DOM_GROUP r_u; @@ -1168,7 +1168,7 @@ static BOOL api_samr_delete_dom_group(pipes_struct *p) api_samr_delete_dom_alias ********************************************************************/ -static BOOL api_samr_delete_dom_alias(pipes_struct *p) +static bool api_samr_delete_dom_alias(pipes_struct *p) { SAMR_Q_DELETE_DOM_ALIAS q_u; SAMR_R_DELETE_DOM_ALIAS r_u; @@ -1198,7 +1198,7 @@ static BOOL api_samr_delete_dom_alias(pipes_struct *p) api_samr_create_dom_group ********************************************************************/ -static BOOL api_samr_create_dom_group(pipes_struct *p) +static bool api_samr_create_dom_group(pipes_struct *p) { SAMR_Q_CREATE_DOM_GROUP q_u; SAMR_R_CREATE_DOM_GROUP r_u; @@ -1228,7 +1228,7 @@ static BOOL api_samr_create_dom_group(pipes_struct *p) api_samr_create_dom_alias ********************************************************************/ -static BOOL api_samr_create_dom_alias(pipes_struct *p) +static bool api_samr_create_dom_alias(pipes_struct *p) { SAMR_Q_CREATE_DOM_ALIAS q_u; SAMR_R_CREATE_DOM_ALIAS r_u; @@ -1258,7 +1258,7 @@ static BOOL api_samr_create_dom_alias(pipes_struct *p) api_samr_query_groupinfo ********************************************************************/ -static BOOL api_samr_query_groupinfo(pipes_struct *p) +static bool api_samr_query_groupinfo(pipes_struct *p) { SAMR_Q_QUERY_GROUPINFO q_u; SAMR_R_QUERY_GROUPINFO r_u; @@ -1288,7 +1288,7 @@ static BOOL api_samr_query_groupinfo(pipes_struct *p) api_samr_set_groupinfo ********************************************************************/ -static BOOL api_samr_set_groupinfo(pipes_struct *p) +static bool api_samr_set_groupinfo(pipes_struct *p) { SAMR_Q_SET_GROUPINFO q_u; SAMR_R_SET_GROUPINFO r_u; @@ -1318,7 +1318,7 @@ static BOOL api_samr_set_groupinfo(pipes_struct *p) api_samr_set_aliasinfo ********************************************************************/ -static BOOL api_samr_set_aliasinfo(pipes_struct *p) +static bool api_samr_set_aliasinfo(pipes_struct *p) { SAMR_Q_SET_ALIASINFO q_u; SAMR_R_SET_ALIASINFO r_u; @@ -1348,7 +1348,7 @@ static BOOL api_samr_set_aliasinfo(pipes_struct *p) api_samr_get_dom_pwinfo ********************************************************************/ -static BOOL api_samr_get_dom_pwinfo(pipes_struct *p) +static bool api_samr_get_dom_pwinfo(pipes_struct *p) { SAMR_Q_GET_DOM_PWINFO q_u; SAMR_R_GET_DOM_PWINFO r_u; @@ -1378,7 +1378,7 @@ static BOOL api_samr_get_dom_pwinfo(pipes_struct *p) api_samr_open_group ********************************************************************/ -static BOOL api_samr_open_group(pipes_struct *p) +static bool api_samr_open_group(pipes_struct *p) { SAMR_Q_OPEN_GROUP q_u; SAMR_R_OPEN_GROUP r_u; @@ -1408,7 +1408,7 @@ static BOOL api_samr_open_group(pipes_struct *p) api_samr_remove_sid_foreign_domain ********************************************************************/ -static BOOL api_samr_remove_sid_foreign_domain(pipes_struct *p) +static bool api_samr_remove_sid_foreign_domain(pipes_struct *p) { SAMR_Q_REMOVE_SID_FOREIGN_DOMAIN q_u; SAMR_R_REMOVE_SID_FOREIGN_DOMAIN r_u; @@ -1438,7 +1438,7 @@ static BOOL api_samr_remove_sid_foreign_domain(pipes_struct *p) api_samr_query_dom_info2 ********************************************************************/ -static BOOL api_samr_query_domain_info2(pipes_struct *p) +static bool api_samr_query_domain_info2(pipes_struct *p) { SAMR_Q_QUERY_DOMAIN_INFO2 q_u; SAMR_R_QUERY_DOMAIN_INFO2 r_u; @@ -1468,7 +1468,7 @@ static BOOL api_samr_query_domain_info2(pipes_struct *p) api_samr_set_dom_info ********************************************************************/ -static BOOL api_samr_set_dom_info(pipes_struct *p) +static bool api_samr_set_dom_info(pipes_struct *p) { SAMR_Q_SET_DOMAIN_INFO q_u; SAMR_R_SET_DOMAIN_INFO r_u; diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index bec288730a..9aabaf08ca 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -46,7 +46,7 @@ typedef struct disp_info { DOM_SID sid; /* identify which domain this is. */ - BOOL builtin_domain; /* Quick flag to check if this is the builtin domain. */ + bool builtin_domain; /* Quick flag to check if this is the builtin domain. */ struct pdb_search *users; /* querydispinfo 1 and 4 */ struct pdb_search *machines; /* querydispinfo 2 */ struct pdb_search *groups; /* querydispinfo 3 and 5, enumgroups */ @@ -65,7 +65,7 @@ typedef struct disp_info { struct samr_info { /* for use by the \PIPE\samr policy */ DOM_SID sid; - BOOL builtin_domain; /* Quick flag to check if this is the builtin domain. */ + bool builtin_domain; /* Quick flag to check if this is the builtin domain. */ uint32 status; /* some sort of flag. best to record it. comes from opnum 0x39 */ uint32 acc_granted; DISP_INFO *disp_info; @@ -651,7 +651,7 @@ NTSTATUS _samr_get_usrdom_pwinfo(pipes_struct *p, SAMR_Q_GET_USRDOM_PWINFO *q_u, /******************************************************************* ********************************************************************/ -static BOOL get_lsa_policy_samr_sid( pipes_struct *p, POLICY_HND *pol, +static bool get_lsa_policy_samr_sid( pipes_struct *p, POLICY_HND *pol, DOM_SID *sid, uint32 *acc_granted, DISP_INFO **ppdisp_info) { @@ -682,7 +682,7 @@ NTSTATUS _samr_set_sec_obj(pipes_struct *p, SAMR_Q_SET_SEC_OBJ *q_u, SAMR_R_SET_ DOM_SID pol_sid; uint32 acc_granted, i; SEC_ACL *dacl; - BOOL ret; + bool ret; struct samu *sampass=NULL; NTSTATUS status; @@ -738,10 +738,10 @@ NTSTATUS _samr_set_sec_obj(pipes_struct *p, SAMR_Q_SET_SEC_OBJ *q_u, SAMR_R_SET_ /******************************************************************* build correct perms based on policies and password times for _samr_query_sec_obj *******************************************************************/ -static BOOL check_change_pw_access(TALLOC_CTX *mem_ctx, DOM_SID *user_sid) +static bool check_change_pw_access(TALLOC_CTX *mem_ctx, DOM_SID *user_sid) { struct samu *sampass=NULL; - BOOL ret; + bool ret; if ( !(sampass = samu_new( mem_ctx )) ) { DEBUG(0,("No memory!\n")); @@ -1663,7 +1663,7 @@ NTSTATUS _samr_chgpasswd_user3(pipes_struct *p, SAMR_Q_CHGPASSWD_USER3 *q_u, SAM makes a SAMR_R_LOOKUP_RIDS structure. ********************************************************************/ -static BOOL make_samr_lookup_rids(TALLOC_CTX *ctx, uint32 num_names, +static bool make_samr_lookup_rids(TALLOC_CTX *ctx, uint32 num_names, const char **names, UNIHDR **pp_hdr_name, UNISTR2 **pp_uni_name) { @@ -1779,7 +1779,7 @@ NTSTATUS _samr_open_user(pipes_struct *p, SAMR_Q_OPEN_USER *q_u, SAMR_R_OPEN_USE uint32 acc_granted; uint32 des_access = q_u->access_mask; size_t sd_size; - BOOL ret; + bool ret; NTSTATUS nt_status; SE_PRIV se_rights; @@ -1850,7 +1850,7 @@ NTSTATUS _samr_open_user(pipes_struct *p, SAMR_Q_OPEN_USER *q_u, SAMR_R_OPEN_USE static NTSTATUS get_user_info_7(TALLOC_CTX *mem_ctx, SAM_USER_INFO_7 *id7, DOM_SID *user_sid) { struct samu *smbpass=NULL; - BOOL ret; + bool ret; if ( !(smbpass = samu_new( mem_ctx )) ) { return NT_STATUS_NO_MEMORY; @@ -1881,7 +1881,7 @@ static NTSTATUS get_user_info_7(TALLOC_CTX *mem_ctx, SAM_USER_INFO_7 *id7, DOM_S static NTSTATUS get_user_info_9(TALLOC_CTX *mem_ctx, SAM_USER_INFO_9 * id9, DOM_SID *user_sid) { struct samu *smbpass=NULL; - BOOL ret; + bool ret; if ( !(smbpass = samu_new( mem_ctx )) ) { return NT_STATUS_NO_MEMORY; @@ -1913,7 +1913,7 @@ static NTSTATUS get_user_info_9(TALLOC_CTX *mem_ctx, SAM_USER_INFO_9 * id9, DOM_ static NTSTATUS get_user_info_16(TALLOC_CTX *mem_ctx, SAM_USER_INFO_16 *id16, DOM_SID *user_sid) { struct samu *smbpass=NULL; - BOOL ret; + bool ret; if ( !(smbpass = samu_new( mem_ctx )) ) { return NT_STATUS_NO_MEMORY; @@ -1947,7 +1947,7 @@ static NTSTATUS get_user_info_16(TALLOC_CTX *mem_ctx, SAM_USER_INFO_16 *id16, DO static NTSTATUS get_user_info_18(pipes_struct *p, TALLOC_CTX *mem_ctx, SAM_USER_INFO_18 * id18, DOM_SID *user_sid) { struct samu *smbpass=NULL; - BOOL ret; + bool ret; if (p->auth.auth_type != PIPE_AUTH_TYPE_NTLMSSP || p->auth.auth_type != PIPE_AUTH_TYPE_SPNEGO_NTLMSSP) { return NT_STATUS_ACCESS_DENIED; @@ -1995,7 +1995,7 @@ static NTSTATUS get_user_info_18(pipes_struct *p, TALLOC_CTX *mem_ctx, SAM_USER_ static NTSTATUS get_user_info_20(TALLOC_CTX *mem_ctx, SAM_USER_INFO_20 *id20, DOM_SID *user_sid) { struct samu *sampass=NULL; - BOOL ret; + bool ret; if ( !(sampass = samu_new( mem_ctx )) ) { return NT_STATUS_NO_MEMORY; @@ -2030,7 +2030,7 @@ static NTSTATUS get_user_info_21(TALLOC_CTX *mem_ctx, SAM_USER_INFO_21 *id21, DOM_SID *user_sid, DOM_SID *domain_sid) { struct samu *sampass=NULL; - BOOL ret; + bool ret; NTSTATUS nt_status; if ( !(sampass = samu_new( mem_ctx )) ) { @@ -2174,9 +2174,9 @@ NTSTATUS _samr_query_usergroups(pipes_struct *p, SAMR_Q_QUERY_USERGROUPS *q_u, S gid_t *unix_gids; size_t i, num_gids; uint32 acc_granted; - BOOL ret; + bool ret; NTSTATUS result; - BOOL success = False; + bool success = False; /* * from the SID in the request: @@ -2486,7 +2486,7 @@ NTSTATUS _samr_query_domain_info(pipes_struct *p, static NTSTATUS can_create(TALLOC_CTX *mem_ctx, const char *new_name) { enum lsa_SidType type; - BOOL result; + bool result; DEBUG(10, ("Checking whether [%s] can be created\n", new_name)); @@ -2537,7 +2537,7 @@ NTSTATUS _samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, size_t sd_size; /* check this, when giving away 'add computer to domain' privs */ uint32 des_access = GENERIC_RIGHTS_USER_ALL_ACCESS; - BOOL can_add_account = False; + bool can_add_account = False; SE_PRIV se_rights; DISP_INFO *disp_info = NULL; @@ -2908,7 +2908,7 @@ NTSTATUS _samr_lookup_domain(pipes_struct *p, SAMR_Q_LOOKUP_DOMAIN *q_u, SAMR_R_ makes a SAMR_R_ENUM_DOMAINS structure. ********************************************************************/ -static BOOL make_enum_domains(TALLOC_CTX *ctx, SAM_ENTRY **pp_sam, +static bool make_enum_domains(TALLOC_CTX *ctx, SAM_ENTRY **pp_sam, UNISTR2 **pp_uni_name, uint32 num_sam_entries, fstring doms[]) { uint32 i; @@ -3028,7 +3028,7 @@ NTSTATUS _samr_open_alias(pipes_struct *p, SAMR_Q_OPEN_ALIAS *q_u, SAMR_R_OPEN_A { /* Check we actually have the requested alias */ enum lsa_SidType type; - BOOL result; + bool result; gid_t gid; become_root(); @@ -3105,7 +3105,7 @@ static NTSTATUS set_user_info_7(TALLOC_CTX *mem_ctx, set_user_info_16 ********************************************************************/ -static BOOL set_user_info_16(const SAM_USER_INFO_16 *id16, struct samu *pwd) +static bool set_user_info_16(const SAM_USER_INFO_16 *id16, struct samu *pwd) { if (id16 == NULL) { DEBUG(5, ("set_user_info_16: NULL id16\n")); @@ -3133,7 +3133,7 @@ static BOOL set_user_info_16(const SAM_USER_INFO_16 *id16, struct samu *pwd) set_user_info_18 ********************************************************************/ -static BOOL set_user_info_18(SAM_USER_INFO_18 *id18, struct samu *pwd) +static bool set_user_info_18(SAM_USER_INFO_18 *id18, struct samu *pwd) { if (id18 == NULL) { @@ -3168,7 +3168,7 @@ static BOOL set_user_info_18(SAM_USER_INFO_18 *id18, struct samu *pwd) set_user_info_20 ********************************************************************/ -static BOOL set_user_info_20(SAM_USER_INFO_20 *id20, struct samu *pwd) +static bool set_user_info_20(SAM_USER_INFO_20 *id20, struct samu *pwd) { if (id20 == NULL) { DEBUG(5, ("set_user_info_20: NULL id20\n")); @@ -3351,7 +3351,7 @@ static NTSTATUS set_user_info_23(TALLOC_CTX *mem_ctx, SAM_USER_INFO_23 *id23, set_user_info_pw ********************************************************************/ -static BOOL set_user_info_pw(uint8 *pass, struct samu *pwd) +static bool set_user_info_pw(uint8 *pass, struct samu *pwd) { uint32 len; pstring plaintext_buf; @@ -3481,8 +3481,8 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE SAM_USERINFO_CTR *ctr = q_u->ctr; uint32 acc_granted; uint32 acc_required; - BOOL ret; - BOOL has_enough_rights = False; + bool ret; + bool has_enough_rights = False; uint32 acb_info; DISP_INFO *disp_info = NULL; @@ -3651,8 +3651,8 @@ NTSTATUS _samr_set_userinfo2(pipes_struct *p, SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_ uint16 switch_value = q_u->switch_value; uint32 acc_granted; uint32 acc_required; - BOOL ret; - BOOL has_enough_rights = False; + bool ret; + bool has_enough_rights = False; uint32 acb_info; DISP_INFO *disp_info = NULL; @@ -3973,7 +3973,7 @@ NTSTATUS _samr_add_aliasmem(pipes_struct *p, SAMR_Q_ADD_ALIASMEM *q_u, SAMR_R_AD DOM_SID alias_sid; uint32 acc_granted; SE_PRIV se_rights; - BOOL can_add_accounts; + bool can_add_accounts; NTSTATUS ret; DISP_INFO *disp_info = NULL; @@ -4018,7 +4018,7 @@ NTSTATUS _samr_del_aliasmem(pipes_struct *p, SAMR_Q_DEL_ALIASMEM *q_u, SAMR_R_DE DOM_SID alias_sid; uint32 acc_granted; SE_PRIV se_rights; - BOOL can_add_accounts; + bool can_add_accounts; NTSTATUS ret; DISP_INFO *disp_info = NULL; @@ -4065,7 +4065,7 @@ NTSTATUS _samr_add_groupmem(pipes_struct *p, SAMR_Q_ADD_GROUPMEM *q_u, SAMR_R_AD uint32 group_rid; uint32 acc_granted; SE_PRIV se_rights; - BOOL can_add_accounts; + bool can_add_accounts; DISP_INFO *disp_info = NULL; /* Find the policy handle. Open a policy on it. */ @@ -4113,7 +4113,7 @@ NTSTATUS _samr_del_groupmem(pipes_struct *p, SAMR_Q_DEL_GROUPMEM *q_u, SAMR_R_DE uint32 group_rid; uint32 acc_granted; SE_PRIV se_rights; - BOOL can_add_accounts; + bool can_add_accounts; DISP_INFO *disp_info = NULL; /* @@ -4164,10 +4164,10 @@ NTSTATUS _samr_delete_dom_user(pipes_struct *p, SAMR_Q_DELETE_DOM_USER *q_u, SAM DOM_SID user_sid; struct samu *sam_pass=NULL; uint32 acc_granted; - BOOL can_add_accounts; + bool can_add_accounts; uint32 acb_info; DISP_INFO *disp_info = NULL; - BOOL ret; + bool ret; DEBUG(5, ("_samr_delete_dom_user: %d\n", __LINE__)); @@ -4248,7 +4248,7 @@ NTSTATUS _samr_delete_dom_group(pipes_struct *p, SAMR_Q_DELETE_DOM_GROUP *q_u, S uint32 group_rid; uint32 acc_granted; SE_PRIV se_rights; - BOOL can_add_accounts; + bool can_add_accounts; DISP_INFO *disp_info = NULL; DEBUG(5, ("samr_delete_dom_group: %d\n", __LINE__)); @@ -4308,7 +4308,7 @@ NTSTATUS _samr_delete_dom_alias(pipes_struct *p, SAMR_Q_DELETE_DOM_ALIAS *q_u, S DOM_SID alias_sid; uint32 acc_granted; SE_PRIV se_rights; - BOOL can_add_accounts; + bool can_add_accounts; NTSTATUS status; DISP_INFO *disp_info = NULL; @@ -4378,7 +4378,7 @@ NTSTATUS _samr_create_dom_group(pipes_struct *p, SAMR_Q_CREATE_DOM_GROUP *q_u, S struct samr_info *info; uint32 acc_granted; SE_PRIV se_rights; - BOOL can_add_accounts; + bool can_add_accounts; DISP_INFO *disp_info = NULL; /* Find the policy handle. Open a policy on it. */ @@ -4456,7 +4456,7 @@ NTSTATUS _samr_create_dom_alias(pipes_struct *p, SAMR_Q_CREATE_DOM_ALIAS *q_u, S gid_t gid; NTSTATUS result; SE_PRIV se_rights; - BOOL can_add_accounts; + bool can_add_accounts; DISP_INFO *disp_info = NULL; /* Find the policy handle. Open a policy on it. */ @@ -4543,7 +4543,7 @@ NTSTATUS _samr_query_groupinfo(pipes_struct *p, SAMR_Q_QUERY_GROUPINFO *q_u, SAM GROUP_MAP map; GROUP_INFO_CTR *ctr; uint32 acc_granted; - BOOL ret; + bool ret; if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted, NULL)) return NT_STATUS_INVALID_HANDLE; @@ -4638,8 +4638,8 @@ NTSTATUS _samr_set_groupinfo(pipes_struct *p, SAMR_Q_SET_GROUPINFO *q_u, SAMR_R_ GROUP_INFO_CTR *ctr; uint32 acc_granted; NTSTATUS ret; - BOOL result; - BOOL can_mod_accounts; + bool result; + bool can_mod_accounts; DISP_INFO *disp_info = NULL; if (!get_lsa_policy_samr_sid(p, &q_u->pol, &group_sid, &acc_granted, &disp_info)) @@ -4701,7 +4701,7 @@ NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_ struct acct_info info; ALIAS_INFO_CTR *ctr; uint32 acc_granted; - BOOL can_mod_accounts; + bool can_mod_accounts; NTSTATUS status; DISP_INFO *disp_info = NULL; @@ -4832,7 +4832,7 @@ NTSTATUS _samr_open_group(pipes_struct *p, SAMR_Q_OPEN_GROUP *q_u, SAMR_R_OPEN_G size_t sd_size; NTSTATUS status; fstring sid_string; - BOOL ret; + bool ret; SE_PRIV se_rights; if (!get_lsa_policy_samr_sid(p, &q_u->domain_pol, &sid, &acc_granted, NULL)) diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c old mode 100755 new mode 100644 index 32e0c6e4ed..7802fe447e --- a/source3/rpc_server/srv_spoolss.c +++ b/source3/rpc_server/srv_spoolss.c @@ -31,7 +31,7 @@ * api_spoolss_open_printer_ex (rarely seen - older call) ********************************************************************/ -static BOOL api_spoolss_open_printer(pipes_struct *p) +static bool api_spoolss_open_printer(pipes_struct *p) { SPOOL_Q_OPEN_PRINTER q_u; SPOOL_R_OPEN_PRINTER r_u; @@ -61,7 +61,7 @@ static BOOL api_spoolss_open_printer(pipes_struct *p) * api_spoolss_open_printer_ex ********************************************************************/ -static BOOL api_spoolss_open_printer_ex(pipes_struct *p) +static bool api_spoolss_open_printer_ex(pipes_struct *p) { SPOOL_Q_OPEN_PRINTER_EX q_u; SPOOL_R_OPEN_PRINTER_EX r_u; @@ -92,7 +92,7 @@ static BOOL api_spoolss_open_printer_ex(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_getprinterdata(pipes_struct *p) +static bool api_spoolss_getprinterdata(pipes_struct *p) { SPOOL_Q_GETPRINTERDATA q_u; SPOOL_R_GETPRINTERDATA r_u; @@ -124,7 +124,7 @@ static BOOL api_spoolss_getprinterdata(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_deleteprinterdata(pipes_struct *p) +static bool api_spoolss_deleteprinterdata(pipes_struct *p) { SPOOL_Q_DELETEPRINTERDATA q_u; SPOOL_R_DELETEPRINTERDATA r_u; @@ -156,7 +156,7 @@ static BOOL api_spoolss_deleteprinterdata(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_closeprinter(pipes_struct *p) +static bool api_spoolss_closeprinter(pipes_struct *p) { SPOOL_Q_CLOSEPRINTER q_u; SPOOL_R_CLOSEPRINTER r_u; @@ -187,7 +187,7 @@ static BOOL api_spoolss_closeprinter(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_abortprinter(pipes_struct *p) +static bool api_spoolss_abortprinter(pipes_struct *p) { SPOOL_Q_ABORTPRINTER q_u; SPOOL_R_ABORTPRINTER r_u; @@ -218,7 +218,7 @@ static BOOL api_spoolss_abortprinter(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_deleteprinter(pipes_struct *p) +static bool api_spoolss_deleteprinter(pipes_struct *p) { SPOOL_Q_DELETEPRINTER q_u; SPOOL_R_DELETEPRINTER r_u; @@ -250,7 +250,7 @@ static BOOL api_spoolss_deleteprinter(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_deleteprinterdriver(pipes_struct *p) +static bool api_spoolss_deleteprinterdriver(pipes_struct *p) { SPOOL_Q_DELETEPRINTERDRIVER q_u; SPOOL_R_DELETEPRINTERDRIVER r_u; @@ -281,7 +281,7 @@ static BOOL api_spoolss_deleteprinterdriver(pipes_struct *p) * ReplyFindFirstPrinterChangeNotifyEx ********************************************************************/ -static BOOL api_spoolss_rffpcnex(pipes_struct *p) +static bool api_spoolss_rffpcnex(pipes_struct *p) { SPOOL_Q_RFFPCNEX q_u; SPOOL_R_RFFPCNEX r_u; @@ -318,7 +318,7 @@ static BOOL api_spoolss_rffpcnex(pipes_struct *p) * JRA. ********************************************************************/ -static BOOL api_spoolss_rfnpcnex(pipes_struct *p) +static bool api_spoolss_rfnpcnex(pipes_struct *p) { SPOOL_Q_RFNPCNEX q_u; SPOOL_R_RFNPCNEX r_u; @@ -353,7 +353,7 @@ static BOOL api_spoolss_rfnpcnex(pipes_struct *p) * ********************************************************************/ -static BOOL api_spoolss_enumprinters(pipes_struct *p) +static bool api_spoolss_enumprinters(pipes_struct *p) { SPOOL_Q_ENUMPRINTERS q_u; SPOOL_R_ENUMPRINTERS r_u; @@ -384,7 +384,7 @@ static BOOL api_spoolss_enumprinters(pipes_struct *p) * ********************************************************************/ -static BOOL api_spoolss_getprinter(pipes_struct *p) +static bool api_spoolss_getprinter(pipes_struct *p) { SPOOL_Q_GETPRINTER q_u; SPOOL_R_GETPRINTER r_u; @@ -415,7 +415,7 @@ static BOOL api_spoolss_getprinter(pipes_struct *p) * ********************************************************************/ -static BOOL api_spoolss_getprinterdriver2(pipes_struct *p) +static bool api_spoolss_getprinterdriver2(pipes_struct *p) { SPOOL_Q_GETPRINTERDRIVER2 q_u; SPOOL_R_GETPRINTERDRIVER2 r_u; @@ -446,7 +446,7 @@ static BOOL api_spoolss_getprinterdriver2(pipes_struct *p) * ********************************************************************/ -static BOOL api_spoolss_startpageprinter(pipes_struct *p) +static bool api_spoolss_startpageprinter(pipes_struct *p) { SPOOL_Q_STARTPAGEPRINTER q_u; SPOOL_R_STARTPAGEPRINTER r_u; @@ -477,7 +477,7 @@ static BOOL api_spoolss_startpageprinter(pipes_struct *p) * ********************************************************************/ -static BOOL api_spoolss_endpageprinter(pipes_struct *p) +static bool api_spoolss_endpageprinter(pipes_struct *p) { SPOOL_Q_ENDPAGEPRINTER q_u; SPOOL_R_ENDPAGEPRINTER r_u; @@ -505,7 +505,7 @@ static BOOL api_spoolss_endpageprinter(pipes_struct *p) /******************************************************************** ********************************************************************/ -static BOOL api_spoolss_startdocprinter(pipes_struct *p) +static bool api_spoolss_startdocprinter(pipes_struct *p) { SPOOL_Q_STARTDOCPRINTER q_u; SPOOL_R_STARTDOCPRINTER r_u; @@ -533,7 +533,7 @@ static BOOL api_spoolss_startdocprinter(pipes_struct *p) /******************************************************************** ********************************************************************/ -static BOOL api_spoolss_enddocprinter(pipes_struct *p) +static bool api_spoolss_enddocprinter(pipes_struct *p) { SPOOL_Q_ENDDOCPRINTER q_u; SPOOL_R_ENDDOCPRINTER r_u; @@ -561,7 +561,7 @@ static BOOL api_spoolss_enddocprinter(pipes_struct *p) /******************************************************************** ********************************************************************/ -static BOOL api_spoolss_writeprinter(pipes_struct *p) +static bool api_spoolss_writeprinter(pipes_struct *p) { SPOOL_Q_WRITEPRINTER q_u; SPOOL_R_WRITEPRINTER r_u; @@ -590,7 +590,7 @@ static BOOL api_spoolss_writeprinter(pipes_struct *p) ****************************************************************************/ -static BOOL api_spoolss_setprinter(pipes_struct *p) +static bool api_spoolss_setprinter(pipes_struct *p) { SPOOL_Q_SETPRINTER q_u; SPOOL_R_SETPRINTER r_u; @@ -618,7 +618,7 @@ static BOOL api_spoolss_setprinter(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_fcpn(pipes_struct *p) +static bool api_spoolss_fcpn(pipes_struct *p) { SPOOL_Q_FCPN q_u; SPOOL_R_FCPN r_u; @@ -646,7 +646,7 @@ static BOOL api_spoolss_fcpn(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_addjob(pipes_struct *p) +static bool api_spoolss_addjob(pipes_struct *p) { SPOOL_Q_ADDJOB q_u; SPOOL_R_ADDJOB r_u; @@ -674,7 +674,7 @@ static BOOL api_spoolss_addjob(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumjobs(pipes_struct *p) +static bool api_spoolss_enumjobs(pipes_struct *p) { SPOOL_Q_ENUMJOBS q_u; SPOOL_R_ENUMJOBS r_u; @@ -702,7 +702,7 @@ static BOOL api_spoolss_enumjobs(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_schedulejob(pipes_struct *p) +static bool api_spoolss_schedulejob(pipes_struct *p) { SPOOL_Q_SCHEDULEJOB q_u; SPOOL_R_SCHEDULEJOB r_u; @@ -730,7 +730,7 @@ static BOOL api_spoolss_schedulejob(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_setjob(pipes_struct *p) +static bool api_spoolss_setjob(pipes_struct *p) { SPOOL_Q_SETJOB q_u; SPOOL_R_SETJOB r_u; @@ -758,7 +758,7 @@ static BOOL api_spoolss_setjob(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprinterdrivers(pipes_struct *p) +static bool api_spoolss_enumprinterdrivers(pipes_struct *p) { SPOOL_Q_ENUMPRINTERDRIVERS q_u; SPOOL_R_ENUMPRINTERDRIVERS r_u; @@ -786,7 +786,7 @@ static BOOL api_spoolss_enumprinterdrivers(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_getform(pipes_struct *p) +static bool api_spoolss_getform(pipes_struct *p) { SPOOL_Q_GETFORM q_u; SPOOL_R_GETFORM r_u; @@ -814,7 +814,7 @@ static BOOL api_spoolss_getform(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumforms(pipes_struct *p) +static bool api_spoolss_enumforms(pipes_struct *p) { SPOOL_Q_ENUMFORMS q_u; SPOOL_R_ENUMFORMS r_u; @@ -842,7 +842,7 @@ static BOOL api_spoolss_enumforms(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumports(pipes_struct *p) +static bool api_spoolss_enumports(pipes_struct *p) { SPOOL_Q_ENUMPORTS q_u; SPOOL_R_ENUMPORTS r_u; @@ -870,7 +870,7 @@ static BOOL api_spoolss_enumports(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_addprinterex(pipes_struct *p) +static bool api_spoolss_addprinterex(pipes_struct *p) { SPOOL_Q_ADDPRINTEREX q_u; SPOOL_R_ADDPRINTEREX r_u; @@ -898,7 +898,7 @@ static BOOL api_spoolss_addprinterex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_addprinterdriver(pipes_struct *p) +static bool api_spoolss_addprinterdriver(pipes_struct *p) { SPOOL_Q_ADDPRINTERDRIVER q_u; SPOOL_R_ADDPRINTERDRIVER r_u; @@ -935,7 +935,7 @@ static BOOL api_spoolss_addprinterdriver(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_getprinterdriverdirectory(pipes_struct *p) +static bool api_spoolss_getprinterdriverdirectory(pipes_struct *p) { SPOOL_Q_GETPRINTERDRIVERDIR q_u; SPOOL_R_GETPRINTERDRIVERDIR r_u; @@ -963,7 +963,7 @@ static BOOL api_spoolss_getprinterdriverdirectory(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprinterdata(pipes_struct *p) +static bool api_spoolss_enumprinterdata(pipes_struct *p) { SPOOL_Q_ENUMPRINTERDATA q_u; SPOOL_R_ENUMPRINTERDATA r_u; @@ -991,7 +991,7 @@ static BOOL api_spoolss_enumprinterdata(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_setprinterdata(pipes_struct *p) +static bool api_spoolss_setprinterdata(pipes_struct *p) { SPOOL_Q_SETPRINTERDATA q_u; SPOOL_R_SETPRINTERDATA r_u; @@ -1018,7 +1018,7 @@ static BOOL api_spoolss_setprinterdata(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_reset_printer(pipes_struct *p) +static bool api_spoolss_reset_printer(pipes_struct *p) { SPOOL_Q_RESETPRINTER q_u; SPOOL_R_RESETPRINTER r_u; @@ -1045,7 +1045,7 @@ static BOOL api_spoolss_reset_printer(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_addform(pipes_struct *p) +static bool api_spoolss_addform(pipes_struct *p) { SPOOL_Q_ADDFORM q_u; SPOOL_R_ADDFORM r_u; @@ -1073,7 +1073,7 @@ static BOOL api_spoolss_addform(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_deleteform(pipes_struct *p) +static bool api_spoolss_deleteform(pipes_struct *p) { SPOOL_Q_DELETEFORM q_u; SPOOL_R_DELETEFORM r_u; @@ -1101,7 +1101,7 @@ static BOOL api_spoolss_deleteform(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_setform(pipes_struct *p) +static bool api_spoolss_setform(pipes_struct *p) { SPOOL_Q_SETFORM q_u; SPOOL_R_SETFORM r_u; @@ -1129,7 +1129,7 @@ static BOOL api_spoolss_setform(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprintprocessors(pipes_struct *p) +static bool api_spoolss_enumprintprocessors(pipes_struct *p) { SPOOL_Q_ENUMPRINTPROCESSORS q_u; SPOOL_R_ENUMPRINTPROCESSORS r_u; @@ -1157,7 +1157,7 @@ static BOOL api_spoolss_enumprintprocessors(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_addprintprocessor(pipes_struct *p) +static bool api_spoolss_addprintprocessor(pipes_struct *p) { SPOOL_Q_ADDPRINTPROCESSOR q_u; SPOOL_R_ADDPRINTPROCESSOR r_u; @@ -1189,7 +1189,7 @@ static BOOL api_spoolss_addprintprocessor(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprintprocdatatypes(pipes_struct *p) +static bool api_spoolss_enumprintprocdatatypes(pipes_struct *p) { SPOOL_Q_ENUMPRINTPROCDATATYPES q_u; SPOOL_R_ENUMPRINTPROCDATATYPES r_u; @@ -1217,7 +1217,7 @@ static BOOL api_spoolss_enumprintprocdatatypes(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprintmonitors(pipes_struct *p) +static bool api_spoolss_enumprintmonitors(pipes_struct *p) { SPOOL_Q_ENUMPRINTMONITORS q_u; SPOOL_R_ENUMPRINTMONITORS r_u; @@ -1245,7 +1245,7 @@ static BOOL api_spoolss_enumprintmonitors(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_getjob(pipes_struct *p) +static bool api_spoolss_getjob(pipes_struct *p) { SPOOL_Q_GETJOB q_u; SPOOL_R_GETJOB r_u; @@ -1276,7 +1276,7 @@ static BOOL api_spoolss_getjob(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_getprinterdataex(pipes_struct *p) +static bool api_spoolss_getprinterdataex(pipes_struct *p) { SPOOL_Q_GETPRINTERDATAEX q_u; SPOOL_R_GETPRINTERDATAEX r_u; @@ -1305,7 +1305,7 @@ static BOOL api_spoolss_getprinterdataex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_setprinterdataex(pipes_struct *p) +static bool api_spoolss_setprinterdataex(pipes_struct *p) { SPOOL_Q_SETPRINTERDATAEX q_u; SPOOL_R_SETPRINTERDATAEX r_u; @@ -1334,7 +1334,7 @@ static BOOL api_spoolss_setprinterdataex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprinterkey(pipes_struct *p) +static bool api_spoolss_enumprinterkey(pipes_struct *p) { SPOOL_Q_ENUMPRINTERKEY q_u; SPOOL_R_ENUMPRINTERKEY r_u; @@ -1362,7 +1362,7 @@ static BOOL api_spoolss_enumprinterkey(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprinterdataex(pipes_struct *p) +static bool api_spoolss_enumprinterdataex(pipes_struct *p) { SPOOL_Q_ENUMPRINTERDATAEX q_u; SPOOL_R_ENUMPRINTERDATAEX r_u; @@ -1390,7 +1390,7 @@ static BOOL api_spoolss_enumprinterdataex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_getprintprocessordirectory(pipes_struct *p) +static bool api_spoolss_getprintprocessordirectory(pipes_struct *p) { SPOOL_Q_GETPRINTPROCESSORDIRECTORY q_u; SPOOL_R_GETPRINTPROCESSORDIRECTORY r_u; @@ -1418,7 +1418,7 @@ static BOOL api_spoolss_getprintprocessordirectory(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_deleteprinterdataex(pipes_struct *p) +static bool api_spoolss_deleteprinterdataex(pipes_struct *p) { SPOOL_Q_DELETEPRINTERDATAEX q_u; SPOOL_R_DELETEPRINTERDATAEX r_u; @@ -1446,7 +1446,7 @@ static BOOL api_spoolss_deleteprinterdataex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_deleteprinterkey(pipes_struct *p) +static bool api_spoolss_deleteprinterkey(pipes_struct *p) { SPOOL_Q_DELETEPRINTERKEY q_u; SPOOL_R_DELETEPRINTERKEY r_u; @@ -1474,7 +1474,7 @@ static BOOL api_spoolss_deleteprinterkey(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_addprinterdriverex(pipes_struct *p) +static bool api_spoolss_addprinterdriverex(pipes_struct *p) { SPOOL_Q_ADDPRINTERDRIVEREX q_u; SPOOL_R_ADDPRINTERDRIVEREX r_u; @@ -1511,7 +1511,7 @@ static BOOL api_spoolss_addprinterdriverex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_deleteprinterdriverex(pipes_struct *p) +static bool api_spoolss_deleteprinterdriverex(pipes_struct *p) { SPOOL_Q_DELETEPRINTERDRIVEREX q_u; SPOOL_R_DELETEPRINTERDRIVEREX r_u; @@ -1539,7 +1539,7 @@ static BOOL api_spoolss_deleteprinterdriverex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_xcvdataport(pipes_struct *p) +static bool api_spoolss_xcvdataport(pipes_struct *p) { SPOOL_Q_XCVDATAPORT q_u; SPOOL_R_XCVDATAPORT r_u; diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 1bed2bf095..658ed99400 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -267,7 +267,7 @@ static Printer_entry *find_printer_index_by_hnd(pipes_struct *p, POLICY_HND *hnd Close printer index by handle. ****************************************************************************/ -static BOOL close_printer_handle(pipes_struct *p, POLICY_HND *hnd) +static bool close_printer_handle(pipes_struct *p, POLICY_HND *hnd) { Printer_entry *Printer = find_printer_index_by_hnd(p, hnd); @@ -290,7 +290,7 @@ WERROR delete_printer_hook( NT_USER_TOKEN *token, const char *sharename ) pstring command; int ret; SE_PRIV se_printop = SE_PRINT_OPERATOR; - BOOL is_print_op = False; + bool is_print_op = False; /* can't fail if we don't try */ @@ -374,7 +374,7 @@ static WERROR delete_printer_handle(pipes_struct *p, POLICY_HND *hnd) Return the snum of a printer corresponding to an handle. ****************************************************************************/ -static BOOL get_printer_snum(pipes_struct *p, POLICY_HND *hnd, int *number, +static bool get_printer_snum(pipes_struct *p, POLICY_HND *hnd, int *number, struct share_params **params) { Printer_entry *Printer = find_printer_index_by_hnd(p, hnd); @@ -401,7 +401,7 @@ static BOOL get_printer_snum(pipes_struct *p, POLICY_HND *hnd, int *number, Check if it's \\server or \\server\printer ****************************************************************************/ -static BOOL set_printer_hnd_printertype(Printer_entry *Printer, char *handlename) +static bool set_printer_hnd_printertype(Printer_entry *Printer, char *handlename) { DEBUG(3,("Setting printer type=%s\n", handlename)); @@ -431,14 +431,14 @@ static BOOL set_printer_hnd_printertype(Printer_entry *Printer, char *handlename XcvDataPort() interface. ****************************************************************************/ -static BOOL set_printer_hnd_name(Printer_entry *Printer, char *handlename) +static bool set_printer_hnd_name(Printer_entry *Printer, char *handlename) { int snum; int n_services=lp_numservices(); char *aprinter, *printername; const char *servername; fstring sname; - BOOL found=False; + bool found=False; NT_PRINTER_INFO_LEVEL *printer = NULL; WERROR result; @@ -558,7 +558,7 @@ static BOOL set_printer_hnd_name(Printer_entry *Printer, char *handlename) Find first available printer slot. creates a printer handle for you. ****************************************************************************/ -static BOOL open_printer_hnd(pipes_struct *p, POLICY_HND *hnd, char *name, uint32 access_granted) +static bool open_printer_hnd(pipes_struct *p, POLICY_HND *hnd, char *name, uint32 access_granted) { Printer_entry *new_printer; @@ -607,13 +607,13 @@ static BOOL open_printer_hnd(pipes_struct *p, POLICY_HND *hnd, char *name, uint3 given by (notify_type, notify_field). **************************************************************************/ -static BOOL is_monitoring_event_flags(uint32 flags, uint16 notify_type, +static bool is_monitoring_event_flags(uint32 flags, uint16 notify_type, uint16 notify_field) { return True; } -static BOOL is_monitoring_event(Printer_entry *p, uint16 notify_type, +static bool is_monitoring_event(Printer_entry *p, uint16 notify_type, uint16 notify_field) { SPOOL_NOTIFY_OPTION *option = p->notify.option; @@ -1062,7 +1062,7 @@ done: /*********************************************************************** **********************************************************************/ -static BOOL notify2_unpack_msg( SPOOLSS_NOTIFY_MSG *msg, struct timeval *tv, void *buf, size_t len ) +static bool notify2_unpack_msg( SPOOLSS_NOTIFY_MSG *msg, struct timeval *tv, void *buf, size_t len ) { uint32 tv_sec, tv_usec; @@ -1198,7 +1198,7 @@ static void receive_notify2_message_list(struct messaging_context *msg, driver ********************************************************************/ -static BOOL srv_spoolss_drv_upgrade_printer(char* drivername) +static bool srv_spoolss_drv_upgrade_printer(char* drivername) { int len = strlen(drivername); @@ -1301,7 +1301,7 @@ void update_monitored_printq_cache( void ) driver ********************************************************************/ -static BOOL srv_spoolss_reset_printerdata(char* drivername) +static bool srv_spoolss_reset_printerdata(char* drivername) { int len = strlen(drivername); @@ -1741,10 +1741,10 @@ WERROR _spoolss_open_printer_ex( pipes_struct *p, SPOOL_Q_OPEN_PRINTER_EX *q_u, /**************************************************************************** ****************************************************************************/ -static BOOL convert_printer_info(const SPOOL_PRINTER_INFO_LEVEL *uni, +static bool convert_printer_info(const SPOOL_PRINTER_INFO_LEVEL *uni, NT_PRINTER_INFO_LEVEL *printer, uint32 level) { - BOOL ret; + bool ret; switch (level) { case 2: @@ -1769,10 +1769,10 @@ static BOOL convert_printer_info(const SPOOL_PRINTER_INFO_LEVEL *uni, return False; } -static BOOL convert_printer_driver_info(const SPOOL_PRINTER_DRIVER_INFO_LEVEL *uni, +static bool convert_printer_driver_info(const SPOOL_PRINTER_DRIVER_INFO_LEVEL *uni, NT_PRINTER_DRIVER_INFO_LEVEL *printer, uint32 level) { - BOOL result = True; + bool result = True; switch (level) { case 3: @@ -1792,7 +1792,7 @@ static BOOL convert_printer_driver_info(const SPOOL_PRINTER_DRIVER_INFO_LEVEL *u return result; } -BOOL convert_devicemode(const char *printername, const DEVICEMODE *devmode, +bool convert_devicemode(const char *printername, const DEVICEMODE *devmode, NT_DEVICEMODE **pp_nt_devmode) { NT_DEVICEMODE *nt_devmode = *pp_nt_devmode; @@ -2069,7 +2069,7 @@ WERROR _spoolss_deleteprinterdriverex(pipes_struct *p, SPOOL_Q_DELETEPRINTERDRIV NT_PRINTER_DRIVER_INFO_LEVEL info_win2k; int version; uint32 flags = q_u->delete_flags; - BOOL delete_files; + bool delete_files; WERROR status; WERROR status_win2k = WERR_ACCESS_DENIED; SE_PRIV se_printop = SE_PRINT_OPERATOR; @@ -2527,7 +2527,7 @@ done: Connect to the client machine. **********************************************************/ -static BOOL spoolss_connect_to_client(struct rpc_pipe_client **pp_pipe, +static bool spoolss_connect_to_client(struct rpc_pipe_client **pp_pipe, struct in_addr *client_ip, const char *remote_machine) { NTSTATUS ret; @@ -2594,7 +2594,7 @@ static BOOL spoolss_connect_to_client(struct rpc_pipe_client **pp_pipe, Connect to the client. ****************************************************************************/ -static BOOL srv_spoolss_replyopenprinter(int snum, const char *printer, +static bool srv_spoolss_replyopenprinter(int snum, const char *printer, uint32 localprinter, uint32 type, POLICY_HND *handle, struct in_addr *client_ip) { @@ -3564,7 +3564,7 @@ static uint32 type_of_notify_info_data(uint16 type, uint16 field) /**************************************************************************** ****************************************************************************/ -static BOOL search_notify(uint16 type, uint16 field, int *value) +static bool search_notify(uint16 type, uint16 field, int *value) { int i; @@ -3601,7 +3601,7 @@ void construct_info_data(SPOOL_NOTIFY_INFO_DATA *info_data, uint16 type, uint16 * ********************************************************************/ -static BOOL construct_notify_printer_info(Printer_entry *print_hnd, SPOOL_NOTIFY_INFO *info, int +static bool construct_notify_printer_info(Printer_entry *print_hnd, SPOOL_NOTIFY_INFO *info, int snum, SPOOL_NOTIFY_OPTION_TYPE *option_type, uint32 id, TALLOC_CTX *mem_ctx) @@ -3660,7 +3660,7 @@ static BOOL construct_notify_printer_info(Printer_entry *print_hnd, SPOOL_NOTIFY * ********************************************************************/ -static BOOL construct_notify_jobs_info(print_queue_struct *queue, +static bool construct_notify_jobs_info(print_queue_struct *queue, SPOOL_NOTIFY_INFO *info, NT_PRINTER_INFO_LEVEL *printer, int snum, SPOOL_NOTIFY_OPTION_TYPE @@ -3946,7 +3946,7 @@ done: * fill a printer_info_0 struct ********************************************************************/ -static BOOL construct_printer_info_0(Printer_entry *print_hnd, PRINTER_INFO_0 *printer, int snum) +static bool construct_printer_info_0(Printer_entry *print_hnd, PRINTER_INFO_0 *printer, int snum) { pstring chaine; int count; @@ -4051,7 +4051,7 @@ static BOOL construct_printer_info_0(Printer_entry *print_hnd, PRINTER_INFO_0 *p * construct_printer_info_1 * fill a printer_info_1 struct ********************************************************************/ -static BOOL construct_printer_info_1(Printer_entry *print_hnd, uint32 flags, PRINTER_INFO_1 *printer, int snum) +static bool construct_printer_info_1(Printer_entry *print_hnd, uint32 flags, PRINTER_INFO_1 *printer, int snum) { pstring chaine; pstring chaine2; @@ -4102,7 +4102,7 @@ static void free_dev_mode(DEVICEMODE *dev) should be valid upon entry ****************************************************************************/ -static BOOL convert_nt_devicemode( DEVICEMODE *devmode, NT_DEVICEMODE *ntdevmode ) +static bool convert_nt_devicemode( DEVICEMODE *devmode, NT_DEVICEMODE *ntdevmode ) { if ( !devmode || !ntdevmode ) return False; @@ -4189,7 +4189,7 @@ done: * fill a printer_info_2 struct ********************************************************************/ -static BOOL construct_printer_info_2(Printer_entry *print_hnd, PRINTER_INFO_2 *printer, int snum) +static bool construct_printer_info_2(Printer_entry *print_hnd, PRINTER_INFO_2 *printer, int snum) { int count; NT_PRINTER_INFO_LEVEL *ntprinter = NULL; @@ -4254,7 +4254,7 @@ static BOOL construct_printer_info_2(Printer_entry *print_hnd, PRINTER_INFO_2 *p * fill a printer_info_3 struct ********************************************************************/ -static BOOL construct_printer_info_3(Printer_entry *print_hnd, PRINTER_INFO_3 **pp_printer, int snum) +static bool construct_printer_info_3(Printer_entry *print_hnd, PRINTER_INFO_3 **pp_printer, int snum) { NT_PRINTER_INFO_LEVEL *ntprinter = NULL; PRINTER_INFO_3 *printer = NULL; @@ -4292,7 +4292,7 @@ static BOOL construct_printer_info_3(Printer_entry *print_hnd, PRINTER_INFO_3 ** * fill a printer_info_4 struct ********************************************************************/ -static BOOL construct_printer_info_4(Printer_entry *print_hnd, PRINTER_INFO_4 *printer, int snum) +static bool construct_printer_info_4(Printer_entry *print_hnd, PRINTER_INFO_4 *printer, int snum) { NT_PRINTER_INFO_LEVEL *ntprinter = NULL; @@ -4312,7 +4312,7 @@ static BOOL construct_printer_info_4(Printer_entry *print_hnd, PRINTER_INFO_4 *p * fill a printer_info_5 struct ********************************************************************/ -static BOOL construct_printer_info_5(Printer_entry *print_hnd, PRINTER_INFO_5 *printer, int snum) +static bool construct_printer_info_5(Printer_entry *print_hnd, PRINTER_INFO_5 *printer, int snum) { NT_PRINTER_INFO_LEVEL *ntprinter = NULL; @@ -4338,7 +4338,7 @@ static BOOL construct_printer_info_5(Printer_entry *print_hnd, PRINTER_INFO_5 *p * fill a printer_info_6 struct ********************************************************************/ -static BOOL construct_printer_info_6(Printer_entry *print_hnd, +static bool construct_printer_info_6(Printer_entry *print_hnd, PRINTER_INFO_6 *printer, int snum) { @@ -4364,7 +4364,7 @@ static BOOL construct_printer_info_6(Printer_entry *print_hnd, * fill a printer_info_7 struct ********************************************************************/ -static BOOL construct_printer_info_7(Printer_entry *print_hnd, PRINTER_INFO_7 *printer, int snum) +static bool construct_printer_info_7(Printer_entry *print_hnd, PRINTER_INFO_7 *printer, int snum) { char *guid_str = NULL; struct GUID guid; @@ -6057,7 +6057,7 @@ static WERROR update_printer_sec(POLICY_HND *handle, uint32 level, _spoolss_open_printer_ex(). ********************************************************************/ -static BOOL check_printer_ok(NT_PRINTER_INFO_LEVEL_2 *info, int snum) +static bool check_printer_ok(NT_PRINTER_INFO_LEVEL_2 *info, int snum) { fstring printername; const char *p; @@ -6109,7 +6109,7 @@ WERROR add_port_hook(NT_USER_TOKEN *token, const char *portname, const char *uri int ret; int fd; SE_PRIV se_printop = SE_PRINT_OPERATOR; - BOOL is_print_op = False; + bool is_print_op = False; if ( !*cmd ) { return WERR_ACCESS_DENIED; @@ -6148,7 +6148,7 @@ WERROR add_port_hook(NT_USER_TOKEN *token, const char *portname, const char *uri /**************************************************************************** ****************************************************************************/ -BOOL add_printer_hook(NT_USER_TOKEN *token, NT_PRINTER_INFO_LEVEL *printer) +bool add_printer_hook(NT_USER_TOKEN *token, NT_PRINTER_INFO_LEVEL *printer) { char *cmd = lp_addprinter_cmd(); char **qlines; @@ -6158,7 +6158,7 @@ BOOL add_printer_hook(NT_USER_TOKEN *token, NT_PRINTER_INFO_LEVEL *printer) int fd; fstring remote_machine = "%m"; SE_PRIV se_printop = SE_PRINT_OPERATOR; - BOOL is_print_op = False; + bool is_print_op = False; standard_sub_basic(current_user_info.smb_name, current_user_info.domain, @@ -6574,7 +6574,7 @@ static void fill_job_info_1(JOB_INFO_1 *job_info, const print_queue_struct *queu /**************************************************************************** ****************************************************************************/ -static BOOL fill_job_info_2(JOB_INFO_2 *job_info, const print_queue_struct *queue, +static bool fill_job_info_2(JOB_INFO_2 *job_info, const print_queue_struct *queue, int position, int snum, const NT_PRINTER_INFO_LEVEL *ntprinter, DEVICEMODE *devmode) @@ -7286,7 +7286,7 @@ WERROR _spoolss_getform(pipes_struct *p, SPOOL_Q_GETFORM *q_u, SPOOL_R_GETFORM * nt_forms_struct *list=NULL; nt_forms_struct builtin_form; - BOOL foundBuiltin; + bool foundBuiltin; FORM_1 form_1; fstring form_name; int buffer_size=0; @@ -8843,7 +8843,7 @@ static WERROR getjob_level_1(print_queue_struct **queue, int count, int snum, uint32 *needed) { int i=0; - BOOL found=False; + bool found=False; JOB_INFO_1 *info_1=NULL; WERROR result = WERR_OK; @@ -8895,7 +8895,7 @@ static WERROR getjob_level_2(print_queue_struct **queue, int count, int snum, uint32 *needed) { int i = 0; - BOOL found = False; + bool found = False; JOB_INFO_2 *info_2; WERROR result; DEVICEMODE *devmode = NULL; diff --git a/source3/rpc_server/srv_srvsvc.c b/source3/rpc_server/srv_srvsvc.c index 92ed7274cc..25e652c1fd 100644 --- a/source3/rpc_server/srv_srvsvc.c +++ b/source3/rpc_server/srv_srvsvc.c @@ -29,7 +29,7 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV -static BOOL proxy_srvsvc_call(pipes_struct *p, uint8 opnum) +static bool proxy_srvsvc_call(pipes_struct *p, uint8 opnum) { struct api_struct *fns; int n_fns; @@ -50,7 +50,7 @@ static BOOL proxy_srvsvc_call(pipes_struct *p, uint8 opnum) api_srv_net_srv_get_info ********************************************************************/ -static BOOL api_srv_net_srv_get_info(pipes_struct *p) +static bool api_srv_net_srv_get_info(pipes_struct *p) { SRV_Q_NET_SRV_GET_INFO q_u; SRV_R_NET_SRV_GET_INFO r_u; @@ -77,7 +77,7 @@ static BOOL api_srv_net_srv_get_info(pipes_struct *p) api_srv_net_srv_get_info ********************************************************************/ -static BOOL api_srv_net_srv_set_info(pipes_struct *p) +static bool api_srv_net_srv_set_info(pipes_struct *p) { SRV_Q_NET_SRV_SET_INFO q_u; SRV_R_NET_SRV_SET_INFO r_u; @@ -104,7 +104,7 @@ static BOOL api_srv_net_srv_set_info(pipes_struct *p) api_srv_net_file_enum ********************************************************************/ -static BOOL api_srv_net_file_enum(pipes_struct *p) +static bool api_srv_net_file_enum(pipes_struct *p) { SRV_Q_NET_FILE_ENUM q_u; SRV_R_NET_FILE_ENUM r_u; @@ -131,7 +131,7 @@ static BOOL api_srv_net_file_enum(pipes_struct *p) api_srv_net_conn_enum ********************************************************************/ -static BOOL api_srv_net_conn_enum(pipes_struct *p) +static bool api_srv_net_conn_enum(pipes_struct *p) { SRV_Q_NET_CONN_ENUM q_u; SRV_R_NET_CONN_ENUM r_u; @@ -158,7 +158,7 @@ static BOOL api_srv_net_conn_enum(pipes_struct *p) Enumerate sessions. ********************************************************************/ -static BOOL api_srv_net_sess_enum(pipes_struct *p) +static bool api_srv_net_sess_enum(pipes_struct *p) { SRV_Q_NET_SESS_ENUM q_u; SRV_R_NET_SESS_ENUM r_u; @@ -186,7 +186,7 @@ static BOOL api_srv_net_sess_enum(pipes_struct *p) Delete session. ********************************************************************/ -static BOOL api_srv_net_sess_del(pipes_struct *p) +static bool api_srv_net_sess_del(pipes_struct *p) { SRV_Q_NET_SESS_DEL q_u; SRV_R_NET_SESS_DEL r_u; @@ -214,7 +214,7 @@ static BOOL api_srv_net_sess_del(pipes_struct *p) RPC to enumerate shares. ********************************************************************/ -static BOOL api_srv_net_share_enum_all(pipes_struct *p) +static bool api_srv_net_share_enum_all(pipes_struct *p) { SRV_Q_NET_SHARE_ENUM q_u; SRV_R_NET_SHARE_ENUM r_u; @@ -244,7 +244,7 @@ static BOOL api_srv_net_share_enum_all(pipes_struct *p) RPC to enumerate shares. ********************************************************************/ -static BOOL api_srv_net_share_enum(pipes_struct *p) +static bool api_srv_net_share_enum(pipes_struct *p) { SRV_Q_NET_SHARE_ENUM q_u; SRV_R_NET_SHARE_ENUM r_u; @@ -274,7 +274,7 @@ static BOOL api_srv_net_share_enum(pipes_struct *p) RPC to return share information. ********************************************************************/ -static BOOL api_srv_net_share_get_info(pipes_struct *p) +static bool api_srv_net_share_get_info(pipes_struct *p) { SRV_Q_NET_SHARE_GET_INFO q_u; SRV_R_NET_SHARE_GET_INFO r_u; @@ -304,7 +304,7 @@ static BOOL api_srv_net_share_get_info(pipes_struct *p) RPC to set share information. ********************************************************************/ -static BOOL api_srv_net_share_set_info(pipes_struct *p) +static bool api_srv_net_share_set_info(pipes_struct *p) { SRV_Q_NET_SHARE_SET_INFO q_u; SRV_R_NET_SHARE_SET_INFO r_u; @@ -334,7 +334,7 @@ static BOOL api_srv_net_share_set_info(pipes_struct *p) RPC to add share information. ********************************************************************/ -static BOOL api_srv_net_share_add(pipes_struct *p) +static bool api_srv_net_share_add(pipes_struct *p) { SRV_Q_NET_SHARE_ADD q_u; SRV_R_NET_SHARE_ADD r_u; @@ -364,7 +364,7 @@ static BOOL api_srv_net_share_add(pipes_struct *p) RPC to delete share information. ********************************************************************/ -static BOOL api_srv_net_share_del(pipes_struct *p) +static bool api_srv_net_share_del(pipes_struct *p) { SRV_Q_NET_SHARE_DEL q_u; SRV_R_NET_SHARE_DEL r_u; @@ -394,7 +394,7 @@ static BOOL api_srv_net_share_del(pipes_struct *p) RPC to delete share information. ********************************************************************/ -static BOOL api_srv_net_share_del_sticky(pipes_struct *p) +static bool api_srv_net_share_del_sticky(pipes_struct *p) { SRV_Q_NET_SHARE_DEL q_u; SRV_R_NET_SHARE_DEL r_u; @@ -424,7 +424,7 @@ static BOOL api_srv_net_share_del_sticky(pipes_struct *p) api_srv_net_remote_tod ********************************************************************/ -static BOOL api_srv_net_remote_tod(pipes_struct *p) +static bool api_srv_net_remote_tod(pipes_struct *p) { SRV_Q_NET_REMOTE_TOD q_u; SRV_R_NET_REMOTE_TOD r_u; @@ -451,7 +451,7 @@ static BOOL api_srv_net_remote_tod(pipes_struct *p) RPC to enumerate disks available on a server e.g. C:, D: ... *******************************************************************/ -static BOOL api_srv_net_disk_enum(pipes_struct *p) +static bool api_srv_net_disk_enum(pipes_struct *p) { SRV_Q_NET_DISK_ENUM q_u; SRV_R_NET_DISK_ENUM r_u; @@ -481,7 +481,7 @@ static BOOL api_srv_net_disk_enum(pipes_struct *p) NetValidateName (opnum 0x21) *******************************************************************/ -static BOOL api_srv_net_name_validate(pipes_struct *p) +static bool api_srv_net_name_validate(pipes_struct *p) { SRV_Q_NET_NAME_VALIDATE q_u; SRV_R_NET_NAME_VALIDATE r_u; @@ -511,7 +511,7 @@ static BOOL api_srv_net_name_validate(pipes_struct *p) NetFileQuerySecdesc (opnum 0x27) *******************************************************************/ -static BOOL api_srv_net_file_query_secdesc(pipes_struct *p) +static bool api_srv_net_file_query_secdesc(pipes_struct *p) { SRV_Q_NET_FILE_QUERY_SECDESC q_u; SRV_R_NET_FILE_QUERY_SECDESC r_u; @@ -541,7 +541,7 @@ static BOOL api_srv_net_file_query_secdesc(pipes_struct *p) NetFileSetSecdesc (opnum 0x28) *******************************************************************/ -static BOOL api_srv_net_file_set_secdesc(pipes_struct *p) +static bool api_srv_net_file_set_secdesc(pipes_struct *p) { SRV_Q_NET_FILE_SET_SECDESC q_u; SRV_R_NET_FILE_SET_SECDESC r_u; @@ -570,7 +570,7 @@ static BOOL api_srv_net_file_set_secdesc(pipes_struct *p) /******************************************************************* *******************************************************************/ -static BOOL api_srv_net_file_close(pipes_struct *p) +static bool api_srv_net_file_close(pipes_struct *p) { return proxy_srvsvc_call( p, NDR_SRVSVC_NETFILECLOSE ); } diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index f23d6dfcb9..27bc807367 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -452,7 +452,7 @@ static void init_srv_share_info_1501(pipes_struct *p, SRV_SHARE_INFO_1501 *sh150 True if it ends in '$'. ********************************************************************/ -static BOOL is_hidden_share(int snum) +static bool is_hidden_share(int snum) { const char *net_name = lp_servicename(snum); @@ -463,8 +463,8 @@ static BOOL is_hidden_share(int snum) Fill in a share info structure. ********************************************************************/ -static BOOL init_srv_share_info_ctr(pipes_struct *p, SRV_SHARE_INFO_CTR *ctr, - uint32 info_level, uint32 *resume_hnd, uint32 *total_entries, BOOL all_shares) +static bool init_srv_share_info_ctr(pipes_struct *p, SRV_SHARE_INFO_CTR *ctr, + uint32 info_level, uint32 *resume_hnd, uint32 *total_entries, bool all_shares) { int num_entries = 0; int num_services = 0; @@ -703,7 +703,7 @@ static BOOL init_srv_share_info_ctr(pipes_struct *p, SRV_SHARE_INFO_CTR *ctr, ********************************************************************/ static void init_srv_r_net_share_enum(pipes_struct *p, SRV_R_NET_SHARE_ENUM *r_n, - uint32 info_level, uint32 resume_hnd, BOOL all) + uint32 info_level, uint32 resume_hnd, bool all) { DEBUG(5,("init_srv_r_net_share_enum: %d\n", __LINE__)); @@ -886,7 +886,7 @@ static void init_srv_sess_info_1(pipes_struct *p, SRV_SESS_INFO_1 *ss1, uint32 * uint32 num_files; uint32 connect_time; struct passwd *pw = sys_getpwnam(session_list[*snum].username); - BOOL guest; + bool guest; if ( !pw ) { DEBUG(10,("init_srv_sess_info_1: failed to find owner: %s\n", @@ -1336,7 +1336,7 @@ WERROR _srv_net_sess_del(pipes_struct *p, SRV_Q_NET_SESS_DEL *q_u, SRV_R_NET_SES int num_sessions, snum; fstring username; fstring machine; - BOOL not_root = False; + bool not_root = False; rpcstr_pull_unistr2_fstring(username, &q_u->uni_user_name); rpcstr_pull_unistr2_fstring(machine, &q_u->uni_cli_name); @@ -1500,7 +1500,7 @@ WERROR _srv_net_share_set_info(pipes_struct *p, SRV_Q_NET_SHARE_SET_INFO *q_u, S char *path; SEC_DESC *psd = NULL; SE_PRIV se_diskop = SE_DISK_OPERATOR; - BOOL is_disk_op = False; + bool is_disk_op = False; int max_connections = 0; DEBUG(5,("_srv_net_share_set_info: %d\n", __LINE__)); @@ -1690,7 +1690,7 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S char *path; SEC_DESC *psd = NULL; SE_PRIV se_diskop = SE_DISK_OPERATOR; - BOOL is_disk_op; + bool is_disk_op; int max_connections = 0; DEBUG(5,("_srv_net_share_add: %d\n", __LINE__)); @@ -1843,7 +1843,7 @@ WERROR _srv_net_share_del(pipes_struct *p, SRV_Q_NET_SHARE_DEL *q_u, SRV_R_NET_S int ret; int snum; SE_PRIV se_diskop = SE_DISK_OPERATOR; - BOOL is_disk_op; + bool is_disk_op; struct share_params *params; DEBUG(5,("_srv_net_share_del: %d\n", __LINE__)); @@ -1986,7 +1986,7 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC NTSTATUS nt_status; struct current_user user; connection_struct *conn = NULL; - BOOL became_user = False; + bool became_user = False; TALLOC_CTX *ctx = talloc_tos(); ZERO_STRUCT(st); @@ -2103,7 +2103,7 @@ WERROR _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_ NTSTATUS nt_status; struct current_user user; connection_struct *conn = NULL; - BOOL became_user = False; + bool became_user = False; TALLOC_CTX *ctx = talloc_tos(); ZERO_STRUCT(st); diff --git a/source3/rpc_server/srv_svcctl.c b/source3/rpc_server/srv_svcctl.c index fcaf37e8ee..ce81a24202 100644 --- a/source3/rpc_server/srv_svcctl.c +++ b/source3/rpc_server/srv_svcctl.c @@ -22,7 +22,7 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV -static BOOL proxy_svcctl_call(pipes_struct *p, uint8 opnum) +static bool proxy_svcctl_call(pipes_struct *p, uint8 opnum) { struct api_struct *fns; int n_fns; @@ -43,7 +43,7 @@ static BOOL proxy_svcctl_call(pipes_struct *p, uint8 opnum) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_close_service(pipes_struct *p) +static bool api_svcctl_close_service(pipes_struct *p) { return proxy_svcctl_call( p, NDR_SVCCTL_CLOSESERVICEHANDLE ); } @@ -51,7 +51,7 @@ static BOOL api_svcctl_close_service(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_open_scmanager(pipes_struct *p) +static bool api_svcctl_open_scmanager(pipes_struct *p) { SVCCTL_Q_OPEN_SCMANAGER q_u; SVCCTL_R_OPEN_SCMANAGER r_u; @@ -75,7 +75,7 @@ static BOOL api_svcctl_open_scmanager(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_open_service(pipes_struct *p) +static bool api_svcctl_open_service(pipes_struct *p) { SVCCTL_Q_OPEN_SERVICE q_u; SVCCTL_R_OPEN_SERVICE r_u; @@ -99,7 +99,7 @@ static BOOL api_svcctl_open_service(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_get_display_name(pipes_struct *p) +static bool api_svcctl_get_display_name(pipes_struct *p) { SVCCTL_Q_GET_DISPLAY_NAME q_u; SVCCTL_R_GET_DISPLAY_NAME r_u; @@ -123,7 +123,7 @@ static BOOL api_svcctl_get_display_name(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_query_status(pipes_struct *p) +static bool api_svcctl_query_status(pipes_struct *p) { SVCCTL_Q_QUERY_STATUS q_u; SVCCTL_R_QUERY_STATUS r_u; @@ -147,7 +147,7 @@ static BOOL api_svcctl_query_status(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_enum_services_status(pipes_struct *p) +static bool api_svcctl_enum_services_status(pipes_struct *p) { SVCCTL_Q_ENUM_SERVICES_STATUS q_u; SVCCTL_R_ENUM_SERVICES_STATUS r_u; @@ -170,7 +170,7 @@ static BOOL api_svcctl_enum_services_status(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_query_service_status_ex(pipes_struct *p) +static bool api_svcctl_query_service_status_ex(pipes_struct *p) { SVCCTL_Q_QUERY_SERVICE_STATUSEX q_u; SVCCTL_R_QUERY_SERVICE_STATUSEX r_u; @@ -193,7 +193,7 @@ static BOOL api_svcctl_query_service_status_ex(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_enum_dependent_services(pipes_struct *p) +static bool api_svcctl_enum_dependent_services(pipes_struct *p) { SVCCTL_Q_ENUM_DEPENDENT_SERVICES q_u; SVCCTL_R_ENUM_DEPENDENT_SERVICES r_u; @@ -217,7 +217,7 @@ static BOOL api_svcctl_enum_dependent_services(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_start_service(pipes_struct *p) +static bool api_svcctl_start_service(pipes_struct *p) { SVCCTL_Q_START_SERVICE q_u; SVCCTL_R_START_SERVICE r_u; @@ -241,7 +241,7 @@ static BOOL api_svcctl_start_service(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_control_service(pipes_struct *p) +static bool api_svcctl_control_service(pipes_struct *p) { SVCCTL_Q_CONTROL_SERVICE q_u; SVCCTL_R_CONTROL_SERVICE r_u; @@ -265,7 +265,7 @@ static BOOL api_svcctl_control_service(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_query_service_config(pipes_struct *p) +static bool api_svcctl_query_service_config(pipes_struct *p) { SVCCTL_Q_QUERY_SERVICE_CONFIG q_u; SVCCTL_R_QUERY_SERVICE_CONFIG r_u; @@ -289,7 +289,7 @@ static BOOL api_svcctl_query_service_config(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_query_service_config2(pipes_struct *p) +static bool api_svcctl_query_service_config2(pipes_struct *p) { SVCCTL_Q_QUERY_SERVICE_CONFIG2 q_u; SVCCTL_R_QUERY_SERVICE_CONFIG2 r_u; @@ -313,7 +313,7 @@ static BOOL api_svcctl_query_service_config2(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_lock_service_db(pipes_struct *p) +static bool api_svcctl_lock_service_db(pipes_struct *p) { SVCCTL_Q_LOCK_SERVICE_DB q_u; SVCCTL_R_LOCK_SERVICE_DB r_u; @@ -338,7 +338,7 @@ static BOOL api_svcctl_lock_service_db(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_unlock_service_db(pipes_struct *p) +static bool api_svcctl_unlock_service_db(pipes_struct *p) { SVCCTL_Q_UNLOCK_SERVICE_DB q_u; SVCCTL_R_UNLOCK_SERVICE_DB r_u; @@ -362,7 +362,7 @@ static BOOL api_svcctl_unlock_service_db(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_query_security_sec(pipes_struct *p) +static bool api_svcctl_query_security_sec(pipes_struct *p) { SVCCTL_Q_QUERY_SERVICE_SEC q_u; SVCCTL_R_QUERY_SERVICE_SEC r_u; @@ -386,7 +386,7 @@ static BOOL api_svcctl_query_security_sec(pipes_struct *p) /******************************************************************* ********************************************************************/ -static BOOL api_svcctl_set_security_sec(pipes_struct *p) +static bool api_svcctl_set_security_sec(pipes_struct *p) { SVCCTL_Q_SET_SERVICE_SEC q_u; SVCCTL_R_SET_SERVICE_SEC r_u; diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c index c868f94f76..a6a9c855aa 100644 --- a/source3/rpc_server/srv_svcctl_nt.c +++ b/source3/rpc_server/srv_svcctl_nt.c @@ -58,7 +58,7 @@ static const struct generic_mapping svc_generic_map = /******************************************************************** ********************************************************************/ -BOOL init_service_op_table( void ) +bool init_service_op_table( void ) { const char **service_list = lp_svcctl_list(); int num_services = SVCCTL_NUM_INTERNAL_SERVICES + str_list_count( service_list ); diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c index 2d6ff7454a..ce34211420 100644 --- a/source3/rpc_server/srv_winreg_nt.c +++ b/source3/rpc_server/srv_winreg_nt.c @@ -97,7 +97,7 @@ static WERROR open_registry_key( pipes_struct *p, POLICY_HND *hnd, Note that P should be valid & hnd should already have space *******************************************************************/ -static BOOL close_registry_key(pipes_struct *p, POLICY_HND *hnd) +static bool close_registry_key(pipes_struct *p, POLICY_HND *hnd) { struct registry_key *regkey = find_regkey_by_hnd(p, hnd); @@ -228,8 +228,8 @@ WERROR _winreg_QueryValue(pipes_struct *p, struct winreg_QueryValue *r) uint32_t outbuf_size; DATA_BLOB val_blob; - BOOL free_buf = False; - BOOL free_prs = False; + bool free_buf = False; + bool free_prs = False; if ( !regkey ) return WERR_BADFID; @@ -502,7 +502,7 @@ WERROR _winreg_InitiateSystemShutdownEx(pipes_struct *p, struct winreg_InitiateS fstring reboot; fstring f; int ret; - BOOL can_shutdown; + bool can_shutdown; pstrcpy(shutdown_script, lp_shutdown_script()); @@ -567,7 +567,7 @@ WERROR _winreg_AbortSystemShutdown(pipes_struct *p, struct winreg_AbortSystemShu { pstring abort_shutdown_script; int ret; - BOOL can_shutdown; + bool can_shutdown; pstrcpy(abort_shutdown_script, lp_abort_shutdown_script()); -- cgit