summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-03-26 01:23:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:59:17 -0500
commitad06a8bd651e3a8b598c92a356ac1ce4117ae72e (patch)
treeb9ad7112588f5962fc7a17add4621714587d3c7f /source4/smbd
parent42da534d66c14c60844568246a2862da7b49f1d5 (diff)
downloadsamba-ad06a8bd651e3a8b598c92a356ac1ce4117ae72e.tar.gz
samba-ad06a8bd651e3a8b598c92a356ac1ce4117ae72e.tar.bz2
samba-ad06a8bd651e3a8b598c92a356ac1ce4117ae72e.zip
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)
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/process_model.c2
-rw-r--r--source4/smbd/process_single.c2
-rw-r--r--source4/smbd/process_standard.c2
-rw-r--r--source4/smbd/process_thread.c2
-rw-r--r--source4/smbd/server.c2
5 files changed, 4 insertions, 6 deletions
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"