libcli/smb: move some *TRANSACT_* flags to smb_constants.h

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index c2133e074426ae9752c8229fbd1127900d29cd25..4b24be07d197d9ae0106e5c1e8c8485eb7d08448 100644 (file)
--- a/libcli/smb/smb_constants.h
+++ b/libcli/smb/smb_constants.h
@@ -434,6 +434,40 @@ enum csc_policy {
 #define FILE_WAS_CREATED 2
 #define FILE_WAS_OVERWRITTEN 3
 
+/* These are the trans subcommands */
+#define TRANSACT_SETNAMEDPIPEHANDLESTATE  0x01
+#define TRANSACT_DCERPCCMD                0x26
+#define TRANSACT_WAITNAMEDPIPEHANDLESTATE 0x53
+
+/* These are the TRANS2 sub commands */
+#define TRANSACT2_OPEN                        0
+#define TRANSACT2_FINDFIRST                   1
+#define TRANSACT2_FINDNEXT                    2
+#define TRANSACT2_QFSINFO                     3
+#define TRANSACT2_SETFSINFO                   4
+#define TRANSACT2_QPATHINFO                   5
+#define TRANSACT2_SETPATHINFO                 6
+#define TRANSACT2_QFILEINFO                   7
+#define TRANSACT2_SETFILEINFO                 8
+#define TRANSACT2_FSCTL                       9
+#define TRANSACT2_IOCTL                     0xA
+#define TRANSACT2_FINDNOTIFYFIRST           0xB
+#define TRANSACT2_FINDNOTIFYNEXT            0xC
+#define TRANSACT2_MKDIR                     0xD
+#define TRANSACT2_SESSION_SETUP             0xE
+#define TRANSACT2_GET_DFS_REFERRAL         0x10
+#define TRANSACT2_REPORT_DFS_INCONSISTANCY 0x11
+
+/* These are the NT transact sub commands. */
+#define NT_TRANSACT_CREATE                1
+#define NT_TRANSACT_IOCTL                 2
+#define NT_TRANSACT_SET_SECURITY_DESC     3
+#define NT_TRANSACT_NOTIFY_CHANGE         4
+#define NT_TRANSACT_RENAME                5
+#define NT_TRANSACT_QUERY_SECURITY_DESC   6
+#define NT_TRANSACT_GET_USER_QUOTA        7
+#define NT_TRANSACT_SET_USER_QUOTA        8
+
 /* ioctl codes */
 #define IOCTL_QUERY_JOB_INFO      0x530060
 

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 2b3b730469ec5c0406452ff664ad6230f989e9fb..1f6813e1145adc23c32fa293d25543a2e818c636 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -266,40 +266,6 @@ Offset  Data                       length.
 #define smb_vwv16      (smb_vwv+(16*2))
 #define smb_vwv17      (smb_vwv+(17*2))
 
-/* These are the trans subcommands */
-#define TRANSACT_SETNAMEDPIPEHANDLESTATE  0x01 
-#define TRANSACT_DCERPCCMD                0x26
-#define TRANSACT_WAITNAMEDPIPEHANDLESTATE 0x53
-
-/* These are the TRANS2 sub commands */
-#define TRANSACT2_OPEN                         0x00
-#define TRANSACT2_FINDFIRST                    0x01
-#define TRANSACT2_FINDNEXT                     0x02
-#define TRANSACT2_QFSINFO                      0x03
-#define TRANSACT2_SETFSINFO                    0x04
-#define TRANSACT2_QPATHINFO                    0x05
-#define TRANSACT2_SETPATHINFO                  0x06
-#define TRANSACT2_QFILEINFO                    0x07
-#define TRANSACT2_SETFILEINFO                  0x08
-#define TRANSACT2_FSCTL                                0x09
-#define TRANSACT2_IOCTL                                0x0A
-#define TRANSACT2_FINDNOTIFYFIRST              0x0B
-#define TRANSACT2_FINDNOTIFYNEXT               0x0C
-#define TRANSACT2_MKDIR                                0x0D
-#define TRANSACT2_SESSION_SETUP                        0x0E
-#define TRANSACT2_GET_DFS_REFERRAL             0x10
-#define TRANSACT2_REPORT_DFS_INCONSISTANCY     0x11
-
-/* These are the NT transact sub commands. */
-#define NT_TRANSACT_CREATE                1
-#define NT_TRANSACT_IOCTL                 2
-#define NT_TRANSACT_SET_SECURITY_DESC     3
-#define NT_TRANSACT_NOTIFY_CHANGE         4
-#define NT_TRANSACT_RENAME                5
-#define NT_TRANSACT_QUERY_SECURITY_DESC   6
-#define NT_TRANSACT_GET_USER_QUOTA       7
-#define NT_TRANSACT_SET_USER_QUOTA       8
-
 /* These are the NT transact_get_user_quota sub commands */
 #define TRANSACT_GET_USER_QUOTA_LIST_CONTINUE  0x0000
 #define TRANSACT_GET_USER_QUOTA_LIST_START     0x0100

diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h
index 7fbbd0c0c3ed559da6366f5fd2d7bbd4367c140f..5bde657af64d98a8b8e421cd31049581c3de4ff6 100644 (file)
--- a/source4/libcli/raw/smb.h
+++ b/source4/libcli/raw/smb.h
@@ -206,19 +206,6 @@
    incorrect parameters - what does it mean? maybe created temporary file? */
 #define NTCREATEX_ACTION_UNKNOWN 5
 
-/* These are the trans subcommands */
-#define TRANSACT_SETNAMEDPIPEHANDLESTATE  0x01 
-#define TRANSACT_DCERPCCMD                0x26
-#define TRANSACT_WAITNAMEDPIPEHANDLESTATE 0x53
-
-/* These are the NT transact sub commands. */
-#define NT_TRANSACT_CREATE                1
-#define NT_TRANSACT_IOCTL                 2
-#define NT_TRANSACT_SET_SECURITY_DESC     3
-#define NT_TRANSACT_NOTIFY_CHANGE         4
-#define NT_TRANSACT_RENAME                5
-#define NT_TRANSACT_QUERY_SECURITY_DESC   6
-
 /* Named pipe write mode flags. Used in writeX calls. */
 #define PIPE_RAW_MODE 0x4
 #define PIPE_START_MESSAGE 0x8

diff --git a/source4/libcli/raw/trans2.h b/source4/libcli/raw/trans2.h
index d9a3f5f7d2c90f693415f5df25fe7cf5a59e6d42..c1ec3ae214b0d1edc803a30bdf60581ce64c34f1 100644 (file)
--- a/source4/libcli/raw/trans2.h
+++ b/source4/libcli/raw/trans2.h
@@ -22,25 +22,6 @@
 #ifndef _TRANS2_H_
 #define _TRANS2_H_
 
-/* These are the TRANS2 sub commands */
-#define TRANSACT2_OPEN                        0
-#define TRANSACT2_FINDFIRST                   1
-#define TRANSACT2_FINDNEXT                    2
-#define TRANSACT2_QFSINFO                     3
-#define TRANSACT2_SETFSINFO                   4
-#define TRANSACT2_QPATHINFO                   5
-#define TRANSACT2_SETPATHINFO                 6
-#define TRANSACT2_QFILEINFO                   7
-#define TRANSACT2_SETFILEINFO                 8
-#define TRANSACT2_FSCTL                       9
-#define TRANSACT2_IOCTL                     0xA
-#define TRANSACT2_FINDNOTIFYFIRST           0xB
-#define TRANSACT2_FINDNOTIFYNEXT            0xC
-#define TRANSACT2_MKDIR                     0xD
-#define TRANSACT2_SESSION_SETUP             0xE
-#define TRANSACT2_GET_DFS_REFERRAL         0x10
-#define TRANSACT2_REPORT_DFS_INCONSISTANCY 0x11
-
 
 /* trans2 Query FS info levels */
 /*