r12528: Add seperate proto headers for ntvfs, tdr, smb_server and nbt_server.

(This used to be commit 87f665a1d5ba74289974bf9d8f9441c162e6f1b1)

10 files changed, 11 insertions, 0 deletions

diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk
index 0810c29998..d41ec24aca 100644
--- a/source4/smb_server/config.mk
+++ b/source4/smb_server/config.mk
@@ -8,6 +8,7 @@ OBJ_FILES = \
 		tcon.o \
 		session.o \
 		management.o
+PRIVATE_PROTO_HEADER = smb_server_proto.h
 REQUIRED_SUBSYSTEMS = \
 		LIBPACKET \
 		SMB_PROTOCOL \
diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c
index 215b378283..7d5398671d 100644
--- a/source4/smb_server/smb/nttrans.c
+++ b/source4/smb_server/smb/nttrans.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "smb_server/smb_server.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "ntvfs/ntvfs.h"
 
 
 
diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c
index 806244ee12..a7dde2163f 100644
--- a/source4/smb_server/smb/receive.c
+++ b/source4/smb_server/smb/receive.c
@@ -25,6 +25,7 @@
 #include "smbd/service_stream.h"
 #include "smb_server/smb_server.h"
 #include "lib/stream/packet.h"
+#include "ntvfs/ntvfs.h"
 
 
 /*
diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c
index d780cb1a75..644a5dd1a4 100644
--- a/source4/smb_server/smb/reply.c
+++ b/source4/smb_server/smb/reply.c
@@ -26,6 +26,7 @@
 #include "includes.h"
 #include "smb_server/smb_server.h"
 #include "libcli/nbt/libnbt.h"
+#include "ntvfs/ntvfs.h"
 
 
 /* useful way of catching wct errors with file and line number */
diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c
index 5491089c8e..08e3eb74a5 100644
--- a/source4/smb_server/smb/request.c
+++ b/source4/smb_server/smb/request.c
@@ -28,6 +28,7 @@
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
 #include "lib/stream/packet.h"
+#include "ntvfs/ntvfs.h"
 
 
 /* we over allocate the data buffer to prevent too many realloc calls */
diff --git a/source4/smb_server/smb/search.c b/source4/smb_server/smb/search.c
index 3ec66a0f33..e214d23e18 100644
--- a/source4/smb_server/smb/search.c
+++ b/source4/smb_server/smb/search.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
+#include "ntvfs/ntvfs.h"
 
 
 /* check req->async.status and if not OK then send an error reply */
diff --git a/source4/smb_server/smb/service.c b/source4/smb_server/smb/service.c
index 6032e5a20d..f5ba1254d8 100644
--- a/source4/smb_server/smb/service.c
+++ b/source4/smb_server/smb/service.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
+#include "ntvfs/ntvfs.h"
 
 
 /**
diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c
index 6e4322d7b3..ef7fa40b20 100644
--- a/source4/smb_server/smb/trans2.c
+++ b/source4/smb_server/smb/trans2.c
@@ -25,6 +25,7 @@
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "ntvfs/ntvfs.h"
 
 #define CHECK_MIN_BLOB_SIZE(blob, size) do { \
 	if ((blob)->length < (size)) { \
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index 7f38119f2b..d0df15e022 100644
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -301,3 +301,5 @@ struct smbsrv_connection {
 		BOOL nt_status_support;
 	} config;
 };
+
+#include "smb_server/smb_server_proto.h"
diff --git a/source4/smb_server/tcon.c b/source4/smb_server/tcon.c
index 0cb6738d31..01194d1ea1 100644
--- a/source4/smb_server/tcon.c
+++ b/source4/smb_server/tcon.c
@@ -24,6 +24,7 @@
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
+#include "ntvfs/ntvfs.h"
 
 
 /****************************************************************************