From b031af348c7dcc8c74bf49945211c466b8eca079 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 27 Aug 2001 19:46:22 +0000 Subject: converted another bunch of stuff to NTSTATUS (This used to be commit 1d36250e338ae0ff9fbbf86019809205dd97d05e) --- source3/include/nt_printing.h | 2 +- source3/include/nterr.h | 1 - source3/include/rpc_brs.h | 2 +- source3/include/rpc_dce.h | 2 +- source3/include/rpc_dfs.h | 10 ++--- source3/include/rpc_netlogon.h | 22 +++++----- source3/include/rpc_reg.h | 38 ++++++++-------- source3/include/rpc_samr.h | 84 ++++++++++++++++++------------------ source3/include/rpc_spoolss.h | 98 +++++++++++++++++++++--------------------- source3/include/rpc_srvsvc.h | 30 ++++++------- source3/include/rpc_wkssvc.h | 2 +- source3/include/smb.h | 4 +- 12 files changed, 146 insertions(+), 149 deletions(-) (limited to 'source3/include') diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h index 4c9265f09f..de21537116 100644 --- a/source3/include/nt_printing.h +++ b/source3/include/nt_printing.h @@ -231,7 +231,7 @@ typedef struct nt_printer_info_level_2 uint32 default_priority; uint32 starttime; uint32 untiltime; - uint32 status; + NTSTATUS status; uint32 cjobs; uint32 averageppm; fstring servername; diff --git a/source3/include/nterr.h b/source3/include/nterr.h index 0ab08479c8..da7b50b04a 100644 --- a/source3/include/nterr.h +++ b/source3/include/nterr.h @@ -12,7 +12,6 @@ we start supporting NT error codes in Samba. They were extracted using a loop in smbclient then printing a netmon sniff to a file */ -#define NT_STATUS_NOPROBLEMO NT_STATUS(0x0) #define NT_STATUS_OK NT_STATUS(0x0) #define NT_STATUS_UNSUCCESSFUL NT_STATUS(0xC0000000 | 1) #define NT_STATUS_NOT_IMPLEMENTED NT_STATUS(0xC0000000 | 2) diff --git a/source3/include/rpc_brs.h b/source3/include/rpc_brs.h index 36d89ec151..99ba8f2dd0 100644 --- a/source3/include/rpc_brs.h +++ b/source3/include/rpc_brs.h @@ -73,7 +73,7 @@ typedef struct r_brs_query_info_info } info; - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } BRS_R_QUERY_INFO; diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h index 96704b3361..f9ebaae0b8 100644 --- a/source3/include/rpc_dce.h +++ b/source3/include/rpc_dce.h @@ -161,7 +161,7 @@ typedef struct rpc_hdr_resp_info /* RPC_HDR_FAULT - fault rpc header */ typedef struct rpc_hdr_fault_info { - uint32 status; + NTSTATUS status; uint32 reserved; /* 0x0000 0000 */ } RPC_HDR_FAULT; diff --git a/source3/include/rpc_dfs.h b/source3/include/rpc_dfs.h index 40e73c5afb..57a633b8e6 100644 --- a/source3/include/rpc_dfs.h +++ b/source3/include/rpc_dfs.h @@ -55,7 +55,7 @@ DFS_Q_DFS_EXIST; /* status == 1 if dfs exists. */ typedef struct dfs_r_dfs_exist { - uint32 status; + NTSTATUS status; } DFS_R_DFS_EXIST; @@ -75,7 +75,7 @@ DFS_Q_DFS_ADD; typedef struct dfs_r_dfs_add { - uint32 status; + NTSTATUS status; } DFS_R_DFS_ADD; @@ -92,7 +92,7 @@ DFS_Q_DFS_REMOVE; typedef struct dfs_r_dfs_remove { - uint32 status; + NTSTATUS status; } DFS_R_DFS_REMOVE; @@ -173,7 +173,7 @@ typedef struct dfs_r_dfs_get_info uint32 level; uint32 ptr_ctr; DFS_INFO_CTR ctr; - uint32 status; + NTSTATUS status; } DFS_R_DFS_GET_INFO; @@ -202,7 +202,7 @@ typedef struct dfs_r_dfs_enum uint32 ptr_num_entries2; uint32 num_entries2; ENUM_HND reshnd; - uint32 status; + NTSTATUS status; } DFS_R_DFS_ENUM; diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h index f15cec3ca9..ce5a8b85a1 100644 --- a/source3/include/rpc_netlogon.h +++ b/source3/include/rpc_netlogon.h @@ -226,7 +226,7 @@ typedef struct net_r_logon_ctrl_info NETLOGON_INFO_1 info1; } logon; - uint32 status; + NTSTATUS status; } NET_R_LOGON_CTRL; /******************************************************** @@ -269,7 +269,7 @@ typedef struct net_r_logon_ctrl2_info } logon; - uint32 status; /* return code */ + NTSTATUS status; /* return code */ } NET_R_LOGON_CTRL2; @@ -288,7 +288,7 @@ typedef struct net_r_trust_dom_info { UNISTR2 uni_trust_dom_name[MAX_TRUST_DOMS]; - uint32 status; /* return code */ + NTSTATUS status; /* return code */ } NET_R_TRUST_DOM_LIST; @@ -315,10 +315,8 @@ typedef struct net_q_req_chal_info /* NET_R_REQ_CHAL */ typedef struct net_r_req_chal_info { - DOM_CHAL srv_chal; /* server challenge */ - - uint32 status; /* return code */ - + DOM_CHAL srv_chal; /* server challenge */ + NTSTATUS status; /* return code */ } NET_R_REQ_CHAL; /* NET_Q_AUTH */ @@ -332,7 +330,7 @@ typedef struct net_q_auth_info typedef struct net_r_auth_info { DOM_CHAL srv_chal; /* server-calculated credentials */ - uint32 status; /* return code */ + NTSTATUS status; /* return code */ } NET_R_AUTH; /* NET_Q_AUTH_2 */ @@ -352,7 +350,7 @@ typedef struct net_r_auth2_info DOM_CHAL srv_chal; /* server-calculated credentials */ NEG_FLAGS srv_flgs; /* usually 0x0000 01ff */ - uint32 status; /* return code */ + NTSTATUS status; /* return code */ } NET_R_AUTH_2; @@ -370,7 +368,7 @@ typedef struct net_r_srv_pwset_info { DOM_CRED srv_cred; /* server-calculated credentials */ - uint32 status; /* return code */ + NTSTATUS status; /* return code */ } NET_R_SRV_PWSET; @@ -459,7 +457,7 @@ typedef struct net_r_sam_logon_info uint32 auth_resp; /* 1 - Authoritative response; 0 - Non-Auth? */ - uint32 status; /* return code */ + NTSTATUS status; /* return code */ } NET_R_SAM_LOGON; @@ -477,7 +475,7 @@ typedef struct net_r_sam_logoff_info uint32 buffer_creds; /* undocumented buffer pointer */ DOM_CRED srv_creds; /* server credentials. server time stamp appears to be ignored. */ - uint32 status; /* return code */ + NTSTATUS status; /* return code */ } NET_R_SAM_LOGOFF; diff --git a/source3/include/rpc_reg.h b/source3/include/rpc_reg.h index f65d8d7cc3..1906eb1aad 100644 --- a/source3/include/rpc_reg.h +++ b/source3/include/rpc_reg.h @@ -73,7 +73,7 @@ typedef struct q_reg_open_hkcr_info typedef struct r_reg_open_hkcr_info { POLICY_HND pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_OPEN_HKCR; @@ -93,7 +93,7 @@ REG_Q_OPEN_HKLM; typedef struct r_reg_open_hklm_info { POLICY_HND pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_OPEN_HKLM; @@ -113,7 +113,7 @@ typedef struct q_reg_open_hku_info typedef struct r_reg_open_hku_info { POLICY_HND pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_OPEN_HKU; @@ -128,7 +128,7 @@ typedef struct q_reg_open_flush_key_info /* REG_R_FLUSH_KEY */ typedef struct r_reg_open_flush_key_info { - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_FLUSH_KEY; @@ -149,7 +149,7 @@ typedef struct q_reg_set_key_sec_info /* REG_R_SET_KEY_SEC */ typedef struct r_reg_set_key_sec_info { - uint32 status; + NTSTATUS status; } REG_R_SET_KEY_SEC; @@ -176,7 +176,7 @@ typedef struct r_reg_get_key_sec_info BUFHDR hdr_sec; /* header for security data */ SEC_DESC_BUF *data; /* security data */ - uint32 status; + NTSTATUS status; } REG_R_GET_KEY_SEC; @@ -197,7 +197,7 @@ typedef struct q_reg_create_value_info /* REG_R_CREATE_VALUE */ typedef struct r_reg_create_value_info { - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_CREATE_VALUE; @@ -243,7 +243,7 @@ typedef struct r_reg_enum_value_info uint32 ptr2; /* pointer */ uint32 len_value2; /* */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_ENUM_VALUE; @@ -279,7 +279,7 @@ typedef struct r_reg_create_key_info POLICY_HND key_pol; /* policy handle */ uint32 unknown; /* 0x0000 0000 */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_CREATE_KEY; @@ -297,7 +297,7 @@ typedef struct r_reg_delete_key_info { POLICY_HND key_pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_DELETE_KEY; @@ -316,7 +316,7 @@ typedef struct r_reg_delete_val_info { POLICY_HND key_pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_DELETE_VALUE; @@ -344,7 +344,7 @@ typedef struct r_reg_query_key_info uint32 sec_desc; /* 0x0000 0078 */ NTTIME mod_time; /* modified time */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_QUERY_KEY; @@ -360,7 +360,7 @@ typedef struct q_reg_unk_1a_info typedef struct r_reg_unk_1a_info { uint32 unknown; /* 0x0500 0000 */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_UNK_1A; @@ -377,7 +377,7 @@ typedef struct reg_r_close_info { POLICY_HND pol; /* policy handle. should be all zeros. */ - uint32 status; /* return code */ + NTSTATUS status; /* return code */ } REG_R_CLOSE; @@ -422,7 +422,7 @@ typedef struct r_reg_enum_key_info uint32 ptr3; /* pointer */ NTTIME time; /* current time? */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_ENUM_KEY; @@ -466,7 +466,7 @@ typedef struct r_reg_info_info uint32 ptr_len; uint32 buf_len; - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_INFO; @@ -490,7 +490,7 @@ typedef struct q_reg_open_entry_info typedef struct r_reg_open_entry_info { POLICY_HND pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_OPEN_ENTRY; @@ -510,7 +510,7 @@ typedef struct q_reg_shutdown_info /* REG_R_SHUTDOWN */ typedef struct r_reg_shutdown_info { - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_SHUTDOWN; @@ -525,7 +525,7 @@ typedef struct q_reg_abort_shutdown_info /* REG_R_ABORT_SHUTDOWN */ typedef struct r_reg_abort_shutdown_info { - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } REG_R_ABORT_SHUTDOWN; diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h index 1cf3248b81..a29f96c107 100644 --- a/source3/include/rpc_samr.h +++ b/source3/include/rpc_samr.h @@ -411,7 +411,7 @@ typedef struct q_samr_close_hnd_info typedef struct r_samr_close_hnd_info { POLICY_HND pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_CLOSE_HND; @@ -438,7 +438,7 @@ typedef struct r_samr_usrdom_pwinfo_info uint16 unknown_0; /* 0000 */ uint16 unknown_1; /* 0x0016 or 0x0015 */ uint32 unknown_2; /* 0x0000 0000 */ - uint32 status; + NTSTATUS status; } SAMR_R_GET_USRDOM_PWINFO; @@ -461,7 +461,7 @@ typedef struct r_samr_query_sec_obj_info uint32 ptr; SEC_DESC_BUF *buf; - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_QUERY_SEC_OBJ; @@ -583,7 +583,7 @@ typedef struct r_samr_query_domain_info SAM_UNK_CTR *ctr; - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_QUERY_DOMAIN_INFO; @@ -605,7 +605,7 @@ typedef struct r_samr_lookup_domain_info uint32 ptr_sid; DOM_SID2 dom_sid; - uint32 status; + NTSTATUS status; } SAMR_R_LOOKUP_DOMAIN; @@ -631,7 +631,7 @@ typedef struct q_samr_open_domain_info typedef struct r_samr_open_domain_info { POLICY_HND domain_pol; /* policy handle associated with the SID */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_OPEN_DOMAIN; @@ -671,7 +671,7 @@ typedef struct r_samr_enum_domains_info uint32 num_entries4; - uint32 status; + NTSTATUS status; } SAMR_R_ENUM_DOMAINS; @@ -705,7 +705,7 @@ typedef struct r_samr_enum_dom_users_info uint32 num_entries4; - uint32 status; + NTSTATUS status; } SAMR_R_ENUM_DOM_USERS; @@ -739,7 +739,7 @@ typedef struct r_samr_enum_dom_groups_info uint32 num_entries4; - uint32 status; + NTSTATUS status; } SAMR_R_ENUM_DOM_GROUPS; @@ -773,7 +773,7 @@ typedef struct r_samr_enum_dom_aliases_info uint32 num_entries4; - uint32 status; + NTSTATUS status; } SAMR_R_ENUM_DOM_ALIASES; @@ -964,7 +964,7 @@ typedef struct r_samr_query_dispinfo_info SAM_DISPINFO_CTR *ctr; - uint32 status; + NTSTATUS status; } SAMR_R_QUERY_DISPINFO; @@ -981,7 +981,7 @@ typedef struct q_samr_delete_dom_group_info typedef struct r_samr_delete_dom_group_info { POLICY_HND pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_DELETE_DOM_GROUP; @@ -1004,7 +1004,7 @@ typedef struct r_samr_create_dom_group_info POLICY_HND pol; /* policy handle */ uint32 rid; - uint32 status; + NTSTATUS status; } SAMR_R_CREATE_DOM_GROUP; @@ -1059,7 +1059,7 @@ typedef struct r_samr_query_groupinfo_info uint32 ptr; GROUP_INFO_CTR *ctr; - uint32 status; + NTSTATUS status; } SAMR_R_QUERY_GROUPINFO; @@ -1075,7 +1075,7 @@ typedef struct q_samr_set_group_info /* SAMR_R_SET_GROUPINFO - SAM Group Info */ typedef struct r_samr_set_group_info { - uint32 status; + NTSTATUS status; } SAMR_R_SET_GROUPINFO; @@ -1092,7 +1092,7 @@ typedef struct q_samr_delete_dom_alias_info typedef struct r_samr_delete_dom_alias_info { POLICY_HND pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_DELETE_DOM_ALIAS; @@ -1115,7 +1115,7 @@ typedef struct r_samr_create_dom_alias_info POLICY_HND alias_pol; /* policy handle */ uint32 rid; - uint32 status; + NTSTATUS status; } SAMR_R_CREATE_DOM_ALIAS; @@ -1155,7 +1155,7 @@ typedef struct r_samr_query_aliasinfo_info uint32 ptr; ALIAS_INFO_CTR ctr; - uint32 status; + NTSTATUS status; } SAMR_R_QUERY_ALIASINFO; @@ -1171,7 +1171,7 @@ typedef struct q_samr_set_alias_info /* SAMR_R_SET_ALIASINFO - SAM alias info */ typedef struct r_samr_set_aliasinfo_info { - uint32 status; + NTSTATUS status; } SAMR_R_SET_ALIASINFO; @@ -1193,7 +1193,7 @@ typedef struct r_samr_query_usergroup_info DOM_GID *gid; /* group info */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_QUERY_USERGROUPS; @@ -1232,7 +1232,7 @@ typedef struct q_samr_set_user_info2 /* SAMR_R_SET_USERINFO2 - set sam info */ typedef struct r_samr_set_user_info2 { - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_SET_USERINFO2; @@ -1248,7 +1248,7 @@ typedef struct q_samr_set_user_info /* SAMR_R_SET_USERINFO - set sam info */ typedef struct r_samr_set_user_info { - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_SET_USERINFO; @@ -1267,7 +1267,7 @@ typedef struct r_samr_query_user_info uint32 ptr; /* pointer */ SAM_USERINFO_CTR *ctr; - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_QUERY_USERINFO; @@ -1303,7 +1303,7 @@ typedef struct r_samr_query_useraliases_info uint32 num_entries2; uint32 *rid; /* domain RIDs being looked up */ - uint32 status; /* return code */ + NTSTATUS status; /* return code */ } SAMR_R_QUERY_USERALIASES; @@ -1342,7 +1342,7 @@ typedef struct r_samr_lookup_names_info uint32 *types; /* SID_ENUM type */ - uint32 status; /* return code */ + NTSTATUS status; /* return code */ } SAMR_R_LOOKUP_NAMES; @@ -1387,7 +1387,7 @@ typedef struct r_samr_lookup_rids_info uint32 *type; /* SID_ENUM type */ - uint32 status; + NTSTATUS status; } SAMR_R_LOOKUP_RIDS; @@ -1406,7 +1406,7 @@ typedef struct q_samr_open_user_info typedef struct r_samr_open_user_info { POLICY_HND user_pol; /* policy handle associated with unknown id */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_OPEN_USER; @@ -1432,7 +1432,7 @@ typedef struct r_samr_create_user_info uint32 unknown_0; /* 0x0007 03ff */ uint32 user_rid; /* user RID */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_CREATE_USER; @@ -1449,7 +1449,7 @@ typedef struct q_samr_delete_dom_user_info typedef struct r_samr_delete_dom_user_info { POLICY_HND pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_DELETE_DOM_USER; @@ -1477,7 +1477,7 @@ typedef struct r_samr_query_groupmem_info uint32 num_attrs; uint32 *attr; - uint32 status; + NTSTATUS status; } SAMR_R_QUERY_GROUPMEM; @@ -1495,7 +1495,7 @@ typedef struct q_samr_del_group_mem_info /* SAMR_R_DEL_GROUPMEM - probably an del group member */ typedef struct r_samr_del_group_mem_info { - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_DEL_GROUPMEM; @@ -1514,7 +1514,7 @@ typedef struct q_samr_add_group_mem_info /* SAMR_R_ADD_GROUPMEM - probably an add group member */ typedef struct r_samr_add_group_mem_info { - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_ADD_GROUPMEM; @@ -1533,7 +1533,7 @@ typedef struct q_samr_open_group_info typedef struct r_samr_open_group_info { POLICY_HND pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_OPEN_GROUP; @@ -1555,7 +1555,7 @@ typedef struct r_samr_query_aliasmem_info DOM_SID2 *sid; - uint32 status; + NTSTATUS status; } SAMR_R_QUERY_ALIASMEM; @@ -1573,7 +1573,7 @@ typedef struct q_samr_add_alias_mem_info /* SAMR_R_ADD_ALIASMEM - add alias member */ typedef struct r_samr_add_alias_mem_info { - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_ADD_ALIASMEM; @@ -1591,7 +1591,7 @@ typedef struct q_samr_del_alias_mem_info /* SAMR_R_DEL_ALIASMEM - delete alias member */ typedef struct r_samr_del_alias_mem_info { - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_DEL_ALIASMEM; @@ -1612,7 +1612,7 @@ typedef struct q_samr_open_alias_info typedef struct r_samr_open_alias_info { POLICY_HND pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_OPEN_ALIAS; @@ -1631,7 +1631,7 @@ typedef struct q_samr_connect_anon_info typedef struct r_samr_connect_anon_info { POLICY_HND connect_pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_CONNECT_ANON; @@ -1650,7 +1650,7 @@ typedef struct q_samr_connect_info typedef struct r_samr_connect_info { POLICY_HND connect_pol; /* policy handle */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_CONNECT; @@ -1669,7 +1669,7 @@ typedef struct r_samr_get_dom_pwinfo uint16 unk_0; uint16 unk_1; uint16 unk_2; - uint32 status; + NTSTATUS status; } SAMR_R_GET_DOM_PWINFO; @@ -1713,7 +1713,7 @@ typedef struct q_samr_chgpasswd_user_info /* SAMR_R_CHGPASSWD_USER */ typedef struct r_samr_chgpasswd_user_info { - uint32 status; /* 0 == OK, C000006A (NT_STATUS_WRONG_PASSWORD) */ + NTSTATUS status; /* 0 == OK, C000006A (NT_STATUS_WRONG_PASSWORD) */ } SAMR_R_CHGPASSWD_USER; @@ -1730,7 +1730,7 @@ typedef struct q_samr_unknown_2d_info /* SAMR_R_UNKNOWN_2D - probably an open */ typedef struct r_samr_unknown_2d_info { - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SAMR_R_UNKNOWN_2D; diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h index dd66982cd5..c57fc1bc42 100755 --- a/source3/include/rpc_spoolss.h +++ b/source3/include/rpc_spoolss.h @@ -460,7 +460,7 @@ SPOOL_Q_OPEN_PRINTER_EX; typedef struct spool_r_open_printer_ex { POLICY_HND handle; /* handle used along all transactions (20*uint8) */ - uint32 status; + NTSTATUS status; } SPOOL_R_OPEN_PRINTER_EX; @@ -523,7 +523,7 @@ typedef struct spool_r_getprinterdata uint32 size; uint8 *data; uint32 needed; - uint32 status; + NTSTATUS status; } SPOOL_R_GETPRINTERDATA; @@ -536,7 +536,7 @@ SPOOL_Q_DELETEPRINTERDATA; typedef struct spool_r_deleteprinterdata { - uint32 status; + NTSTATUS status; } SPOOL_R_DELETEPRINTERDATA; @@ -549,7 +549,7 @@ SPOOL_Q_CLOSEPRINTER; typedef struct spool_r_closeprinter { POLICY_HND handle; - uint32 status; + NTSTATUS status; } SPOOL_R_CLOSEPRINTER; @@ -561,7 +561,7 @@ SPOOL_Q_STARTPAGEPRINTER; typedef struct spool_r_startpageprinter { - uint32 status; + NTSTATUS status; } SPOOL_R_STARTPAGEPRINTER; @@ -573,7 +573,7 @@ SPOOL_Q_ENDPAGEPRINTER; typedef struct spool_r_endpageprinter { - uint32 status; + NTSTATUS status; } SPOOL_R_ENDPAGEPRINTER; @@ -589,7 +589,7 @@ SPOOL_Q_DELETEPRINTERDRIVER; typedef struct spool_r_deleteprinterdriver { - uint32 status; + NTSTATUS status; } SPOOL_R_DELETEPRINTERDRIVER; @@ -629,7 +629,7 @@ SPOOL_Q_STARTDOCPRINTER; typedef struct spool_r_startdocprinter { uint32 jobid; - uint32 status; + NTSTATUS status; } SPOOL_R_STARTDOCPRINTER; @@ -641,7 +641,7 @@ SPOOL_Q_ENDDOCPRINTER; typedef struct spool_r_enddocprinter { - uint32 status; + NTSTATUS status; } SPOOL_R_ENDDOCPRINTER; @@ -657,7 +657,7 @@ SPOOL_Q_WRITEPRINTER; typedef struct spool_r_writeprinter { uint32 buffer_written; - uint32 status; + NTSTATUS status; } SPOOL_R_WRITEPRINTER; @@ -718,7 +718,7 @@ SPOOL_Q_RFFPCNEX; typedef struct spool_r_rffpcnex { - uint32 status; + NTSTATUS status; } SPOOL_R_RFFPCNEX; @@ -736,7 +736,7 @@ typedef struct spool_r_rfnpcnex { uint32 info_ptr; SPOOL_NOTIFY_INFO info; - uint32 status; + NTSTATUS status; } SPOOL_R_RFNPCNEX; @@ -749,7 +749,7 @@ SPOOL_Q_FCPN; typedef struct spool_r_fcpn { - uint32 status; + NTSTATUS status; } SPOOL_R_FCPN; @@ -789,7 +789,7 @@ typedef struct printer_info_0 uint32 unknown16; uint32 change_id; uint32 unknown18; - uint32 status; + NTSTATUS status; uint32 unknown20; uint32 c_setprinter; @@ -832,7 +832,7 @@ typedef struct printer_info_2 uint32 defaultpriority; uint32 starttime; uint32 untiltime; - uint32 status; + NTSTATUS status; uint32 cjobs; uint32 averageppm; } @@ -870,7 +870,7 @@ typedef struct spool_r_enumprinters NEW_BUFFER *buffer; uint32 needed; /* bytes needed */ uint32 returned; /* number of printers */ - uint32 status; + NTSTATUS status; } SPOOL_R_ENUMPRINTERS; @@ -899,7 +899,7 @@ typedef struct spool_r_getprinter { NEW_BUFFER *buffer; uint32 needed; - uint32 status; + NTSTATUS status; } SPOOL_R_GETPRINTER; typedef struct driver_info_1 @@ -984,7 +984,7 @@ typedef struct spool_r_getprinterdriver2 uint32 needed; uint32 servermajorversion; uint32 serverminorversion; - uint32 status; + NTSTATUS status; } SPOOL_R_GETPRINTERDRIVER2; @@ -1010,7 +1010,7 @@ typedef struct spool_r_addjob { NEW_BUFFER *buffer; uint32 needed; - uint32 status; + NTSTATUS status; } SPOOL_R_ADDJOB; @@ -1042,7 +1042,7 @@ typedef struct s_job_info_1 UNISTR document; UNISTR datatype; UNISTR text_status; - uint32 status; + NTSTATUS status; uint32 priority; uint32 position; uint32 totalpages; @@ -1066,7 +1066,7 @@ typedef struct s_job_info_2 DEVICEMODE *devmode; UNISTR text_status; /* SEC_DESC sec_desc;*/ - uint32 status; + NTSTATUS status; uint32 priority; uint32 position; uint32 starttime; @@ -1106,7 +1106,7 @@ typedef struct spool_r_enumjobs NEW_BUFFER *buffer; uint32 needed; uint32 returned; - uint32 status; + NTSTATUS status; } SPOOL_R_ENUMJOBS; @@ -1119,7 +1119,7 @@ SPOOL_Q_SCHEDULEJOB; typedef struct spool_r_schedulejob { - uint32 status; + NTSTATUS status; } SPOOL_R_SCHEDULEJOB; @@ -1166,7 +1166,7 @@ typedef struct spool_r_enumports NEW_BUFFER *buffer; uint32 needed; /* bytes needed */ uint32 returned; /* number of printers */ - uint32 status; + NTSTATUS status; } SPOOL_R_ENUMPORTS; @@ -1201,7 +1201,7 @@ SPOOL_Q_SETJOB; typedef struct spool_r_setjob { - uint32 status; + NTSTATUS status; } SPOOL_R_SETJOB; @@ -1223,7 +1223,7 @@ typedef struct spool_r_enumprinterdrivers NEW_BUFFER *buffer; uint32 needed; uint32 returned; - uint32 status; + NTSTATUS status; } SPOOL_R_ENUMPRINTERDRIVERS; @@ -1254,7 +1254,7 @@ typedef struct spool_r_enumforms NEW_BUFFER *buffer; uint32 needed; uint32 numofforms; - uint32 status; + NTSTATUS status; } SPOOL_R_ENUMFORMS; @@ -1272,7 +1272,7 @@ typedef struct spool_r_getform { NEW_BUFFER *buffer; uint32 needed; - uint32 status; + NTSTATUS status; } SPOOL_R_GETFORM; @@ -1307,7 +1307,7 @@ typedef struct spool_printer_info_level_2 uint32 default_priority; uint32 starttime; uint32 untiltime; - uint32 status; + NTSTATUS status; uint32 cjobs; uint32 averageppm; UNISTR2 servername; @@ -1454,7 +1454,7 @@ SPOOL_Q_SETPRINTER; typedef struct spool_r_setprinter { - uint32 status; + NTSTATUS status; } SPOOL_R_SETPRINTER; @@ -1474,7 +1474,7 @@ SPOOL_Q_ADDPRINTER; typedef struct spool_r_addprinter { - uint32 status; + NTSTATUS status; } SPOOL_R_ADDPRINTER; @@ -1487,7 +1487,7 @@ SPOOL_Q_DELETEPRINTER; typedef struct spool_r_deleteprinter { POLICY_HND handle; - uint32 status; + NTSTATUS status; } SPOOL_R_DELETEPRINTER; @@ -1499,7 +1499,7 @@ SPOOL_Q_ABORTPRINTER; typedef struct spool_r_abortprinter { - uint32 status; + NTSTATUS status; } SPOOL_R_ABORTPRINTER; @@ -1522,7 +1522,7 @@ SPOOL_Q_ADDPRINTEREX; typedef struct spool_r_addprinterex { POLICY_HND handle; - uint32 status; + NTSTATUS status; } SPOOL_R_ADDPRINTEREX; @@ -1538,7 +1538,7 @@ SPOOL_Q_ADDPRINTERDRIVER; typedef struct spool_r_addprinterdriver { - uint32 status; + NTSTATUS status; } SPOOL_R_ADDPRINTERDRIVER; @@ -1571,7 +1571,7 @@ typedef struct spool_r_getprinterdriverdirectory { NEW_BUFFER *buffer; uint32 needed; - uint32 status; + NTSTATUS status; } SPOOL_R_GETPRINTERDRIVERDIR; @@ -1587,7 +1587,7 @@ SPOOL_Q_ADDPRINTPROCESSOR; typedef struct spool_r_addprintprocessor { - uint32 status; + NTSTATUS status; } SPOOL_R_ADDPRINTPROCESSOR; @@ -1615,7 +1615,7 @@ typedef struct spool_r_enumprintprocessors NEW_BUFFER *buffer; uint32 needed; uint32 returned; - uint32 status; + NTSTATUS status; } SPOOL_R_ENUMPRINTPROCESSORS; @@ -1642,7 +1642,7 @@ typedef struct spool_r_enumprintprocdatatypes NEW_BUFFER *buffer; uint32 needed; uint32 returned; - uint32 status; + NTSTATUS status; } SPOOL_R_ENUMPRINTPROCDATATYPES; @@ -1675,7 +1675,7 @@ typedef struct spool_r_enumprintmonitors NEW_BUFFER *buffer; uint32 needed; uint32 returned; - uint32 status; + NTSTATUS status; } SPOOL_R_ENUMPRINTMONITORS; @@ -1698,7 +1698,7 @@ typedef struct spool_r_enumprinterdata uint32 datasize; uint8 *data; uint32 realdatasize; - uint32 status; + NTSTATUS status; } SPOOL_R_ENUMPRINTERDATA; @@ -1716,7 +1716,7 @@ SPOOL_Q_SETPRINTERDATA; typedef struct spool_r_setprinterdata { - uint32 status; + NTSTATUS status; } SPOOL_R_SETPRINTERDATA; @@ -1745,7 +1745,7 @@ SPOOL_Q_ADDFORM; typedef struct spool_r_addform { - uint32 status; + NTSTATUS status; } SPOOL_R_ADDFORM; @@ -1761,7 +1761,7 @@ SPOOL_Q_SETFORM; typedef struct spool_r_setform { - uint32 status; + NTSTATUS status; } SPOOL_R_SETFORM; @@ -1774,7 +1774,7 @@ SPOOL_Q_DELETEFORM; typedef struct spool_r_deleteform { - uint32 status; + NTSTATUS status; } SPOOL_R_DELETEFORM; @@ -1805,7 +1805,7 @@ typedef struct spool_r_getjob { NEW_BUFFER *buffer; uint32 needed; - uint32 status; + NTSTATUS status; } SPOOL_R_GETJOB; @@ -1822,7 +1822,7 @@ SPOOL_Q_REPLYOPENPRINTER; typedef struct spool_r_replyopenprinter { POLICY_HND handle; - uint32 status; + NTSTATUS status; } SPOOL_R_REPLYOPENPRINTER; @@ -1835,7 +1835,7 @@ SPOOL_Q_REPLYCLOSEPRINTER; typedef struct spool_r_replycloseprinter { POLICY_HND handle; - uint32 status; + NTSTATUS status; } SPOOL_R_REPLYCLOSEPRINTER; @@ -1854,7 +1854,7 @@ SPOOL_Q_REPLY_RRPCN; typedef struct spool_r_rrpcn { uint32 unknown0; - uint32 status; + NTSTATUS status; } SPOOL_R_REPLY_RRPCN; diff --git a/source3/include/rpc_srvsvc.h b/source3/include/rpc_srvsvc.h index d6fe7617b2..651c0b9767 100644 --- a/source3/include/rpc_srvsvc.h +++ b/source3/include/rpc_srvsvc.h @@ -67,7 +67,7 @@ typedef struct net_srv_disk_enum { uint32 preferred_len; /* preferred maximum length (0xffff ffff) */ uint32 total_entries; /* total number of entries */ ENUM_HND enum_hnd; - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SRV_Q_NET_DISK_ENUM, SRV_R_NET_DISK_ENUM; typedef struct net_name_validate { @@ -76,7 +76,7 @@ typedef struct net_name_validate { UNISTR2 uni_name; /*name to validate*/ uint32 type; uint32 flags; - uint32 status; + NTSTATUS status; } SRV_Q_NET_NAME_VALIDATE, SRV_R_NET_NAME_VALIDATE; /* SESS_INFO_0 (pointers to level 0 session info strings) */ @@ -185,7 +185,7 @@ typedef struct r_net_sess_enum_info uint32 total_entries; /* total number of entries */ ENUM_HND enum_hnd; - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SRV_R_NET_SESS_ENUM; @@ -288,7 +288,7 @@ typedef struct r_net_conn_enum_info uint32 total_entries; /* total number of entries */ ENUM_HND enum_hnd; - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SRV_R_NET_CONN_ENUM; @@ -444,7 +444,7 @@ typedef struct r_net_share_enum_info uint32 total_entries; /* total number of entries */ ENUM_HND enum_hnd; - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SRV_R_NET_SHARE_ENUM; @@ -480,7 +480,7 @@ typedef struct srv_share_info { typedef struct r_net_share_get_info_info { SRV_SHARE_INFO info; - uint32 status; + NTSTATUS status; } SRV_R_NET_SHARE_GET_INFO; @@ -502,7 +502,7 @@ typedef struct r_net_share_set_info { uint32 switch_value; /* switch value */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SRV_R_NET_SHARE_SET_INFO; @@ -523,7 +523,7 @@ typedef struct r_net_share_add { uint32 switch_value; /* switch value */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SRV_R_NET_SHARE_ADD; @@ -539,7 +539,7 @@ typedef struct q_net_share_del /* SRV_R_NET_SHARE_DEL */ typedef struct r_net_share_del { - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SRV_R_NET_SHARE_DEL; @@ -622,7 +622,7 @@ typedef struct r_net_file_enum_info uint32 total_entries; /* total number of files */ ENUM_HND enum_hnd; - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SRV_R_NET_FILE_ENUM; @@ -704,7 +704,7 @@ typedef struct r_net_srv_get_info { SRV_INFO_CTR *ctr; - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SRV_R_NET_SRV_GET_INFO; @@ -725,7 +725,7 @@ typedef struct r_net_srv_set_info { uint32 switch_value; /* switch value */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SRV_R_NET_SRV_SET_INFO; @@ -761,7 +761,7 @@ typedef struct r_net_remote_tod uint32 ptr_srv_tod; /* pointer to TOD */ TIME_OF_DAY_INFO *tod; - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } SRV_R_NET_REMOTE_TOD; @@ -786,7 +786,7 @@ typedef struct r_net_file_query_secdesc uint32 ptr_secdesc; uint32 size_secdesc; SEC_DESC *sec_desc; - uint32 status; + NTSTATUS status; } SRV_R_NET_FILE_QUERY_SECDESC; /* SRV_Q_NET_FILE_SET_SECDESC */ @@ -807,6 +807,6 @@ typedef struct q_net_file_set_secdesc /* SRV_R_NET_FILE_SET_SECDESC */ typedef struct r_net_file_set_secdesc { - uint32 status; + NTSTATUS status; } SRV_R_NET_FILE_SET_SECDESC; #endif /* _RPC_SRVSVC_H */ diff --git a/source3/include/rpc_wkssvc.h b/source3/include/rpc_wkssvc.h index 1483997acb..57a70b4798 100644 --- a/source3/include/rpc_wkssvc.h +++ b/source3/include/rpc_wkssvc.h @@ -64,7 +64,7 @@ typedef struct r_wks_query_info_info uint32 ptr_1; /* pointer 1 */ WKS_INFO_100 *wks100; /* workstation info level 100 */ - uint32 status; /* return status */ + NTSTATUS status; /* return status */ } WKS_R_QUERY_INFO; diff --git a/source3/include/smb.h b/source3/include/smb.h index cef75d3713..ce6f0c794a 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -207,7 +207,7 @@ typedef struct nttime_info uint32 high; } NTTIME; -#ifdef __GNUC__XX +#ifdef __GNUC__XX_NOT_YET typedef struct {uint32 v;} NTSTATUS; #define NT_STATUS(x) ((NTSTATUS) { x }) #define NT_STATUS_V(x) ((x).v) @@ -218,7 +218,7 @@ typedef uint32 NTSTATUS; #endif #define NT_STATUS_IS_OK(x) (NT_STATUS_V(x) == 0) -#define NT_STATUS_IS_ERR(x) (NT_STATUS_V(x) & 0xc0000000) +#define NT_STATUS_IS_ERR(x) ((NT_STATUS_V(x) & 0xc0000000) == 0xc0000000) /* Allowable account control bits */ #define ACB_DISABLED 0x0001 /* 1 = User account disabled */ -- cgit