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

(This used to be commit 7c4e6ebf05790dd6e29896dd316db0fff613aa4e)

source4/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 */

source4/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)

source4/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

source4/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

source4/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;
+

source4/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

source4/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 */

source4/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 {

source4/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

source4/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 {

source4/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

source4/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

source4/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)

source4/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,

source4/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 {

source4/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

source4/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

source4/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;

source4/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

source4/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]) 

source4/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 { \

source4/smb_server/password.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
 
 
 /****************************************************************************

source4/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 { \

source4/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

source4/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 { \

source4/smb_server/service.c

@@ -19,6 +19,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 
 /****************************************************************************

source4/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

source4/smb_server/signing.c

@@ -19,6 +19,8 @@
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+
 
 /*
   sign an outgoing packet

source4/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"
 
 
 /*

source4/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 
  */

source4/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)

source4/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 { \

source4/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

source4/smbd/process_single.c

@@ -22,6 +22,8 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "smb_server/smb_server.h"
+#include "process_model.h"
 
 
 /*

source4/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

source4/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)
 {

source4/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