svn commit: samba r14736 - in branches/SAMBA_4_0/source: ntvfs
ntvfs/cifs ntvfs/common ntvfs/ipc ntvfs/nbench ntvfs/posix
ntvfs/print ntvfs/simple ntvfs/unixuid rpc_server/lsa
rpc_server/unixinfo smb_server smbd
metze at samba.org
metze at samba.org
Sun Mar 26 01:23:44 GMT 2006
Author: metze
Date: 2006-03-26 01:23:40 +0000 (Sun, 26 Mar 2006)
New Revision: 14736
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14736
Log:
- 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
Modified:
branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
branches/SAMBA_4_0/source/ntvfs/common/notify.c
branches/SAMBA_4_0/source/ntvfs/common/opendb.c
branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c
branches/SAMBA_4_0/source/ntvfs/ntvfs.h
branches/SAMBA_4_0/source/ntvfs/ntvfs_base.c
branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c
branches/SAMBA_4_0/source/ntvfs/ntvfs_interface.c
branches/SAMBA_4_0/source/ntvfs/ntvfs_util.c
branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c
branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.h
branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c
branches/SAMBA_4_0/source/ntvfs/simple/svfs_util.c
branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c
branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c
branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
branches/SAMBA_4_0/source/rpc_server/unixinfo/dcesrv_unixinfo.c
branches/SAMBA_4_0/source/smb_server/smb_server.h
branches/SAMBA_4_0/source/smbd/process_model.c
branches/SAMBA_4_0/source/smbd/process_single.c
branches/SAMBA_4_0/source/smbd/process_standard.c
branches/SAMBA_4_0/source/smbd/process_thread.c
branches/SAMBA_4_0/source/smbd/server.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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"
Modified: branches/SAMBA_4_0/source/ntvfs/common/notify.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/common/notify.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/common/notify.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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"
Modified: branches/SAMBA_4_0/source/ntvfs/common/opendb.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/common/opendb.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/common/opendb.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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;
Modified: branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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"
Modified: branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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 */
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs.h
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ntvfs.h 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs.h 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_base.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_base.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_base.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -25,7 +25,6 @@
#include "includes.h"
#include "dlinklist.h"
-#include "smb_server/smb_server.h"
#include "build.h"
#include "ntvfs/ntvfs.h"
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -32,7 +32,6 @@
*/
#include "includes.h"
-#include "smb_server/smb_server.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "ntvfs/ntvfs.h"
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_interface.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_interface.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_interface.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -20,7 +20,6 @@
*/
#include "includes.h"
-#include "smb_server/smb_server.h"
#include "ntvfs/ntvfs.h"
/* connect/disconnect */
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_util.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_util.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_util.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -23,7 +23,6 @@
#include "includes.h"
#include "dlinklist.h"
-#include "smb_server/smb_server.h"
#include "ntvfs/ntvfs.h"
Modified: branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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"
Modified: branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.h
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.h 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.h 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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
Modified: branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -24,7 +24,6 @@
#include "includes.h"
#include "libcli/raw/ioctl.h"
-#include "smb_server/smb_server.h"
#include "ntvfs/ntvfs.h"
/*
Modified: branches/SAMBA_4_0/source/ntvfs/simple/svfs_util.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/simple/svfs_util.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/simple/svfs_util.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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"
/*
Modified: branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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"
Modified: branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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 {
Modified: branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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"
Modified: branches/SAMBA_4_0/source/rpc_server/unixinfo/dcesrv_unixinfo.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/unixinfo/dcesrv_unixinfo.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/rpc_server/unixinfo/dcesrv_unixinfo.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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>
Modified: branches/SAMBA_4_0/source/smb_server/smb_server.h
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb_server.h 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/smb_server/smb_server.h 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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
Modified: branches/SAMBA_4_0/source/smbd/process_model.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/process_model.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/smbd/process_model.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -20,7 +20,7 @@
*/
#include "includes.h"
-#include "smb_server/smb_server.h"
+#include "smbd/process_model.h"
#include "build.h"
/*
Modified: branches/SAMBA_4_0/source/smbd/process_single.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/process_single.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/smbd/process_single.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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"
Modified: branches/SAMBA_4_0/source/smbd/process_standard.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/process_standard.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/smbd/process_standard.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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"
Modified: branches/SAMBA_4_0/source/smbd/process_thread.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/process_thread.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/smbd/process_thread.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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"
Modified: branches/SAMBA_4_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/server.c 2006-03-26 00:59:17 UTC (rev 14735)
+++ branches/SAMBA_4_0/source/smbd/server.c 2006-03-26 01:23:40 UTC (rev 14736)
@@ -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"
More information about the samba-cvs
mailing list