summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/basic/utable.c2
-rw-r--r--source4/torture/gentest.c6
-rw-r--r--source4/torture/nbench/nbio.c2
-rw-r--r--source4/torture/raw/oplock.c4
-rw-r--r--source4/torture/rpc/netlogon.c8
-rw-r--r--source4/torture/rpc/samr.c20
-rw-r--r--source4/torture/torture.c4
7 files changed, 23 insertions, 23 deletions
diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index ec37edab82..08cc4bb9b0 100644
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -29,7 +29,7 @@ BOOL torture_utable(int dummy)
smb_ucs2_t c2;
int c, len, fd;
int chars_allowed=0, alt_allowed=0;
- uint8 valid[0x10000];
+ uint8_t valid[0x10000];
printf("starting utable\n");
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index c66f5161d5..2bc5274f36 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -70,7 +70,7 @@ static struct {
BOOL got_break;
uint16_t fnum;
uint16_t handle;
- uint8 level;
+ uint8_t level;
BOOL do_close;
} oplocks[NSERVERS][NINSTANCES];
@@ -94,7 +94,7 @@ static struct {
#define BAD_HANDLE 0xFFFE
-static BOOL oplock_handler(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 level, void *private);
+static BOOL oplock_handler(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private);
static void idle_func(struct cli_transport *transport, void *private);
/*
@@ -704,7 +704,7 @@ static void async_notify(struct cli_request *req)
/*
the oplock handler will either ack the break or close the file
*/
-static BOOL oplock_handler(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 level, void *private)
+static BOOL oplock_handler(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private)
{
union smb_close io;
NTSTATUS status;
diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index 3ce7d66b25..9f8c6e6c73 100644
--- a/source4/torture/nbench/nbio.c
+++ b/source4/torture/nbench/nbio.c
@@ -143,7 +143,7 @@ static struct cli_state *c;
/*
a handler function for oplock break requests
*/
-static BOOL oplock_handler(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 level, void *private)
+static BOOL oplock_handler(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private)
{
struct cli_tree *tree = private;
return cli_oplock_ack(tree, fnum, level);
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index c610f9a78d..862e409fd4 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -45,7 +45,7 @@ static struct {
/*
a handler function for oplock break requests
*/
-static BOOL oplock_handler_ack(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 level, void *private)
+static BOOL oplock_handler_ack(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private)
{
struct cli_tree *tree = private;
break_info.fnum = fnum;
@@ -60,7 +60,7 @@ static BOOL oplock_handler_ack(struct cli_transport *transport, uint16_t tid, ui
/*
a handler function for oplock break requests - close the file
*/
-static BOOL oplock_handler_close(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 level, void *private)
+static BOOL oplock_handler_close(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private)
{
union smb_close io;
NTSTATUS status;
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index e3ff679d97..8fd4a0fd4c 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -241,7 +241,7 @@ static BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
struct netr_ServerReqChallenge r;
struct netr_ServerAuthenticate a;
const char *plain_pass;
- uint8 mach_pwd[16];
+ uint8_t mach_pwd[16];
printf("Testing ServerReqChallenge\n");
@@ -295,7 +295,7 @@ static BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
struct netr_ServerReqChallenge r;
struct netr_ServerAuthenticate2 a;
const char *plain_pass;
- uint8 mach_pwd[16];
+ uint8_t mach_pwd[16];
printf("Testing ServerReqChallenge\n");
@@ -374,8 +374,8 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
DATA_BLOB *chall,
DATA_BLOB *lm_response,
DATA_BLOB *nt_response,
- uint8 lm_key[8],
- uint8 user_session_key[16],
+ uint8_t lm_key[8],
+ uint8_t user_session_key[16],
char **error_string)
{
NTSTATUS status;
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index cce650983a..49faaa886c 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -232,7 +232,7 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
s2.in.level = lvl1; \
u = *q.out.info; \
if (lvl1 == 21) { \
- uint8 *bitmap = u.info21.logon_hours.bitmap; \
+ uint8_t *bitmap = u.info21.logon_hours.bitmap; \
ZERO_STRUCT(u.info21); \
if (fpval == SAMR_FIELD_LOGON_HOURS) { \
u.info21.logon_hours.units_per_week = 168; \
@@ -430,7 +430,7 @@ static BOOL test_SetUserPassEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
BOOL ret = True;
DATA_BLOB session_key;
DATA_BLOB confounded_session_key = data_blob_talloc(mem_ctx, NULL, 16);
- uint8 confounder[16];
+ uint8_t confounder[16];
char *newpass = samr_rand_pass(mem_ctx);
struct MD5Context ctx;
@@ -481,7 +481,7 @@ static BOOL test_SetUserPass_25(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
BOOL ret = True;
DATA_BLOB session_key;
DATA_BLOB confounded_session_key = data_blob_talloc(mem_ctx, NULL, 16);
- uint8 confounder[16];
+ uint8_t confounder[16];
char *newpass = samr_rand_pass(mem_ctx);
struct MD5Context ctx;
@@ -707,8 +707,8 @@ static BOOL test_ChangePasswordUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
struct policy_handle user_handle;
char *oldpass = *password;
char *newpass = samr_rand_pass(mem_ctx);
- uint8 old_nt_hash[16], new_nt_hash[16];
- uint8 old_lm_hash[16], new_lm_hash[16];
+ uint8_t old_nt_hash[16], new_nt_hash[16];
+ uint8_t old_lm_hash[16], new_lm_hash[16];
status = test_OpenUser_byname(p, mem_ctx, handle, TEST_USERNAME, &user_handle);
if (!NT_STATUS_IS_OK(status)) {
@@ -768,7 +768,7 @@ static BOOL test_OemChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_c
struct samr_AsciiName server, account;
char *oldpass = *password;
char *newpass = samr_rand_pass(mem_ctx);
- uint8 old_lm_hash[16], new_lm_hash[16];
+ uint8_t old_lm_hash[16], new_lm_hash[16];
printf("Testing OemChangePasswordUser2\n");
@@ -810,8 +810,8 @@ static BOOL test_ChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
struct samr_Hash nt_verifier, lm_verifier;
char *oldpass = *password;
char *newpass = samr_rand_pass(mem_ctx);
- uint8 old_nt_hash[16], new_nt_hash[16];
- uint8 old_lm_hash[16], new_lm_hash[16];
+ uint8_t old_nt_hash[16], new_nt_hash[16];
+ uint8_t old_lm_hash[16], new_lm_hash[16];
printf("Testing ChangePasswordUser2\n");
@@ -863,8 +863,8 @@ static BOOL test_ChangePasswordUser3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
struct samr_Hash nt_verifier, lm_verifier;
char *oldpass = *password;
char *newpass = samr_rand_pass(mem_ctx);
- uint8 old_nt_hash[16], new_nt_hash[16];
- uint8 old_lm_hash[16], new_lm_hash[16];
+ uint8_t old_nt_hash[16], new_nt_hash[16];
+ uint8_t old_lm_hash[16], new_lm_hash[16];
printf("Testing ChangePasswordUser3\n");
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 28e43b2fa8..7351f42c8b 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -170,10 +170,10 @@ NTSTATUS torture_rpc_close(struct dcerpc_pipe *p)
/* check if the server produced the expected error code */
static BOOL check_error(int line, struct cli_state *c,
- uint8 eclass, uint32_t ecode, NTSTATUS nterr)
+ uint8_t eclass, uint32_t ecode, NTSTATUS nterr)
{
if (cli_is_dos_error(c->tree)) {
- uint8 class;
+ uint8_t class;
uint32_t num;
/* Check DOS error */