r14736: - the ntvfs subsystem should not know about smb_server.h

- the process module subsystem should not know about smb_server.h
- the smb_server module should not know about process models

metze
(This used to be commit bac95bb8f4ad35a31ee666f5916ff9b2f292d964)

diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 26b9831acce25c5340c25e6147ede137eca98d5e..25fe4cb2a49504d46c3f9f33d5cee51acd5ca803 100644 (file)
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -28,8 +28,6 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/smb_composite/smb_composite.h"
-#include "smb_server/smb_server.h"
-#include "smbd/service_stream.h"
 #include "auth/auth.h"
 #include "ntvfs/ntvfs.h"
 #include "include/dlinklist.h"

diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c
index 48b3559b366169b810555edf08c1e2e645ac8b60..604b6a1a2d903463e6de38595da67e2b5418c2e4 100644 (file)
--- a/source4/ntvfs/common/notify.c
+++ b/source4/ntvfs/common/notify.c
@@ -30,7 +30,6 @@
 #include "lib/tdb/include/tdbutil.h"
 #include "messaging/messaging.h"
 #include "db_wrap.h"
-#include "smb_server/smb_server.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_notify.h"
 #include "dlinklist.h"

diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c
index 1faa6387b70ab4e0c09f8e01ed293aba87778944..0890bb112d6cc6ff073123a9a5f0834728594af1 100644 (file)
--- a/source4/ntvfs/common/opendb.c
+++ b/source4/ntvfs/common/opendb.c
@@ -44,9 +44,9 @@
 #include "messaging/messaging.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "db_wrap.h"
-#include "smb_server/smb_server.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_opendb.h"
+#include "smb.h"
 
 struct odb_context {
        struct tdb_wrap *w;

diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index 7b9433bcffdc6ef7c08238a742dd4e45faaa5154..b6b931eccdbbf9e4030b99023218cbb720d2676f 100644 (file)
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -27,7 +27,6 @@
 
 #include "includes.h"
 #include "dlinklist.h"
-#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "libcli/rap/rap.h"
 #include "ntvfs/ipc/proto.h"

diff --git a/source4/ntvfs/nbench/vfs_nbench.c b/source4/ntvfs/nbench/vfs_nbench.c
index 6dcf58182a2d33e4a6bca2db1166711e18e85525..b93e5f3c446f50bff0f08c226baa3d86d5566616 100644 (file)
--- a/source4/ntvfs/nbench/vfs_nbench.c
+++ b/source4/ntvfs/nbench/vfs_nbench.c
@@ -26,7 +26,6 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
 /* this is stored in ntvfs_private */

diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h
index d0d5b7fd743af70eec99d116e4f44173da9ff770..ec1f741fa80cf313cb3e058acde2b2e7f7069a79 100644 (file)
--- a/source4/ntvfs/ntvfs.h
+++ b/source4/ntvfs/ntvfs.h
@@ -19,6 +19,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "libcli/raw/interfaces.h"
+
 /* modules can use the following to determine if the interface has changed */
 /* version 1 -> 0 - make module stacking easier -- metze */
 #define NTVFS_INTERFACE_VERSION 0

diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index 5abf449b8c779450eadf106870eec7d8e6617cbe..b1efb44ec7bd8a721baa923974b5acd19cc9864e 100644 (file)
--- a/source4/ntvfs/ntvfs_base.c
+++ b/source4/ntvfs/ntvfs_base.c
@@ -25,7 +25,6 @@
 
 #include "includes.h"
 #include "dlinklist.h"
-#include "smb_server/smb_server.h"
 #include "build.h"
 #include "ntvfs/ntvfs.h"
 

diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index f74092eda0a12198fe7919285f66a28765d3c229..fdc186c710295bc9b56bed28f9ee45fdfa6fe57a 100644 (file)
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -32,7 +32,6 @@
 */
 
 #include "includes.h"
-#include "smb_server/smb_server.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "ntvfs/ntvfs.h"
 

diff --git a/source4/ntvfs/ntvfs_interface.c b/source4/ntvfs/ntvfs_interface.c
index 945eb232e2a5b39732762e99d7ff41dda33e1332..c26832d96e1974de724bbd9fed6ce9e066ebbe11 100644 (file)
--- a/source4/ntvfs/ntvfs_interface.c
+++ b/source4/ntvfs/ntvfs_interface.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
 /* connect/disconnect */

diff --git a/source4/ntvfs/ntvfs_util.c b/source4/ntvfs/ntvfs_util.c
index a6d1ccd3f35f7dc78bf3b2f8f627770391cbbd7e..52f03430ced11dcfbba3c558e121442678b7162f 100644 (file)
--- a/source4/ntvfs/ntvfs_util.c
+++ b/source4/ntvfs/ntvfs_util.c
@@ -23,7 +23,6 @@
 
 #include "includes.h"
 #include "dlinklist.h"
-#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
 

diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index 0469e54d356287652adadd9620259d6543a84be2..28cf2cc6cdc5b633b441ee50fce776ecd3ebbb92 100644 (file)
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -27,7 +27,6 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "librpc/gen_ndr/security.h"
-#include "smbd/service_stream.h"
 #include "lib/tdb/include/tdb.h"
 #include "db_wrap.h"
 #include "libcli/security/proto.h"

diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index aa452c6a13006dd53fd431c9cb54b21a095946d0..00ae92a95a09cd2cd67f07ea340c84182080d4fe 100644 (file)
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -25,7 +25,6 @@
 
 #include "librpc/gen_ndr/xattr.h"
 #include "system/filesys.h"
-#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
 /* this is the private structure for the posix vfs backend. It is used

diff --git a/source4/ntvfs/print/vfs_print.c b/source4/ntvfs/print/vfs_print.c
index bd1615d603e3f36d0d64ee135be931e4d04a0333..1aa38a59c29ac8e06cfb6df2d93c54f8436d4c06 100644 (file)
--- a/source4/ntvfs/print/vfs_print.c
+++ b/source4/ntvfs/print/vfs_print.c
@@ -24,7 +24,6 @@
 
 #include "includes.h"
 #include "libcli/raw/ioctl.h"
-#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
 /*

diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c
index 0a9701f8b3da4d9555d7947869ed01ea5317e497..c3c0412f4b476b27acb73f46abf5e6db32c8067b 100644 (file)
--- a/source4/ntvfs/simple/svfs_util.c
+++ b/source4/ntvfs/simple/svfs_util.c
@@ -28,7 +28,6 @@
 #include "svfs.h"
 #include "system/time.h"
 #include "system/dir.h"
-#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
 /*

diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c
index 2f5a8af8f5cac510eded2759a4f69bb616879ac1..2347f31bde118d511190318e1d64d23af4a04d3a 100644 (file)
--- a/source4/ntvfs/simple/vfs_simple.c
+++ b/source4/ntvfs/simple/vfs_simple.c
@@ -32,7 +32,6 @@
 #include "svfs.h"
 #include "system/time.h"
 #include "dlinklist.h"
-#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "ntvfs/simple/proto.h"
 

diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c
index 545fe678270de43f3e1c6c71b712107a894ed64a..9d8b058b7acd0bb94416a2d486e328b1289496ed 100644 (file)
--- a/source4/ntvfs/unixuid/vfs_unixuid.c
+++ b/source4/ntvfs/unixuid/vfs_unixuid.c
@@ -25,7 +25,6 @@
 #include "system/filesys.h"
 #include "system/passwd.h"
 #include "auth/auth.h"
-#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
 struct unixuid_private {

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index a22356af15a9c540586a1933f201dbf106f22624..72630a928a689e0f49cd3878297deaae3b80c7f9 100644 (file)
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -30,8 +30,6 @@
 #include "libcli/security/proto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "smb.h"
-#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "passdb/secrets.h"
 #include "db_wrap.h"

diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
index fe608524a14149a48c15a47c3f3e1de15e1bd56e..1224daa76ab10ee18abbb2f4df7fce311f761540 100644 (file)
--- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
+++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
@@ -25,8 +25,6 @@
 #include "rpc_server/common/common.h"
 #include "librpc/gen_ndr/ndr_unixinfo.h"
 #include "lib/events/events.h"
-#include "smb.h"
-#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
 #include <sys/types.h>

diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index f9a1c49f716bf3489067d7b2430aea3e507b159f..8efe7730df824067a34279de74ff11b4040d2950 100644 (file)
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -21,8 +21,9 @@
 */
 
 #include "libcli/raw/request.h"
-#include "smbd/process_model.h"
 #include "libcli/raw/interfaces.h"
+#include "lib/events/events.h"
+#include "lib/socket/socket.h"
 
 /*
   this header declares the core context structures associated with smb

diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index bfe3a67e1a7bf9a9037567a693151925f4f68e5c..c6d8074fae450b26ee9208c19654a5283cfde766 100644 (file)
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "smb_server/smb_server.h"
+#include "smbd/process_model.h"
 #include "build.h"
 
 /*

diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c
index 1ca2718454312f5af2cee41046f06ea03d9a295d..86f6a38cd10d6e4641ac4adb65fe645d753e2152 100644 (file)
--- a/source4/smbd/process_single.c
+++ b/source4/smbd/process_single.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "smb_server/smb_server.h"
+#include "smbd/process_model.h"
 
 /* For sepecifiying event context to GSSAPI below */
 #include "system/kerberos.h"

diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index 798d0883c8ef97038afd33ef2db72a995c057617..3708d034e19e0c7579bb74ea018b4393520ad39f 100644 (file)
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -25,8 +25,8 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "lib/tdb/include/tdb.h"
-#include "smb_server/smb_server.h"
 #include "lib/socket/socket.h"
+#include "smbd/process_model.h"
 
 /* For specifiying event context to GSSAPI below */
 #include "system/kerberos.h"

diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c
index 3f624bf871d0cece14f2cfe3282c60f7108956de..93c6d45225dbeca5d8d0945d0a330eeed063d25a 100644 (file)
--- a/source4/smbd/process_thread.c
+++ b/source4/smbd/process_thread.c
@@ -32,8 +32,8 @@
 #include "system/filesys.h"
 #include "lib/events/events.h"
 #include "dlinklist.h"
-#include "smb_server/smb_server.h"
 #include "lib/util/mutex.h"
+#include "smbd/process_model.h"
 
 /* For specifying event context to GSSAPI below */
 #include "system/kerberos.h"

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index fcaf0b8e39c589f88d9491064836e6ca5fe26eb0..8ed078863cb9e470a75d474755dfba91b9114834 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -32,8 +32,6 @@
 #include "build.h"
 #include "ldb/include/ldb.h"
 #include "registry/registry.h"
-#include "smb.h"
-#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "ntptr/ntptr.h"
 #include "auth/gensec/gensec.h"