summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/basic/aliases.c18
-rw-r--r--source4/torture/basic/scanner.c2
-rw-r--r--source4/torture/gentest.c46
-rw-r--r--source4/torture/nbench/nbio.c2
-rw-r--r--source4/torture/raw/context.c2
-rw-r--r--source4/torture/raw/open.c4
-rw-r--r--source4/torture/raw/oplock.c6
-rw-r--r--source4/torture/rpc/dfs.c8
-rw-r--r--source4/torture/rpc/lsa.c2
-rw-r--r--source4/torture/rpc/samr.c34
-rw-r--r--source4/torture/rpc/spoolss.c6
-rw-r--r--source4/torture/rpc/winreg.c2
-rw-r--r--source4/torture/rpc/wkssvc.c2
-rw-r--r--source4/torture/torture.c10
-rw-r--r--source4/torture/torture_util.c2
15 files changed, 73 insertions, 73 deletions
diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index c4d6f94700..9fe2baa300 100644
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -24,7 +24,7 @@ int create_complex_file(struct cli_state *cli, TALLOC_CTX *mem_ctx, const char *
struct trans2_blobs {
struct trans2_blobs *next, *prev;
- uint16 level;
+ uint16_t level;
DATA_BLOB params, data;
};
@@ -32,7 +32,7 @@ struct trans2_blobs {
static void gen_aliases(struct cli_state *cli, struct smb_trans2 *t2, int level_offset)
{
TALLOC_CTX *mem_ctx;
- uint16 level;
+ uint16_t level;
struct trans2_blobs *alias_blobs = NULL;
struct trans2_blobs *t2b, *t2b2;
int count=0, alias_count=0;
@@ -81,7 +81,7 @@ static void gen_aliases(struct cli_state *cli, struct smb_trans2 *t2, int level_
static void qfsinfo_aliases(struct cli_state *cli)
{
struct smb_trans2 t2;
- uint16 setup = TRANSACT2_QFSINFO;
+ uint16_t setup = TRANSACT2_QFSINFO;
d_printf("\nChecking for QFSINFO aliases\n");
@@ -102,7 +102,7 @@ static void qfsinfo_aliases(struct cli_state *cli)
static void qfileinfo_aliases(struct cli_state *cli)
{
struct smb_trans2 t2;
- uint16 setup = TRANSACT2_QFILEINFO;
+ uint16_t setup = TRANSACT2_QFILEINFO;
const char *fname = "\\qfileinfo_aliases.txt";
int fnum;
@@ -139,7 +139,7 @@ static void qfileinfo_aliases(struct cli_state *cli)
static void qpathinfo_aliases(struct cli_state *cli)
{
struct smb_trans2 t2;
- uint16 setup = TRANSACT2_QPATHINFO;
+ uint16_t setup = TRANSACT2_QPATHINFO;
const char *fname = "\\qpathinfo_aliases.txt";
int fnum;
TALLOC_CTX *mem_ctx;
@@ -183,7 +183,7 @@ static void qpathinfo_aliases(struct cli_state *cli)
static void findfirst_aliases(struct cli_state *cli)
{
struct smb_trans2 t2;
- uint16 setup = TRANSACT2_FINDFIRST;
+ uint16_t setup = TRANSACT2_FINDFIRST;
const char *fname = "\\findfirst_aliases.txt";
int fnum;
TALLOC_CTX *mem_ctx;
@@ -232,7 +232,7 @@ static void findfirst_aliases(struct cli_state *cli)
static void gen_set_aliases(struct cli_state *cli, struct smb_trans2 *t2, int level_offset)
{
TALLOC_CTX *mem_ctx;
- uint16 level;
+ uint16_t level;
struct trans2_blobs *alias_blobs = NULL;
struct trans2_blobs *t2b;
int count=0, dsize;
@@ -298,7 +298,7 @@ static void gen_set_aliases(struct cli_state *cli, struct smb_trans2 *t2, int le
static void setfileinfo_aliases(struct cli_state *cli)
{
struct smb_trans2 t2;
- uint16 setup = TRANSACT2_SETFILEINFO;
+ uint16_t setup = TRANSACT2_SETFILEINFO;
const char *fname = "\\setfileinfo_aliases.txt";
int fnum;
@@ -335,7 +335,7 @@ static void setfileinfo_aliases(struct cli_state *cli)
static void setpathinfo_aliases(struct cli_state *cli)
{
struct smb_trans2 t2;
- uint16 setup = TRANSACT2_SETPATHINFO;
+ uint16_t setup = TRANSACT2_SETPATHINFO;
const char *fname = "\\setpathinfo_aliases.txt";
int fnum;
TALLOC_CTX *mem_ctx;
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index 7368528200..cf513414e8 100644
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -53,7 +53,7 @@ static NTSTATUS try_trans2(struct cli_state *cli,
{
NTSTATUS status;
struct smb_trans2 t2;
- uint16 setup = op;
+ uint16_t setup = op;
TALLOC_CTX *mem_ctx;
mem_ctx = talloc_init("try_trans2");
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 1f33257e6a..c66f5161d5 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -68,8 +68,8 @@ static struct {
/* oplock break info */
static struct {
BOOL got_break;
- uint16 fnum;
- uint16 handle;
+ uint16_t fnum;
+ uint16_t handle;
uint8 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 tid, uint16 fnum, uint8 level, void *private);
+static BOOL oplock_handler(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 level, void *private);
static void idle_func(struct cli_transport *transport, void *private);
/*
@@ -206,7 +206,7 @@ static uint_t time_skew(void)
/*
turn an fnum for an instance into a handle
*/
-static uint_t fnum_to_handle(int server, int instance, uint16 fnum)
+static uint_t fnum_to_handle(int server, int instance, uint16_t fnum)
{
uint_t i;
for (i=0;i<options.max_open_handles;i++) {
@@ -224,7 +224,7 @@ static uint_t fnum_to_handle(int server, int instance, uint16 fnum)
/*
add some newly opened handles
*/
-static void gen_add_handle(int instance, const char *name, uint16 fnums[NSERVERS])
+static void gen_add_handle(int instance, const char *name, uint16_t fnums[NSERVERS])
{
int i, h;
for (h=0;h<options.max_open_handles;h++) {
@@ -260,7 +260,7 @@ static void gen_add_handle(int instance, const char *name, uint16 fnums[NSERVERS
/*
remove a closed handle
*/
-static void gen_remove_handle(int instance, uint16 fnums[NSERVERS])
+static void gen_remove_handle(int instance, uint16_t fnums[NSERVERS])
{
int h;
for (h=0;h<options.max_open_handles;h++) {
@@ -290,7 +290,7 @@ static BOOL gen_chance(uint_t chance)
/*
map an internal handle number to a server fnum
*/
-static uint16 gen_lookup_fnum(int server, uint16 handle)
+static uint16_t gen_lookup_fnum(int server, uint16_t handle)
{
if (handle == BAD_HANDLE) return handle;
return open_handles[handle].server_fnum[server];
@@ -299,9 +299,9 @@ static uint16 gen_lookup_fnum(int server, uint16 handle)
/*
return a file handle
*/
-static uint16 gen_fnum(int instance)
+static uint16_t gen_fnum(int instance)
{
- uint16 h;
+ uint16_t h;
int count = 0;
if (gen_chance(20)) return BAD_HANDLE;
@@ -320,7 +320,7 @@ static uint16 gen_fnum(int instance)
return a file handle, but skewed so we don't close the last
couple of handles too readily
*/
-static uint16 gen_fnum_close(int instance)
+static uint16_t gen_fnum_close(int instance)
{
if (num_open_handles < 3) {
if (gen_chance(80)) return BAD_HANDLE;
@@ -342,7 +342,7 @@ static int gen_int_range(uint_t min, uint_t max)
return a fnum for use as a root fid
be careful to call GEN_SET_FNUM() when you use this!
*/
-static uint16 gen_root_fid(int instance)
+static uint16_t gen_root_fid(int instance)
{
if (gen_chance(5)) return gen_fnum(instance);
return 0;
@@ -412,7 +412,7 @@ static const char *gen_fname(void)
*/
static const char *gen_fname_open(int instance)
{
- uint16 h;
+ uint16_t h;
h = gen_fnum(instance);
if (h == BAD_HANDLE) {
return gen_fname();
@@ -472,7 +472,7 @@ static BOOL gen_bool(void)
/*
generate ntrename flags
*/
-static uint16 gen_rename_flags(void)
+static uint16_t gen_rename_flags(void)
{
if (gen_chance(30)) return RENAME_FLAG_RENAME;
if (gen_chance(30)) return RENAME_FLAG_HARD_LINK;
@@ -484,7 +484,7 @@ static uint16 gen_rename_flags(void)
/*
return a lockingx lock mode
*/
-static uint16 gen_lock_mode(void)
+static uint16_t gen_lock_mode(void)
{
if (gen_chance(5)) return gen_bits_mask(0xFFFF);
if (gen_chance(20)) return gen_bits_mask(0x1F);
@@ -494,7 +494,7 @@ static uint16 gen_lock_mode(void)
/*
generate a pid
*/
-static uint16 gen_pid(void)
+static uint16_t gen_pid(void)
{
if (gen_chance(10)) return gen_bits_mask(0xFFFF);
return getpid();
@@ -549,7 +549,7 @@ static uint32_t gen_open_disp(void)
/*
generate an openx open mode
*/
-static uint16 gen_openx_mode(void)
+static uint16_t gen_openx_mode(void)
{
if (gen_chance(20)) return gen_bits_mask(0xFFFF);
if (gen_chance(20)) return gen_bits_mask(0xFF);
@@ -559,7 +559,7 @@ static uint16 gen_openx_mode(void)
/*
generate an openx flags field
*/
-static uint16 gen_openx_flags(void)
+static uint16_t gen_openx_flags(void)
{
if (gen_chance(20)) return gen_bits_mask(0xFFFF);
return gen_bits_mask(0x7);
@@ -568,7 +568,7 @@ static uint16 gen_openx_flags(void)
/*
generate an openx open function
*/
-static uint16 gen_openx_func(void)
+static uint16_t gen_openx_func(void)
{
if (gen_chance(20)) return gen_bits_mask(0xFFFF);
return gen_bits_mask(0x13);
@@ -675,7 +675,7 @@ static void async_notify(struct cli_request *req)
struct smb_notify notify;
NTSTATUS status;
int i, j;
- uint16 tid;
+ uint16_t tid;
struct cli_transport *transport = req->transport;
tid = SVAL(req->in.hdr, HDR_TID);
@@ -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 tid, uint16 fnum, uint8 level, void *private)
+static BOOL oplock_handler(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 level, void *private)
{
union smb_close io;
NTSTATUS status;
@@ -852,7 +852,7 @@ again:
for (j=0;j<NINSTANCES;j++) {
if (oplocks[0][j].got_break &&
oplocks[0][j].do_close) {
- uint16 fnums[NSERVERS];
+ uint16_t fnums[NSERVERS];
for (i=0;i<NSERVERS;i++) {
fnums[i] = oplocks[i][j].fnum;
}
@@ -968,7 +968,7 @@ again:
} while(0)
#define ADD_HANDLE(name, field) do { \
- uint16 fnums[NSERVERS]; \
+ uint16_t fnums[NSERVERS]; \
int i; \
for (i=0;i<NSERVERS;i++) { \
fnums[i] = parm[i].field; \
@@ -977,7 +977,7 @@ again:
} while(0)
#define REMOVE_HANDLE(field) do { \
- uint16 fnums[NSERVERS]; \
+ uint16_t fnums[NSERVERS]; \
int i; \
for (i=0;i<NSERVERS;i++) { \
fnums[i] = parm[i].field; \
diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index e65815fb80..3ce7d66b25 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 tid, uint16 fnum, uint8 level, void *private)
+static BOOL oplock_handler(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 level, void *private)
{
struct cli_tree *tree = private;
return cli_oplock_ack(tree, fnum, level);
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index 91763da86f..29aa915b5d 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -265,7 +265,7 @@ static BOOL test_pid(struct cli_state *cli, TALLOC_CTX *mem_ctx)
int fnum;
const char *fname = BASEDIR "\\test.txt";
char c = 1;
- uint16 pid1, pid2;
+ uint16_t pid1, pid2;
printf("TESTING PID HANDLING\n");
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 88cadf7b66..8a4e09374b 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -265,7 +265,7 @@ static BOOL test_openx(struct cli_state *cli, TALLOC_CTX *mem_ctx)
BOOL ret = True;
int i;
struct {
- uint16 open_func;
+ uint16_t open_func;
BOOL with_file;
NTSTATUS correct_status;
} open_funcs[] = {
@@ -454,7 +454,7 @@ static BOOL test_t2open(struct cli_state *cli, TALLOC_CTX *mem_ctx)
BOOL ret = True;
int i;
struct {
- uint16 open_func;
+ uint16_t open_func;
BOOL with_file;
NTSTATUS correct_status;
} open_funcs[] = {
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 403d19113d..c610f9a78d 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 tid, uint16 fnum, uint8 level, void *private)
+static BOOL oplock_handler_ack(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 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 tid, uint
/*
a handler function for oplock break requests - close the file
*/
-static BOOL oplock_handler_close(struct cli_transport *transport, uint16 tid, uint16 fnum, uint8 level, void *private)
+static BOOL oplock_handler_close(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 level, void *private)
{
union smb_close io;
NTSTATUS status;
@@ -95,7 +95,7 @@ static BOOL test_oplock(struct cli_state *cli, TALLOC_CTX *mem_ctx)
union smb_open io;
struct smb_unlink unl;
union smb_read rd;
- uint16 fnum, fnum2;
+ uint16_t fnum, fnum2;
/* cleanup */
cli_unlink(cli->tree, fname);
diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index 3aa17b6ecc..30c352680a 100644
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -39,7 +39,7 @@ static BOOL test_Exist(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
return True;
}
-static BOOL test_InfoLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16 level,
+static BOOL test_InfoLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16_t level,
const char *root)
{
NTSTATUS status;
@@ -64,7 +64,7 @@ static BOOL test_InfoLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16 le
static BOOL test_Info(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, const char *root)
{
BOOL ret = True;
- uint16 levels[] = {1, 2, 3, 4, 100, 101, 102, 200, 300};
+ uint16_t levels[] = {1, 2, 3, 4, 100, 101, 102, 200, 300};
int i;
for (i=0;i<ARRAY_SIZE(levels);i++) {
if (!test_InfoLevel(p, mem_ctx, levels[i], root)) {
@@ -74,7 +74,7 @@ static BOOL test_Info(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, const char *ro
return ret;
}
-static BOOL test_EnumLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16 level)
+static BOOL test_EnumLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16_t level)
{
NTSTATUS status;
struct dfs_Enum r;
@@ -120,7 +120,7 @@ static BOOL test_EnumLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16 le
static BOOL test_Enum(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
{
BOOL ret = True;
- uint16 levels[] = {1, 2, 3, 4, 200, 300};
+ uint16_t levels[] = {1, 2, 3, 4, 200, 300};
int i;
for (i=0;i<ARRAY_SIZE(levels);i++) {
if (!test_EnumLevel(p, mem_ctx, levels[i])) {
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index f3e1c04d29..306197dcf2 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -33,7 +33,7 @@ static BOOL test_OpenPolicy(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
struct lsa_QosInfo qos;
struct lsa_OpenPolicy r;
NTSTATUS status;
- uint16 system_name = '\\';
+ uint16_t system_name = '\\';
printf("\ntesting OpenPolicy\n");
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 4b65cc75f9..cce650983a 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -532,7 +532,7 @@ static BOOL test_SetAliasInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
NTSTATUS status;
struct samr_SetAliasInfo r;
struct samr_QueryAliasInfo q;
- uint16 levels[] = {2, 3};
+ uint16_t levels[] = {2, 3};
int i;
BOOL ret = True;
@@ -1538,7 +1538,7 @@ static BOOL test_QueryAliasInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
{
NTSTATUS status;
struct samr_QueryAliasInfo r;
- uint16 levels[] = {1, 2, 3};
+ uint16_t levels[] = {1, 2, 3};
int i;
BOOL ret = True;
@@ -1564,7 +1564,7 @@ static BOOL test_QueryGroupInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
{
NTSTATUS status;
struct samr_QueryGroupInfo r;
- uint16 levels[] = {1, 2, 3, 4};
+ uint16_t levels[] = {1, 2, 3, 4};
int i;
BOOL ret = True;
@@ -1592,8 +1592,8 @@ static BOOL test_SetGroupInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
NTSTATUS status;
struct samr_QueryGroupInfo r;
struct samr_SetGroupInfo s;
- uint16 levels[] = {1, 2, 3, 4};
- uint16 set_ok[] = {0, 1, 1, 1};
+ uint16_t levels[] = {1, 2, 3, 4};
+ uint16_t set_ok[] = {0, 1, 1, 1};
int i;
BOOL ret = True;
@@ -1650,7 +1650,7 @@ static BOOL test_QueryUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
{
NTSTATUS status;
struct samr_QueryUserInfo r;
- uint16 levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+ uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 16, 17, 20, 21};
int i;
BOOL ret = True;
@@ -1677,7 +1677,7 @@ static BOOL test_QueryUserInfo2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
{
NTSTATUS status;
struct samr_QueryUserInfo2 r;
- uint16 levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+ uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 16, 17, 20, 21};
int i;
BOOL ret = True;
@@ -1968,8 +1968,8 @@ static BOOL test_GetDisplayEnumerationIndex(struct dcerpc_pipe *p, TALLOC_CTX *m
NTSTATUS status;
struct samr_GetDisplayEnumerationIndex r;
BOOL ret = True;
- uint16 levels[] = {1, 2, 3, 4, 5};
- uint16 ok_lvl[] = {1, 1, 1, 0, 0};
+ uint16_t levels[] = {1, 2, 3, 4, 5};
+ uint16_t ok_lvl[] = {1, 1, 1, 0, 0};
int i;
for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -2009,8 +2009,8 @@ static BOOL test_GetDisplayEnumerationIndex2(struct dcerpc_pipe *p, TALLOC_CTX *
NTSTATUS status;
struct samr_GetDisplayEnumerationIndex2 r;
BOOL ret = True;
- uint16 levels[] = {1, 2, 3, 4, 5};
- uint16 ok_lvl[] = {1, 1, 1, 0, 0};
+ uint16_t levels[] = {1, 2, 3, 4, 5};
+ uint16_t ok_lvl[] = {1, 1, 1, 0, 0};
int i;
for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -2048,7 +2048,7 @@ static BOOL test_QueryDisplayInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
NTSTATUS status;
struct samr_QueryDisplayInfo r;
BOOL ret = True;
- uint16 levels[] = {1, 2, 3, 4, 5};
+ uint16_t levels[] = {1, 2, 3, 4, 5};
int i;
for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -2077,7 +2077,7 @@ static BOOL test_QueryDisplayInfo2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
NTSTATUS status;
struct samr_QueryDisplayInfo2 r;
BOOL ret = True;
- uint16 levels[] = {1, 2, 3, 4, 5};
+ uint16_t levels[] = {1, 2, 3, 4, 5};
int i;
for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -2106,7 +2106,7 @@ static BOOL test_QueryDisplayInfo3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
NTSTATUS status;
struct samr_QueryDisplayInfo3 r;
BOOL ret = True;
- uint16 levels[] = {1, 2, 3, 4, 5};
+ uint16_t levels[] = {1, 2, 3, 4, 5};
int i;
for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -2135,8 +2135,8 @@ static BOOL test_QueryDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
NTSTATUS status;
struct samr_QueryDomainInfo r;
struct samr_SetDomainInfo s;
- uint16 levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13};
- uint16 set_ok[] = {1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0};
+ uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13};
+ uint16_t set_ok[] = {1, 0, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0};
int i;
BOOL ret = True;
@@ -2195,7 +2195,7 @@ static BOOL test_QueryDomainInfo2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
{
NTSTATUS status;
struct samr_QueryDomainInfo2 r;
- uint16 levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13};
+ uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13};
int i;
BOOL ret = True;
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 6e6d325ab0..74860cd369 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -26,7 +26,7 @@ static BOOL test_GetPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
{
NTSTATUS status;
struct spoolss_GetPrinter r;
- uint16 levels[] = {1, 2, 3, 4, 5, 6, 7};
+ uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7};
int i;
BOOL ret = True;
@@ -751,7 +751,7 @@ static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
{
struct spoolss_EnumPrinters r;
NTSTATUS status;
- uint16 levels[] = {1, 2, 4, 5};
+ uint16_t levels[] = {1, 2, 4, 5};
int i;
BOOL ret = True;
@@ -867,7 +867,7 @@ static BOOL test_EnumPrinterDrivers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
{
struct spoolss_EnumPrinterDrivers r;
NTSTATUS status;
- uint16 levels[] = {1, 2, 3};
+ uint16_t levels[] = {1, 2, 3};
int i;
BOOL ret = True;
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 7fa93aa0c9..3a1d7be68b 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -409,7 +409,7 @@ static BOOL test_AbortSystemShutdown(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
{
struct winreg_AbortSystemShutdown r;
NTSTATUS status;
- uint16 server = 0x0;
+ uint16_t server = 0x0;
r.in.server = &server;
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index b1dc2edfcf..4768163d5c 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -27,7 +27,7 @@ static BOOL test_NetWkstaGetInfo(struct dcerpc_pipe *p,
{
NTSTATUS status;
struct wkssvc_NetWkstaGetInfo r;
- uint16 levels[] = {100, 101, 102, 502};
+ uint16_t levels[] = {100, 101, 102, 502};
int i;
BOOL ret = True;
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index d5e7fbd3b2..28e43b2fa8 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -665,8 +665,8 @@ static BOOL run_tcon_test(int dummy)
struct cli_state *cli;
const char *fname = "\\tcontest.tmp";
int fnum1;
- uint16 cnum1, cnum2, cnum3;
- uint16 vuid1, vuid2;
+ uint16_t cnum1, cnum2, cnum3;
+ uint16_t vuid1, vuid2;
char buf[4];
BOOL ret = True;
struct cli_tree *tree1;
@@ -2798,7 +2798,7 @@ static BOOL run_vuidtest(int dummy)
time_t c_time, a_time, m_time, w_time, m_time2;
BOOL correct = True;
- uint16 orig_vuid;
+ uint16_t orig_vuid;
NTSTATUS result;
printf("starting vuid test\n");
@@ -3404,7 +3404,7 @@ static BOOL run_openattrtest(int dummy)
const char *fname = "\\openattr.file";
int fnum1;
BOOL correct = True;
- uint16 attr;
+ uint16_t attr;
unsigned int i, j, k, l;
int failures = 0;
@@ -3596,7 +3596,7 @@ static void del_fn(file_info *finfo, const char *mask, void *state)
BOOL torture_ioctl_test(int dummy)
{
struct cli_state *cli;
- uint16 device, function;
+ uint16_t device, function;
int fnum;
const char *fname = "\\ioctl.dat";
NTSTATUS status;
diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index 5b9e36ea71..a9173aade1 100644
--- a/source4/torture/torture_util.c
+++ b/source4/torture/torture_util.c
@@ -304,7 +304,7 @@ BOOL split_username(const char *pair, char **user, char **pass)
/*
set a attribute on a file
*/
-BOOL torture_set_file_attribute(struct cli_tree *tree, const char *fname, uint16 attrib)
+BOOL torture_set_file_attribute(struct cli_tree *tree, const char *fname, uint16_t attrib)
{
union smb_setfileinfo sfinfo;
NTSTATUS status;
generated by cgit (git 2.34.1) at 2024-06-28 06:51:27 +0000