diff options
Diffstat (limited to 'source4/torture')
39 files changed, 70 insertions, 39 deletions
diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index 27a7c92eed..b0d92d005d 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -25,6 +25,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" #include "system/time.h" +#include "system/filesys.h" #define BASEDIR "\\delaywrite" diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c index 3247a7cd28..f3aef08ce1 100644 --- a/source4/torture/basic/delete.c +++ b/source4/torture/basic/delete.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "system/filesys.h" #include "librpc/gen_ndr/ndr_security.h" diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c index 7308805da7..35c22ff19f 100644 --- a/source4/torture/basic/denytest.c +++ b/source4/torture/basic/denytest.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "system/filesys.h" #include "libcli/raw/libcliraw.h" #include "librpc/gen_ndr/ndr_security.h" diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c index d7721ce5ae..59cd21f06d 100644 --- a/source4/torture/basic/dir.c +++ b/source4/torture/basic/dir.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "system/filesys.h" #include "librpc/gen_ndr/ndr_security.h" static void list_fn(struct clilist_file_info *finfo, const char *name, void *state) diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c index 2a302ae3f6..fab9733eb0 100644 --- a/source4/torture/basic/disconnect.c +++ b/source4/torture/basic/disconnect.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "system/filesys.h" #include "libcli/raw/libcliraw.h" #include "librpc/gen_ndr/ndr_security.h" diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c index 00310e5405..c3feaae2eb 100644 --- a/source4/torture/basic/locking.c +++ b/source4/torture/basic/locking.c @@ -24,6 +24,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" #include "system/time.h" +#include "system/filesys.h" #define BASEDIR "\\locktest" diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c index a0333b1c53..3ea2644d1a 100644 --- a/source4/torture/basic/mangle_test.c +++ b/source4/torture/basic/mangle_test.c @@ -19,7 +19,9 @@ */ #include "includes.h" +#include "system/filesys.h" #include "lib/tdb/include/tdbutil.h" +#include "pstring.h" static TDB_CONTEXT *tdb; diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c index b1bbdf1cd1..df9234feca 100644 --- a/source4/torture/basic/scanner.c +++ b/source4/torture/basic/scanner.c @@ -20,7 +20,9 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" +#include "system/filesys.h" #include "librpc/gen_ndr/ndr_security.h" +#include "pstring.h" #define VERBOSE 0 #define OP_MIN 0 diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c index 30d862e345..40a486f93f 100644 --- a/source4/torture/basic/unlink.c +++ b/source4/torture/basic/unlink.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "system/filesys.h" #include "libcli/raw/libcliraw.h" #include "librpc/gen_ndr/ndr_security.h" diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c index 01984077a3..ea1bb76b8c 100644 --- a/source4/torture/basic/utable.c +++ b/source4/torture/basic/utable.c @@ -20,7 +20,9 @@ #include "includes.h" #include "system/iconv.h" +#include "system/filesys.h" #include "librpc/gen_ndr/ndr_security.h" +#include "pstring.h" BOOL torture_utable(void) { diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index 87d49c6ce5..19fa03df8c 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -21,6 +21,7 @@ #include "includes.h" #include "dynconfig.h" #include "system/time.h" +#include "system/filesys.h" #include "request.h" #include "libcli/raw/libcliraw.h" #include "librpc/gen_ndr/ndr_security.h" diff --git a/source4/torture/local/messaging.c b/source4/torture/local/messaging.c index 958fcaa8f0..f12f3f6bdf 100644 --- a/source4/torture/local/messaging.c +++ b/source4/torture/local/messaging.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "system/filesys.h" #include "lib/events/events.h" enum {MY_PING=1000, MY_PONG, MY_EXIT}; diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index 161f51e1da..74f348638c 100644 --- a/source4/torture/locktest.c +++ b/source4/torture/locktest.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "system/filesys.h" #include "dynconfig.h" #include "system/time.h" diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index a560c19f44..4c71385ad0 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "system/filesys.h" #include "dynconfig.h" #include "clilist.h" #include "libcli/raw/libcliraw.h" diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c index afd71537a9..748ff90467 100644 --- a/source4/torture/nbench/nbench.c +++ b/source4/torture/nbench/nbench.c @@ -19,6 +19,8 @@ */ #include "includes.h" +#include "system/filesys.h" +#include "pstring.h" int nbench_line_count = 0; static int timelimit = 600; diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c index 1864c82fdc..1cb00b6733 100644 --- a/source4/torture/nbench/nbio.c +++ b/source4/torture/nbench/nbio.c @@ -22,6 +22,7 @@ #include "includes.h" #include "system/time.h" +#include "system/filesys.h" #include "dlinklist.h" #include "librpc/gen_ndr/ndr_security.h" diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c index f46c00eaea..f245bc679e 100644 --- a/source4/torture/rap/rap.c +++ b/source4/torture/rap/rap.c @@ -23,14 +23,14 @@ #include "rap.h" struct rap_call { - uint16 callno; + uint16_t callno; char *paramdesc; const char *datadesc; - uint16 status; - uint16 convert; + uint16_t status; + uint16_t convert; - uint16 rcv_paramlen, rcv_datalen; + uint16_t rcv_paramlen, rcv_datalen; struct ndr_push *ndr_push_param; struct ndr_push *ndr_push_data; @@ -40,7 +40,7 @@ struct rap_call { #define RAPNDR_FLAGS (LIBNDR_FLAG_NOALIGN|LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); -static struct rap_call *new_rap_cli_call(TALLOC_CTX *mem_ctx, uint16 callno) +static struct rap_call *new_rap_cli_call(TALLOC_CTX *mem_ctx, uint16_t callno) { struct rap_call *call; @@ -80,13 +80,13 @@ static void rap_cli_push_paramdesc(struct rap_call *call, char desc) call->paramdesc[len+1] = '\0'; } -static void rap_cli_push_word(struct rap_call *call, uint16 val) +static void rap_cli_push_word(struct rap_call *call, uint16_t val) { rap_cli_push_paramdesc(call, 'W'); ndr_push_uint16(call->ndr_push_param, NDR_SCALARS, val); } -static void rap_cli_push_dword(struct rap_call *call, uint32 val) +static void rap_cli_push_dword(struct rap_call *call, uint32_t val) { rap_cli_push_paramdesc(call, 'D'); ndr_push_uint32(call->ndr_push_param, NDR_SCALARS, val); @@ -104,7 +104,7 @@ static void rap_cli_expect_multiple_entries(struct rap_call *call) { rap_cli_push_paramdesc(call, 'e'); rap_cli_push_paramdesc(call, 'h'); - call->rcv_paramlen += 4; /* uint16 entry count, uint16 total */ + call->rcv_paramlen += 4; /* uint16_t entry count, uint16_t total */ } static void rap_cli_push_string(struct rap_call *call, const char *str) @@ -123,10 +123,10 @@ static void rap_cli_expect_format(struct rap_call *call, const char *format) } static NTSTATUS rap_pull_string(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr, - uint16 convert, char **dest) + uint16_t convert, char **dest) { - uint16 string_offset; - uint16 ignore; + uint16_t string_offset; + uint16_t ignore; const char *p; size_t len; diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c index fd1ea0f340..f6a51a8d91 100644 --- a/source4/torture/raw/acls.c +++ b/source4/torture/raw/acls.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "system/filesys.h" #include "libcli/raw/libcliraw.h" #include "librpc/gen_ndr/ndr_security.h" @@ -843,7 +844,7 @@ static BOOL test_owner_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) expected_bits = SEC_FILE_WRITE_DATA | SEC_FILE_READ_ATTRIBUTE; for (i=0;i<16;i++) { - uint32 bit = (1<<i); + uint32_t bit = (1<<i); io.ntcreatex.in.access_mask = bit; status = smb_raw_open(cli->tree, mem_ctx, &io); if (expected_bits & bit) { diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c index f2cd5b7cf7..97242e8f17 100644 --- a/source4/torture/raw/lock.c +++ b/source4/torture/raw/lock.c @@ -21,6 +21,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" #include "system/time.h" +#include "system/filesys.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c index e8f7e4a712..379e455b2b 100644 --- a/source4/torture/raw/mux.c +++ b/source4/torture/raw/mux.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "system/filesys.h" #include "libcli/raw/libcliraw.h" #include "librpc/gen_ndr/ndr_security.h" diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c index 17a7f18505..8792ab7cab 100644 --- a/source4/torture/raw/open.c +++ b/source4/torture/raw/open.c @@ -21,6 +21,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" #include "system/time.h" +#include "system/filesys.h" #include "librpc/gen_ndr/ndr_security.h" /* enum for whether reads/writes are possible on a file */ diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c index e8e305d01c..3e27f4b0bb 100644 --- a/source4/torture/raw/read.c +++ b/source4/torture/raw/read.c @@ -21,6 +21,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" #include "system/time.h" +#include "system/filesys.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c index be54aecb3d..0f04648672 100644 --- a/source4/torture/raw/search.c +++ b/source4/torture/raw/search.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "system/filesys.h" #include "libcli/raw/libcliraw.h" diff --git a/source4/torture/raw/seek.c b/source4/torture/raw/seek.c index 0d34c831a5..9652b7597f 100644 --- a/source4/torture/raw/seek.c +++ b/source4/torture/raw/seek.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "system/filesys.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c index 54c83de896..6753234af4 100644 --- a/source4/torture/raw/streams.c +++ b/source4/torture/raw/streams.c @@ -23,6 +23,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" #include "librpc/gen_ndr/ndr_security.h" +#include "system/filesys.h" #define BASEDIR "\\teststreams" diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c index 1c8c35d72f..5874da6ef7 100644 --- a/source4/torture/raw/unlink.c +++ b/source4/torture/raw/unlink.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "system/filesys.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c index 7241f8c91a..dead0e4971 100644 --- a/source4/torture/raw/write.c +++ b/source4/torture/raw/write.c @@ -22,6 +22,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" #include "system/time.h" +#include "system/filesys.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index 089f58dc99..277a5fc793 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -1141,7 +1141,7 @@ static BOOL test_LookupPrivDisplayName(struct dcerpc_pipe *p, NTSTATUS status; /* produce a reasonable range of language output without screwing up terminals */ - uint16 language_id = (random() % 4) + 0x409; + uint16_t language_id = (random() % 4) + 0x409; printf("testing LookupPrivDisplayName(%s)\n", priv_name->string); diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index e3c2be038a..7c516da118 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -199,7 +199,7 @@ BOOL test_SetupCredentials3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct netr_ServerAuthenticate3 a; struct netr_Credential credentials1, credentials2, credentials3; struct samr_Password mach_password; - uint32 rid; + uint32_t rid; printf("Testing ServerReqChallenge\n"); diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c index b565d5de76..6164825af7 100644 --- a/source4/torture/rpc/oxidresolve.c +++ b/source4/torture/rpc/oxidresolve.c @@ -33,7 +33,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin struct RemoteActivation r; NTSTATUS status; struct GUID iids[2]; - uint16 protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID }; + uint16_t protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID }; ZERO_STRUCT(r.in); r.in.this.version.MajorVersion = 5; @@ -147,7 +147,7 @@ static int test_ResolveOxid(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint64_t { struct ResolveOxid r; NTSTATUS status; - uint16 protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB }; + uint16_t protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB }; r.in.pOxid = oxid; r.in.cRequestedProtseqs = 2; @@ -171,7 +171,7 @@ static int test_ResolveOxid2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint64_ { struct ResolveOxid2 r; NTSTATUS status; - uint16 protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB }; + uint16_t protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB }; r.in.pOxid = oxid; r.in.cRequestedProtseqs = 2; diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c index aaef981fdb..269c92a5b4 100644 --- a/source4/torture/rpc/remact.c +++ b/source4/torture/rpc/remact.c @@ -32,7 +32,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) struct RemoteActivation r; NTSTATUS status; struct GUID iids[2]; - uint16 protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID }; + uint16_t protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID }; ZERO_STRUCT(r.in); r.in.this.version.MajorVersion = 5; diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c index 1c7e3e0350..06988459fd 100644 --- a/source4/torture/rpc/samlogon.c +++ b/source4/torture/rpc/samlogon.c @@ -73,7 +73,7 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state, struct netr_LogonSamLogonWithFlags *r_flags = &samlogon_state->r_flags; struct netr_NetworkInfo ninfo; struct netr_SamBaseInfo *base = NULL; - uint16 validation_level = 0; + uint16_t validation_level = 0; samlogon_state->r.in.logon.network = &ninfo; samlogon_state->r_ex.in.logon.network = &ninfo; diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index fa64b556ef..31380c109a 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -433,7 +433,7 @@ static BOOL test_SetUserPass(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, static BOOL test_SetUserPass_23(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, - struct policy_handle *handle, uint32 fields_present, + struct policy_handle *handle, uint32_t fields_present, char **password) { NTSTATUS status; @@ -547,7 +547,7 @@ static BOOL test_SetUserPassEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, } static BOOL test_SetUserPass_25(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, - struct policy_handle *handle, uint32 fields_present, + struct policy_handle *handle, uint32_t fields_present, char **password) { NTSTATUS status; @@ -1546,7 +1546,7 @@ static BOOL test_CreateUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, char *password = NULL; int i; - const uint32 password_fields[] = { + const uint32_t password_fields[] = { SAMR_FIELD_PASSWORD, SAMR_FIELD_PASSWORD2, SAMR_FIELD_PASSWORD | SAMR_FIELD_PASSWORD2, diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index f7800e28cc..3fc916450f 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -389,7 +389,7 @@ static BOOL samsync_handle_policy(TALLOC_CTX *mem_ctx, struct samsync_state *sam static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state, int database_id, struct netr_DELTA_ENUM *delta) { - uint32 rid = delta->delta_id_union.rid; + uint32_t rid = delta->delta_id_union.rid; struct netr_DELTA_USER *user = delta->delta_union.user; struct netr_SamInfo3 *info3; struct samr_Password lm_hash; @@ -604,7 +604,7 @@ static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsy static BOOL samsync_handle_alias(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state, int database_id, struct netr_DELTA_ENUM *delta) { - uint32 rid = delta->delta_id_union.rid; + uint32_t rid = delta->delta_id_union.rid; struct netr_DELTA_ALIAS *alias = delta->delta_union.alias; NTSTATUS nt_status; BOOL ret = True; @@ -653,7 +653,7 @@ static BOOL samsync_handle_alias(TALLOC_CTX *mem_ctx, struct samsync_state *sams static BOOL samsync_handle_group(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state, int database_id, struct netr_DELTA_ENUM *delta) { - uint32 rid = delta->delta_id_union.rid; + uint32_t rid = delta->delta_id_union.rid; struct netr_DELTA_GROUP *group = delta->delta_union.group; NTSTATUS nt_status; BOOL ret = True; diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c index bf225a1602..26f186e912 100644 --- a/source4/torture/rpc/schannel.c +++ b/source4/torture/rpc/schannel.c @@ -114,8 +114,8 @@ static BOOL test_netlogon_ops(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, test a schannel connection with the given flags */ static BOOL test_schannel(TALLOC_CTX *mem_ctx, - uint16 acct_flags, uint32 dcerpc_flags, - uint32 schannel_type) + uint16_t acct_flags, uint32_t dcerpc_flags, + uint32_t schannel_type) { void *join_ctx; const char *machine_password; @@ -215,9 +215,9 @@ BOOL torture_rpc_schannel(void) TALLOC_CTX *mem_ctx; BOOL ret = True; struct { - uint16 acct_flags; - uint32 dcerpc_flags; - uint32 schannel_type; + uint16_t acct_flags; + uint32_t dcerpc_flags; + uint32_t schannel_type; } tests[] = { { ACB_WSTRUST, DCERPC_SCHANNEL_WORKSTATION | DCERPC_SIGN, 3 }, { ACB_WSTRUST, DCERPC_SCHANNEL_WORKSTATION | DCERPC_SEAL, 3 }, diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c index 4b1305b7b6..697ae4afe7 100644 --- a/source4/torture/rpc/srvsvc.c +++ b/source4/torture/rpc/srvsvc.c @@ -105,7 +105,7 @@ static BOOL test_NetCharDevEnum(struct dcerpc_pipe *p, r.in.ctr.ctr0 = &c0; r.in.ctr.ctr0->count = 0; r.in.ctr.ctr0->array = NULL; - r.in.max_buffer = (uint32)-1; + r.in.max_buffer = (uint32_t)-1; r.in.resume_handle = NULL; for (i=0;i<ARRAY_SIZE(levels);i++) { @@ -252,7 +252,7 @@ static BOOL test_NetCharDevQEnum(struct dcerpc_pipe *p, r.in.ctr.ctr0 = &c0; r.in.ctr.ctr0->count = 0; r.in.ctr.ctr0->array = NULL; - r.in.max_buffer = (uint32)-1; + r.in.max_buffer = (uint32_t)-1; r.in.resume_handle = NULL; for (i=0;i<ARRAY_SIZE(levels);i++) { diff --git a/source4/torture/rpc/svcctl.c b/source4/torture/rpc/svcctl.c index cadc80a417..092329ab68 100644 --- a/source4/torture/rpc/svcctl.c +++ b/source4/torture/rpc/svcctl.c @@ -28,7 +28,7 @@ static BOOL test_EnumServicesStatus(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct svcctl_EnumServicesStatusW r; int i; NTSTATUS status; - uint32 resume_handle = 0; + uint32_t resume_handle = 0; struct ENUM_SERVICE_STATUS *service = NULL; r.in.handle = h; diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c index f2d79fffa0..9d259ae47a 100644 --- a/source4/torture/rpc/winreg.c +++ b/source4/torture/rpc/winreg.c @@ -365,9 +365,9 @@ static BOOL test_QueryMultipleValues(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, r.in.values[0].type = 0; r.in.num_values = 1; - r.in.buffer_size = r.out.buffer_size = talloc(mem_ctx, uint32); + r.in.buffer_size = r.out.buffer_size = talloc(mem_ctx, uint32_t); *r.in.buffer_size = 0x20; - r.in.buffer = r.out.buffer = talloc_zero_array(mem_ctx, uint8, *r.in.buffer_size); + r.in.buffer = r.out.buffer = talloc_zero_array(mem_ctx, uint8_t, *r.in.buffer_size); status = dcerpc_winreg_QueryMultipleValues(p, mem_ctx, &r); if(NT_STATUS_IS_ERR(status)) { @@ -387,8 +387,8 @@ static BOOL test_QueryValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct p { struct winreg_QueryValue r; NTSTATUS status; - uint32 zero = 0; - uint32 offered = 0xfff; + uint32_t zero = 0; + uint32_t offered = 0xfff; printf("Testing QueryValue\n"); @@ -417,8 +417,8 @@ static BOOL test_EnumValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *handle, int max_valnamelen, int max_valbufsize) { struct winreg_EnumValue r; - uint32 type = 0; - uint32 size = max_valbufsize, zero = 0; + uint32_t type = 0; + uint32_t size = max_valbufsize, zero = 0; BOOL ret = True; uint8_t buf8; uint16_t buf16; diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 12b1214723..b7ca730d1f 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -25,6 +25,7 @@ #include "libcli/raw/libcliraw.h" #include "system/time.h" #include "system/wait.h" +#include "system/filesys.h" #include "ioctl.h" #include "librpc/gen_ndr/ndr_security.h" |