From 2bf01b286c36e635b1ee0469c97394b6c075b3a3 Mon Sep 17 00:00:00 2001 From: Uri Simchoni Date: Sun, 19 Nov 2017 17:54:32 +0000 Subject: [PATCH] s4-torture: fix type of enum in various places Signed-off-by: Uri Simchoni Reviewed-by: Andrew Bartlett --- source4/torture/rpc/clusapi.c | 2 +- source4/torture/smb2/ioctl.c | 4 ++-- source4/torture/smb2/replay.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source4/torture/rpc/clusapi.c b/source4/torture/rpc/clusapi.c index eebfa38c60d..6597b441841 100644 --- a/source4/torture/rpc/clusapi.c +++ b/source4/torture/rpc/clusapi.c @@ -1152,7 +1152,7 @@ static bool test_ResourceTypeControl_int(struct torture_context *tctx, struct dcerpc_pipe *p, struct policy_handle *Cluster, const char *resource_type, - enum clusapi_ClusterControlCode dwControlCode) + enum clusapi_ResourceTypeControlCode dwControlCode) { struct dcerpc_binding_handle *b = p->binding_handle; struct clusapi_ResourceTypeControl r; diff --git a/source4/torture/smb2/ioctl.c b/source4/torture/smb2/ioctl.c index 90171e98ac2..2b7df6efdcb 100644 --- a/source4/torture/smb2/ioctl.c +++ b/source4/torture/smb2/ioctl.c @@ -2846,7 +2846,7 @@ static bool test_ioctl_compress_set_file_attr(struct torture_context *torture, "compression attr before set"); ZERO_STRUCT(set_io); - set_io.generic.level = RAW_FILEINFO_BASIC_INFORMATION; + set_io.generic.level = RAW_SFILEINFO_BASIC_INFORMATION; set_io.basic_info.in.file.handle = fh; set_io.basic_info.in.create_time = io.basic_info.out.create_time; set_io.basic_info.in.access_time = io.basic_info.out.access_time; @@ -2885,7 +2885,7 @@ static bool test_ioctl_compress_set_file_attr(struct torture_context *torture, "compression attr before set"); ZERO_STRUCT(set_io); - set_io.generic.level = RAW_FILEINFO_BASIC_INFORMATION; + set_io.generic.level = RAW_SFILEINFO_BASIC_INFORMATION; set_io.basic_info.in.file.handle = dirh; set_io.basic_info.in.create_time = io.basic_info.out.create_time; set_io.basic_info.in.access_time = io.basic_info.out.access_time; diff --git a/source4/torture/smb2/replay.c b/source4/torture/smb2/replay.c index a38518aebf2..f15fc849125 100644 --- a/source4/torture/smb2/replay.c +++ b/source4/torture/smb2/replay.c @@ -304,7 +304,7 @@ static bool test_replay_commands(struct torture_context *tctx, struct smb2_tree CHECK_STATUS(status, NT_STATUS_OK); qfinfo = (union smb_fileinfo) { - .generic.level = RAW_SFILEINFO_POSITION_INFORMATION, + .generic.level = RAW_FILEINFO_POSITION_INFORMATION, .generic.in.file.handle = h }; torture_comment(tctx, "Trying getinfo\n"); @@ -1677,7 +1677,7 @@ static bool test_channel_sequence_table(struct torture_context *tctx, } qfinfo = (union smb_fileinfo) { - .generic.level = RAW_SFILEINFO_POSITION_INFORMATION, + .generic.level = RAW_FILEINFO_POSITION_INFORMATION, .generic.in.file.handle = handle }; @@ -2350,7 +2350,7 @@ static bool test_replay6(struct torture_context *tctx, struct smb2_tree *tree) torture_reset_break_info(tctx, &break_info); qfinfo = (union smb_fileinfo) { - .generic.level = RAW_SFILEINFO_POSITION_INFORMATION, + .generic.level = RAW_FILEINFO_POSITION_INFORMATION, .generic.in.file.handle = *h }; torture_comment(tctx, "Trying getinfo\n");