diff options
24 files changed, 9 insertions, 27 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index 26b9831acc..25fe4cb2a4 100644 --- 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 48b3559b36..604b6a1a2d 100644 --- 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 1faa6387b7..0890bb112d 100644 --- 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 7b9433bcff..b6b931eccd 100644 --- 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 6dcf58182a..b93e5f3c44 100644 --- 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 d0d5b7fd74..ec1f741fa8 100644 --- 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 5abf449b8c..b1efb44ec7 100644 --- 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 f74092eda0..fdc186c710 100644 --- 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 945eb232e2..c26832d96e 100644 --- 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 a6d1ccd3f3..52f03430ce 100644 --- 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 0469e54d35..28cf2cc6cd 100644 --- 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 aa452c6a13..00ae92a95a 100644 --- 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 bd1615d603..1aa38a59c2 100644 --- 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 0a9701f8b3..c3c0412f4b 100644 --- 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 2f5a8af8f5..2347f31bde 100644 --- 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 545fe67827..9d8b058b7a 100644 --- 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 a22356af15..72630a928a 100644 --- 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 fe608524a1..1224daa76a 100644 --- 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 f9a1c49f71..8efe7730df 100644 --- 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 bfe3a67e1a..c6d8074fae 100644 --- 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 1ca2718454..86f6a38cd1 100644 --- 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 798d0883c8..3708d034e1 100644 --- 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 3f624bf871..93c6d45225 100644 --- 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 fcaf0b8e39..8ed078863c 100644 --- 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" |