summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Disseldorp <ddiss@suse.de>2011-10-18 13:55:22 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-19 15:44:29 +0200
commit5e6c477ef8b7f4799e281ed87a3d4c1eda5dc92f (patch)
treeba205b1534506fa065b902a4d119c56b2d2c5df9
parentb711de287f9318b5de1374c72f0194403e845f79 (diff)
downloadsamba-5e6c477ef8b7f4799e281ed87a3d4c1eda5dc92f.tar.gz
samba-5e6c477ef8b7f4799e281ed87a3d4c1eda5dc92f.tar.bz2
samba-5e6c477ef8b7f4799e281ed87a3d4c1eda5dc92f.zip
s3: remove duplicate fsctl fn definitions
Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source4/libcli/raw/interfaces.h11
-rw-r--r--source4/torture/smb2/ioctl.c4
2 files changed, 2 insertions, 13 deletions
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 7f42926a59..7bb5255b6a 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -2194,17 +2194,6 @@ enum smb_ioctl_level {
/* 2.2.31 SMB2 IOCTL Request */
#define SMB2_IOCTL_FLAG_IS_FSCTL 0x00000001
-#define SMB2_FSCTL_DFS_GET_REFERRALS 0x00060194
-#define SMB2_FSCTL_PIPE_PEEK 0x0011400C
-#define SMB2_FSCTL_PIPE_WAIT 0x00110018
-#define SMB2_FSCTL_PIPE_TRANSCEIVE 0x0011C017
-#define SMB2_FSCTL_SRV_COPYCHUNK 0x001440F2
-#define SMB2_FSCTL_SRV_ENUM_SNAPS 0x00144064
-#define SMB2_FSCTL_SRV_REQUEST_RESUME_KEY 0x00140078
-#define SMB2_FSCTL_SRV_READ_HASH 0x001441bb
-#define SMB2_FSCTL_SRV_COPYCHUNK_WRITE 0x001480F2
-#define SMB2_FSCTL_LMR_REQ_RESILIENCY 0x001401D4
-
/*
union for ioctl() backend
*/
diff --git a/source4/torture/smb2/ioctl.c b/source4/torture/smb2/ioctl.c
index f96893ab44..169a001f31 100644
--- a/source4/torture/smb2/ioctl.c
+++ b/source4/torture/smb2/ioctl.c
@@ -58,13 +58,13 @@ static bool test_ioctl_get_shadow_copy(struct torture_context *torture,
ZERO_STRUCT(ioctl);
ioctl.smb2.level = RAW_IOCTL_SMB2;
ioctl.smb2.in.file.handle = h;
- ioctl.smb2.in.function = SMB2_FSCTL_SRV_ENUM_SNAPS;
+ ioctl.smb2.in.function = FSCTL_SRV_ENUM_SNAPS;
ioctl.smb2.in.max_response_size = 16;
ioctl.smb2.in.flags = SMB2_IOCTL_FLAG_IS_FSCTL;
status = smb2_ioctl(tree, tmp_ctx, &ioctl.smb2);
if (!NT_STATUS_IS_OK(status)) {
- printf("SMB2_FSCTL_SRV_ENUM_SNAPS failed\n");
+ printf("FSCTL_SRV_ENUM_SNAPS failed\n");
return false;
}