s3: Remove duplicate fsctl function definitions

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index 0ee5685df3a84a584e64cea738c5b1d15c77c166..511d223be6b7ddeb55800fbcb2eb49d7d2e767fd 100644 (file)
--- a/libcli/smb/smb_constants.h
+++ b/libcli/smb/smb_constants.h
@@ -125,6 +125,7 @@ enum csc_policy {
 #define FSCTL_OPLOCK_BREAK_NOTIFY       (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0014 | FSCTL_METHOD_BUFFERED)
 #define FSCTL_FILESYS_GET_STATISTICS   (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0060 | FSCTL_METHOD_BUFFERED)
 #define FSCTL_GET_NTFS_VOLUME_DATA     (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0064 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_IS_VOLUME_DIRTY          (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0078 | FSCTL_METHOD_BUFFERED)
 #define FSCTL_FIND_FILES_BY_SID                (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x008C | FSCTL_METHOD_NEITHER)
 #define FSCTL_SET_OBJECT_ID            (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0098 | FSCTL_METHOD_BUFFERED)
 #define FSCTL_GET_OBJECT_ID            (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x009C | FSCTL_METHOD_BUFFERED)
@@ -134,6 +135,7 @@ enum csc_policy {
 #define FSCTL_DELETE_REPARSE_POINT     (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00AC | FSCTL_METHOD_BUFFERED)
 #define FSCTL_CREATE_OR_GET_OBJECT_ID  (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00C0 | FSCTL_METHOD_BUFFERED)
 #define FSCTL_SET_SPARSE               (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00C4 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_QUERY_ALLOCATED_RANGES   (FSCTL_FILESYSTEM | FSCTL_ACCESS_READ | 0x00CC | FSCTL_METHOD_NEITHER)
 
 #define FSCTL_NAMED_PIPE               0x00110000
 #define FSCTL_NAMED_PIPE_READ_WRITE    (FSCTL_NAMED_PIPE | FSCTL_ACCESS_ANY | 0xC014 | FSCTL_METHOD_NEITHER)

diff --git a/source3/include/ntioctl.h b/source3/include/ntioctl.h
index 706cc16267c0c3b8c08617baaa42aca6ff19360e..e09e1c85db3a46e7ccfdc3bbb026c4a63a2451c0 100644 (file)
--- a/source3/include/ntioctl.h
+++ b/source3/include/ntioctl.h
@@ -17,58 +17,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*
-  I'm guessing we will need to support a bunch of these eventually. For now
-  we only need the sparse flag
-*/
-
 #ifndef _NTIOCTL_H
 #define _NTIOCTL_H
 
-/* IOCTL information */
-/* List of ioctl function codes that look to be of interest to remote clients like this. */
-/* Need to do some experimentation to make sure they all work remotely.                  */
-/* Some of the following such as the encryption/compression ones would be                */
-/* invoked from tools via a specialized hook into the VFS rather than via the            */
-/* standard vfs entry points */
-#define FSCTL_REQUEST_OPLOCK_LEVEL_1 0x00090000
-#define FSCTL_REQUEST_OPLOCK_LEVEL_2 0x00090004
-#define FSCTL_REQUEST_BATCH_OPLOCK   0x00090008
-#define FSCTL_LOCK_VOLUME            0x00090018
-#define FSCTL_UNLOCK_VOLUME          0x0009001C
-#define FSCTL_GET_COMPRESSION        0x0009003C
-#define FSCTL_SET_COMPRESSION        0x0009C040
-#define FSCTL_IS_VOLUME_DIRTY       0x00090078
-#define FSCTL_REQUEST_FILTER_OPLOCK  0x0009008C
-#define FSCTL_FIND_FILES_BY_SID             0x0009008F
-#define FSCTL_FILESYS_GET_STATISTICS 0x00090090
-#define FSCTL_SET_OBJECT_ID          0x00090098
-#define FSCTL_GET_OBJECT_ID          0x0009009C
-#define FSCTL_SET_REPARSE_POINT      0x000900A4
-#define FSCTL_GET_REPARSE_POINT      0x000900A8
-#define FSCTL_DELETE_REPARSE_POINT   0x000900AC
-#define FSCTL_CREATE_OR_GET_OBJECT_ID 0x000900C0
-#define FSCTL_SET_SPARSE             0x000900C4
-#define FSCTL_SET_ZERO_DATA          0x000900C8
-#define FSCTL_SET_ENCRYPTION         0x000900D7
-#define FSCTL_ENCRYPTION_FSCTL_IO    0x000900DB
-#define FSCTL_WRITE_RAW_ENCRYPTED    0x000900DF
-#define FSCTL_READ_RAW_ENCRYPTED     0x000900E3
-#define FSCTL_SIS_COPYFILE           0x00090100
-#define FSCTL_QUERY_ALLOCATED_RANGES 0x000940CF
-#define FSCTL_SIS_LINK_FILES         0x0009C104
-
-#define FSCTL_GET_SHADOW_COPY_DATA   0x00144064   /* KJC -- Shadow Copy information */
-
-#if 0
-#define FSCTL_SECURITY_ID_CHECK
-#define FSCTL_DISMOUNT_VOLUME
-#define FSCTL_GET_NTFS_FILE_RECORD
-#define FSCTL_ALLOW_EXTENDED_DASD_IO
-#define FSCTL_RECALL_FILE
-
-#endif
-
 #define IO_REPARSE_TAG_SYMLINK      0xA000000C
 #define SYMLINK_FLAG_RELATIVE       0x00000001
 

diff --git a/source3/libsmb/clisymlink.c b/source3/libsmb/clisymlink.c
index e744a38dbe4df412b65c3e907b96633ac037a113..fad9826880ff67db919841c9afc8dd5079e909a2 100644 (file)
--- a/source3/libsmb/clisymlink.c
+++ b/source3/libsmb/clisymlink.c
@@ -24,7 +24,6 @@
 #include "async_smb.h"
 #include "libsmb/clirap.h"
 #include "trans2.h"
-#include "ntioctl.h"
 #include "libcli/security/secdesc.h"
 #include "libcli/security/security.h"
 

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 8e78d3cd9cc1802d0bece50380b566c33c3f46fc..05d42a2e89019ea64a382a0cd3fcc8b389e235ae 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -27,7 +27,6 @@
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "passdb/lookup_sid.h"
 #include "auth.h"
-#include "ntioctl.h"
 #include "smbprofile.h"
 #include "libsmb/libsmb.h"
 

diff --git a/source3/torture/test_nttrans_fsctl.c b/source3/torture/test_nttrans_fsctl.c
index e60964ee13de91eaa60392834975aded1d2b503c..963b20ef4b6a1c604b0a990686ab4c0140709f2a 100644 (file)
--- a/source3/torture/test_nttrans_fsctl.c
+++ b/source3/torture/test_nttrans_fsctl.c
@@ -22,7 +22,6 @@
 #include "torture/proto.h"
 #include "libsmb/libsmb.h"
 #include "libcli/security/security.h"
-#include "ntioctl.h"
 
 bool run_nttrans_fsctl(int dummy)
 {