r3466: split out request.h, signing.h, and smb_server.h

diff --git a/source/include/cli_context.h b/source/include/cli_context.h
index a69cb93aa8f2b7c63c449a7f676a34b0d7b53100..65128f09f5b4eacd93c95e8ccda49f6f73a5412f 100644 (file)
--- a/source/include/cli_context.h
+++ b/source/include/cli_context.h
@@ -30,7 +30,7 @@ struct smbcli_state {
        struct smbcli_transport *transport;
        struct smbcli_session *session;
        struct smbcli_tree *tree;
-       struct substitute_context substitute;
+       struct substitute_context *substitute;
 };
 
 #endif /* _SMBCLI_CONTEXT_H */

diff --git a/source/include/includes.h b/source/include/includes.h
index 86222679e48a8b99e722e53acaf1a588e0bdeb49..c58cf1a5c54d5a9e738a95ad321dc5a619480a5e 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -181,6 +181,8 @@ extern int errno;
 #include "pstring.h"
 
 /* Lists, trees, caching, database... */
+#include "dynconfig.h"
+#include "version.h"
 #include "xfile.h"
 #include "talloc.h"
 #include "lib/ldb/include/ldb.h"
@@ -192,50 +194,32 @@ extern int errno;
 #include "trans2.h"
 #include "nterr.h"
 #include "charset.h"
-#include "dynconfig.h"
-
-#include "version.h"
 #include "rewrite.h"
 #include "smb.h"
 #include "ads.h"
 #include "lib/socket/socket.h"
 #include "libcli/ldap/ldap.h"
 #include "nameserv.h"
-
 #include "byteorder.h"
-
 #include "module.h"
-
 #include "mutex.h"
-
-#include "structs.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/ndr/ndr_sec.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/gen_ndr/tables.h"
-
 #include "smb_interfaces.h"
 #include "smbd/server.h"
 #include "smbd/service.h"
 #include "rpc_server/dcerpc_server.h"
-#include "request.h"
-#include "signing.h"
-#include "smb_server/smb_server.h"
+#include "structs.h"
 #include "ntvfs/ntvfs.h"
 #include "cli_context.h"
-
 #include "libnet/libnet.h"
 #include "utils/net/net.h"
-
 #include "nsswitch/winbind_client.h"
 
-/* hmm, this really is getting ugly isn't it .... we probably need to
-   have some way to have subsystem includes without including it
-   globally */
-#include "ntvfs/posix/vfs_posix.h"
-
 #define malloc_p(type) (type *)malloc(sizeof(type))
 #define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)
 #define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count)

diff --git a/source/include/request.h b/source/include/request.h
index 7dae579c2472103cfb4a0e39c44725f978f98b0e..fc5fa8442acabc22d9527f3b646451b439ffe354 100644 (file)
--- a/source/include/request.h
+++ b/source/include/request.h
@@ -1,3 +1,5 @@
+#ifndef _REQUEST_H
+#define _REQUEST_H
 /*
    Unix SMB/CIFS implementation.
    SMB parameters and setup
@@ -19,6 +21,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "signing.h"
+
 /*
   Shared state structure between client and server, representing the basic packet.
 */
@@ -55,3 +59,4 @@ struct request_buffer {
        char *ptr;
 };
 
+#endif

diff --git a/source/include/signing.h b/source/include/signing.h
index c290f96788866983428e3187baafa8f831d62e7f..dfc5a4bd7e1577ec9fe2f25fc97384cc684b72c0 100644 (file)
--- a/source/include/signing.h
+++ b/source/include/signing.h
@@ -1,3 +1,5 @@
+#ifndef _SIGNING_H
+#define _SIGNING_H
 /*
    Unix SMB/CIFS implementation.
    SMB Signing
@@ -35,3 +37,4 @@ struct smb_signing_context {
        BOOL seen_valid; /* Have I ever seen a validly signed packet? */
 };
 
+#endif

diff --git a/source/include/structs.h b/source/include/structs.h
index c6b81259390f7f155500a718a720d1f5b347362d..a553977952ca0b6f0d2f834f4129786928a3610d 100644 (file)
--- a/source/include/structs.h
+++ b/source/include/structs.h
@@ -77,3 +77,16 @@ struct registry_value;
 
 struct rap_NetShareEnum;
 struct rap_NetServerEnum2;
+
+struct smbsrv_request;
+struct smbsrv_tcon;
+struct smb_signing_context;
+struct smbsrv_connection;
+struct auth_context;
+struct request_buffer;
+
+struct pvfs_dir;
+struct pvfs_filename;
+struct pvfs_state;
+struct pvfs_file;
+

diff --git a/source/lib/substitute.c b/source/lib/substitute.c
index 3de2966f5652cb20eacbcf8da4f812e8a4541bcc..a01b90450a2c138ee3ffba556ff1138886b125a6 100644 (file)
--- a/source/lib/substitute.c
+++ b/source/lib/substitute.c
@@ -20,6 +20,7 @@
 
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
 
 /* oh bugger - I realy didn't want to have a top-level context
    anywhere, but until we change all lp_*() calls to take a context

diff --git a/source/libcli/raw/libcliraw.h b/source/libcli/raw/libcliraw.h
index 9bbdd8a222f5bb9adf0bfeffc6b8cdb103ff0d0f..9b03ab713b78611fbce396185e5d1af536a5fa2d 100644 (file)
--- a/source/libcli/raw/libcliraw.h
+++ b/source/libcli/raw/libcliraw.h
@@ -21,6 +21,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "request.h"
+
 struct smbcli_tree;  /* forward declare */
 struct smbcli_request;  /* forward declare */
 struct smbcli_session;  /* forward declare */

diff --git a/source/ntvfs/cifs/vfs_cifs.c b/source/ntvfs/cifs/vfs_cifs.c
index 535b529a6309fa594ff7c2317496a03b34a5075a..9e3c841dd36ab3f78303fb96bb1cb390a740daa8 100644 (file)
--- a/source/ntvfs/cifs/vfs_cifs.c
+++ b/source/ntvfs/cifs/vfs_cifs.c
@@ -27,6 +27,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "smb_server/smb_server.h"
 
 /* this is stored in ntvfs_private */
 struct cvfs_private {

diff --git a/source/ntvfs/ipc/vfs_ipc.c b/source/ntvfs/ipc/vfs_ipc.c
index 8bcf0382f9f58757ac8abee9fb67686c35f26619..dc43dff3aa74d89e1e5786e84215e49df49dd4d5 100644 (file)
--- a/source/ntvfs/ipc/vfs_ipc.c
+++ b/source/ntvfs/ipc/vfs_ipc.c
@@ -28,6 +28,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
 
 /* this is the private structure used to keep the state of an open
    ipc$ connection. It needs to keep information about all open

diff --git a/source/ntvfs/nbench/vfs_nbench.c b/source/ntvfs/nbench/vfs_nbench.c
index eef407638b701a967ae48fabbdf532fea29810da..ef435c5d75f9a165a48c0ec61205485944bb5f48 100644 (file)
--- a/source/ntvfs/nbench/vfs_nbench.c
+++ b/source/ntvfs/nbench/vfs_nbench.c
@@ -25,6 +25,7 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
 
 /* this is stored in ntvfs_private */
 struct nbench_private {

diff --git a/source/ntvfs/ntvfs_base.c b/source/ntvfs/ntvfs_base.c
index 24470ebd65d7c1b7fcccd8bf81cb05bf7bd5c832..cc83b5347341347674fe7bb64f001059c68558bc 100644 (file)
--- a/source/ntvfs/ntvfs_base.c
+++ b/source/ntvfs/ntvfs_base.c
@@ -25,6 +25,8 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
+
 
 
 /* the list of currently registered NTVFS backends, note that there

diff --git a/source/ntvfs/ntvfs_generic.c b/source/ntvfs/ntvfs_generic.c
index 8eaa3cf1b266668507fde5a78b08beac4ed64bd7..6e8caf787b19edcda8aa634916471bcc05f3fad3 100644 (file)
--- a/source/ntvfs/ntvfs_generic.c
+++ b/source/ntvfs/ntvfs_generic.c
@@ -32,6 +32,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 /*
   see if a filename ends in EXE COM DLL or SYM. This is needed for the

diff --git a/source/ntvfs/ntvfs_interface.c b/source/ntvfs/ntvfs_interface.c
index 95c01a0b503aebb5b0f624e546957accb91474a9..f1ab21753382bb4b809cb9cfbc5c937ccaa36e35 100644 (file)
--- a/source/ntvfs/ntvfs_interface.c
+++ b/source/ntvfs/ntvfs_interface.c
@@ -20,6 +20,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 /* connect/disconnect */
 NTSTATUS ntvfs_connect(struct smbsrv_request *req, const char *sharename)

diff --git a/source/ntvfs/ntvfs_util.c b/source/ntvfs/ntvfs_util.c
index bd5a305e20cd256c6fb2be7afa480dda51f881af..41e1b04d49e774e7b40b1de8b1193579a683553e 100644 (file)
--- a/source/ntvfs/ntvfs_util.c
+++ b/source/ntvfs/ntvfs_util.c
@@ -23,6 +23,8 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
+
 
 NTSTATUS ntvfs_async_state_push(struct smbsrv_request *req,
                                void *private_data,

diff --git a/source/ntvfs/posix/vfs_posix.h b/source/ntvfs/posix/vfs_posix.h
index 231d9a2d0823fe8e9306b68fc04546c99f889af2..530a2deae3d734842064cca3778bc97e90307072 100644 (file)
--- a/source/ntvfs/posix/vfs_posix.h
+++ b/source/ntvfs/posix/vfs_posix.h
@@ -23,6 +23,8 @@
 #ifndef _VFS_POSIX_H_
 #define _VFS_POSIX_H_
 
+#include "smb_server/smb_server.h"
+
 /* this is the private structure for the posix vfs backend. It is used
    to hold per-connection (per tree connect) state information */
 struct pvfs_state {

diff --git a/source/ntvfs/print/vfs_print.c b/source/ntvfs/print/vfs_print.c
index b1155a07611bbd70290052cc9c7b6304ed44ade2..372f64e982a97732be0fb7122109c00e3a8b2239 100644 (file)
--- a/source/ntvfs/print/vfs_print.c
+++ b/source/ntvfs/print/vfs_print.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "ioctl.h"
+#include "smb_server/smb_server.h"
 
 /*
   connect to a share - used when a tree_connect operation comes

diff --git a/source/ntvfs/simple/vfs_simple.c b/source/ntvfs/simple/vfs_simple.c
index 4e9fd4895ec6e81dedf9d44885b1a3d5567538db..97dd8a7d60fd684c9f69d7821548c3c4d2fe004f 100644 (file)
--- a/source/ntvfs/simple/vfs_simple.c
+++ b/source/ntvfs/simple/vfs_simple.c
@@ -30,6 +30,7 @@
 #include "svfs.h"
 #include "system/time.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
 
 #ifndef O_DIRECTORY
 #define O_DIRECTORY 0

diff --git a/source/ntvfs/unixuid/vfs_unixuid.c b/source/ntvfs/unixuid/vfs_unixuid.c
index 9c74c12f918eb0539bd6cb4315da8c2e7722ae56..9b62c38e13bd1c6e0dbe00be05a002ef5132f6bd 100644 (file)
--- a/source/ntvfs/unixuid/vfs_unixuid.c
+++ b/source/ntvfs/unixuid/vfs_unixuid.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
+#include "smb_server/smb_server.h"
 
 struct unixuid_private {
        void *samctx;

diff --git a/source/smb_server/conn.c b/source/smb_server/conn.c
index dce77f7978477ac254e2c0e359b5b75c34b5863b..a4bf2716febd4f422b5a7ae0dd71aa4fdda0c7ef 100644 (file)
--- a/source/smb_server/conn.c
+++ b/source/smb_server/conn.c
@@ -22,6 +22,8 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
+
 
 /****************************************************************************
 init the tcon structures

diff --git a/source/smb_server/negprot.c b/source/smb_server/negprot.c
index b50025126548e3439e50b1782cd4e7f94b2d18a2..bd1d8249d9085c017ff1fe3b665ab5e385793ba4 100644 (file)
--- a/source/smb_server/negprot.c
+++ b/source/smb_server/negprot.c
@@ -21,6 +21,8 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "asn_1.h"
+#include "smb_server/smb_server.h"
+
 
 /* initialise the auth_context for this server and return the cryptkey */
 static void get_challenge(struct smbsrv_connection *smb_conn, char buff[8]) 

diff --git a/source/smb_server/nttrans.c b/source/smb_server/nttrans.c
index 336328429be23834effda1511b5e862eedfda6dc..0ea92c80a02425992a4156360f005a694f872bcb 100644 (file)
--- a/source/smb_server/nttrans.c
+++ b/source/smb_server/nttrans.c
@@ -23,6 +23,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 
 #define CHECK_MIN_BLOB_SIZE(blob, size) do { \

diff --git a/source/smb_server/password.c b/source/smb_server/password.c
index fc3ee1058473f4bbe16b9cb93ffe56334e9a5fc1..91a9eac3c7f52f947787b7dba9f704dc921c96e8 100644 (file)
--- a/source/smb_server/password.c
+++ b/source/smb_server/password.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
 
 
 /****************************************************************************

diff --git a/source/smb_server/reply.c b/source/smb_server/reply.c
index 8c20b2bb72088d0e3e58c629e846a30af48642e9..eb75ab08c7bcb3d028bcfee3377fab892d330670 100644 (file)
--- a/source/smb_server/reply.c
+++ b/source/smb_server/reply.c
@@ -24,6 +24,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 /* useful way of catching wct errors with file and line number */
 #define REQ_CHECK_WCT(req, wcount) do { \

diff --git a/source/smb_server/request.c b/source/smb_server/request.c
index 14e1d558cb5428ed9fc1a20bbe7a4d635e816442..b1cb8fe2df46966f1b9672a01700283155cc6fc1 100644 (file)
--- a/source/smb_server/request.c
+++ b/source/smb_server/request.c
@@ -24,6 +24,8 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
+
 
 /* we over allocate the data buffer to prevent too many realloc calls */
 #define REQ_OVER_ALLOCATION 256

diff --git a/source/smb_server/search.c b/source/smb_server/search.c
index adcafccafad429dca61ab5b64c4d37dc4ee20620..a0bc5b764b7c6456eb18ac71aa1bdbd52e524b69 100644 (file)
--- a/source/smb_server/search.c
+++ b/source/smb_server/search.c
@@ -23,6 +23,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 /* check req->async.status and if not OK then send an error reply */
 #define CHECK_ASYNC_STATUS do { \

diff --git a/source/smb_server/service.c b/source/smb_server/service.c
index 8519869e6b7ee132e4828a599b91f8ab3501177c..815a58ce70af1b44ea68cdb6eaf3746d107d84fc 100644 (file)
--- a/source/smb_server/service.c
+++ b/source/smb_server/service.c
@@ -19,6 +19,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 
 /****************************************************************************

diff --git a/source/smb_server/sesssetup.c b/source/smb_server/sesssetup.c
index 8f55df58d268f69ba6bb20d3f4e9a96d52df5816..cc8d4d7ff2eb76b267fbccde0a1802acfd253ebb 100644 (file)
--- a/source/smb_server/sesssetup.c
+++ b/source/smb_server/sesssetup.c
@@ -24,6 +24,8 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "asn_1.h"
+#include "smb_server/smb_server.h"
+
 
 /*
   setup the OS, Lanman and domain portions of a session setup reply

diff --git a/source/smb_server/signing.c b/source/smb_server/signing.c
index b3fac2fa706e77fe3637c379d475b7eac1a949d1..8a3fd10095cf9d72a3477968ae7214b66346228a 100644 (file)
--- a/source/smb_server/signing.c
+++ b/source/smb_server/signing.c
@@ -19,6 +19,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 /*
   sign an outgoing packet

diff --git a/source/smb_server/smb_server.c b/source/smb_server/smb_server.c
index a42ec3c82b939d3b434cc5c110c2eb742ff649ed..aa3a2a794c8690d3110a9b13355ab0b81ae6bb21 100644 (file)
--- a/source/smb_server/smb_server.c
+++ b/source/smb_server/smb_server.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "system/time.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
 
 
 /*

diff --git a/source/smb_server/smb_server.h b/source/smb_server/smb_server.h
index 054fc7c35d10c34f1d3608bf91f22ec1963e3f61..121fff6ecd061da90f6fcb181fa2e83b47777f75 100644 (file)
--- a/source/smb_server/smb_server.h
+++ b/source/smb_server/smb_server.h
@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "request.h"
+#include "smbd/process_model.h"
+
 /*
   this header declares the core context structures associated with smb
   sockets, tree connects, requests etc
@@ -140,8 +143,6 @@ struct substitute_context {
        char *user_name;
 };
 
-#include "smbd/process_model.h"
-
 /* smb server context structure. This should contain all the state
  * information associated with a SMB server connection 
  */

diff --git a/source/smb_server/srvtime.c b/source/smb_server/srvtime.c
index c39267521cf865e83debca3f74b9f62528ab31bf..999ffc3ee121504350cdbba99cc24a5c6064a478 100644 (file)
--- a/source/smb_server/srvtime.c
+++ b/source/smb_server/srvtime.c
@@ -21,6 +21,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 /*******************************************************************
 put a dos date into a buffer (time/date format)

diff --git a/source/smb_server/trans2.c b/source/smb_server/trans2.c
index 3c447c555e89e0488a23a919e88cd433f282a0d4..02a7cbff011c94747b637424c262c491bb708703 100644 (file)
--- a/source/smb_server/trans2.c
+++ b/source/smb_server/trans2.c
@@ -22,6 +22,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 
 #define CHECK_MIN_BLOB_SIZE(blob, size) do { \

diff --git a/source/smbd/process_model.c b/source/smbd/process_model.c
index 0bdb3163176336480f69cbb9c9830b3b31f2c6fb..101a24b6946a29d101efa6aa6a719873f2a644ee 100644 (file)
--- a/source/smbd/process_model.c
+++ b/source/smbd/process_model.c
@@ -20,6 +20,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+#include "smbd/process_model.h"
 
 /*
   setup the events for the chosen process model

diff --git a/source/smbd/process_single.c b/source/smbd/process_single.c
index 2e49d033214ab61ee2ed9367629f0ab0f28bd5ce..42978db739f8d9d0d29791871f01660d9506325d 100644 (file)
--- a/source/smbd/process_single.c
+++ b/source/smbd/process_single.c
@@ -22,6 +22,8 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
+#include "process_model.h"
 
 
 /*

diff --git a/source/smbd/process_standard.c b/source/smbd/process_standard.c
index 64297032005be217e913f8d116c8fc594a28f92a..781a9eb55af5261f51a796b3018d7d864a8b8e8e 100644 (file)
--- a/source/smbd/process_standard.c
+++ b/source/smbd/process_standard.c
@@ -22,6 +22,8 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
+#include "process_model.h"
 
 /*
   called when the process model is selected

diff --git a/source/smbd/service.c b/source/smbd/service.c
index 7fc09b5500783f9b885cf9c4bf9bf15f33960a76..f2d129d24042a3b751d45d0cd2bb343d7722e2e0 100644 (file)
--- a/source/smbd/service.c
+++ b/source/smbd/service.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "system/dir.h"
 #include "dlinklist.h"
+#include "process_model.h"
 
 struct server_context *server_service_startup(const char *model)
 {

diff --git a/source/torture/gentest.c b/source/torture/gentest.c
index cce831e6c66bad4cf50cce2ced0b87fcc5ccffd4..c7ed8eb7711ef4cad2bea6433bd4bd13d6d85f75 100644 (file)
--- a/source/torture/gentest.c
+++ b/source/torture/gentest.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "request.h"
 #include "libcli/raw/libcliraw.h"
 
 #define NSERVERS 2