s3-trans2: only include trans2.h where needed.

Guenther

diff --git a/source3/client/client.c b/source3/client/client.c
index 000970e5ccd2e627b723248fa41ea5e55011d3e2..bc4816be8c3bb5b0a627c5b3f495e96be5a0d3a5 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -32,6 +32,7 @@
 #include "../libcli/security/security.h"
 #include "system/select.h"
 #include "libsmb/clirap.h"
+#include "trans2.h"
 
 #ifndef REGISTER
 #define REGISTER 0

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 346829d2dc5d134638cdf77e98ac40382e1161d0..1655cfea69ab2858b3e8493699c1caaab55d32e9 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -539,7 +539,6 @@ typedef char fstring[FSTRING_LEN];
 #include "../lib/util/time.h"
 
 #include "libads/ads_status.h"
-#include "trans2.h"
 #include "../libcli/util/error.h"
 #include "ntioctl.h"
 #include "../lib/util/charset/charset.h"

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 957bf4d707ccd913870eab45451c74c13e9c5066..c252b85f8e0efc29c6a409b7f3cd71b79f005354 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "libsmb/clirap.h"
 #include "msdfs.h"
+#include "trans2.h"
 
 /********************************************************************
  Important point.

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 6e4cf90e51eddfe3f43dea989055364efa386daa..3ffe520fa7ad404506e5c5674f4df707a0a1ea6d 100644 (file)
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"
+#include "trans2.h"
 
 /***********************************************************
  Common function for pushing stings, used by smb_bytes_push_str()

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 7845a9de078d99633112a8491a4eab6ea208dc6d..ebd04e6d2b672effa59767527e43a6616d01427d 100644 (file)
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -23,6 +23,7 @@
 #include "../libcli/auth/ntlmssp.h"
 #include "async_smb.h"
 #include "smb_crypt.h"
+#include "trans2.h"
 
 /****************************************************************************
  Get UNIX extensions version info.

diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index 87c66672e101b7d94ebd162405e1e29d70feed09..552de0024283744a05fa04efb94e9d72200b7a77 100644 (file)
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "async_smb.h"
+#include "trans2.h"
 
 /****************************************************************************
  Calculate a safe next_entry_offset.

diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c
index 87ca00fd14456767410e37a93d538d3848aaf308..e05b64e686b8ff5854f4e3f044a41c83b473dbeb 100644 (file)
--- a/source3/libsmb/cliquota.c
+++ b/source3/libsmb/cliquota.c
@@ -21,6 +21,7 @@
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "fake_file.h"
 #include "../libcli/security/security.h"
+#include "trans2.h"
 
 NTSTATUS cli_get_quota_handle(struct cli_state *cli, uint16_t *quota_fnum)
 {

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 141db7131e019c317da65dbff02adb4d96fc7019..8d1be2d66e2707ff8e45147451b5a64ab96e9916 100644 (file)
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -25,6 +25,7 @@
 #include "../lib/crypto/arcfour.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"
+#include "trans2.h"
 
 #define PIPE_LANMAN   "\\PIPE\\LANMAN"
 

diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index a6620d9f5ef8da024db55710896c402fdf2578ea..59f8ac3aee599cc6ab78a87e3992602485642c77 100644 (file)
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "async_smb.h"
+#include "trans2.h"
 
 /****************************************************************************
   Calculate the recommended read buffer size

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index ebdc644ef9e9eaee6b25c08d34057471a313b84a..8e2c9d871b9e7b1e0541de6d4e94b5c39e61cbf2 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "../libcli/security/security.h"
+#include "trans2.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c
index fe5dee618e7246de407b2e92e12b7a8b1f240981..4c779f92e77db59ba005b3acafb553cfc9f5d9c0 100644 (file)
--- a/source3/smbd/smb2_find.c
+++ b/source3/smbd/smb2_find.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "trans2.h"
 
 static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
                                              struct tevent_context *ev,

diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index 123531c3511a070038e1df69511b51892fa89920..70225f18d2d9e319fb04fdc1489e9ab349471896 100644 (file)
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "trans2.h"
 
 static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
                                                 struct tevent_context *ev,

diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index 26d94e2b10e566a46a4e61969005e6c1cdcdc6dc..ba06fb3db7188c514d59fe400c16002c6448c20b 100644 (file)
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "trans2.h"
 
 static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
                                                 struct tevent_context *ev,

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 12cbc3b9e9ee2279b8c1da096a37fab6a067ff86..1fcbfaac231dc21633c0d89821ab84f1d9bf93bc 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -30,6 +30,7 @@
 #include "../librpc/gen_ndr/xattr.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/security.h"
+#include "trans2.h"
 
 #define DIR_ENTRY_SAFETY_MARGIN 4096
 

diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 887910284441c5553f55afd0f36d9f587fc02e0f..c94ed0c9a9a5c8254861d2c24676f6bf24db1426 100644 (file)
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "trans2.h"
 
 static fstring password;
 static fstring username;

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 66433ecfad0cff39d9bd598c330413668685ae3f..68871d304ad4f48b191b8e2b958fce293ae3f06c 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -31,6 +31,7 @@
 #include "talloc_dict.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"
+#include "trans2.h"
 
 extern char *optarg;
 extern int optind;