s4-smbd: minimise includes in smbd/ and smb_server

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index f72074898af2d46845279eaa77969e7aac7836dc..bf8985ccdf639301dca460f3826030d294728bc5 100644 (file)
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -19,10 +19,8 @@
 */
 
 #include "includes.h"
-#include "../lib/util/dlinklist.h"
 #include "smb_server/smb_server.h"
 #include "librpc/gen_ndr/ndr_misc.h"
-#include "ntvfs/ntvfs.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 

diff --git a/source4/smb_server/handle.c b/source4/smb_server/handle.c
index 6ee4e163ad3d82aa648887005ce43e05e193cf78..931f77abc4bc4355e7226363be75f3bddcf50f89 100644 (file)
--- a/source4/smb_server/handle.c
+++ b/source4/smb_server/handle.c
@@ -18,9 +18,7 @@
 */
 
 #include "includes.h"
-#include "../lib/util/dlinklist.h"
 #include "smb_server/smb_server.h"
-#include "ntvfs/ntvfs.h"
 
 
 /****************************************************************************

diff --git a/source4/smb_server/session.c b/source4/smb_server/session.c
index 0e626307d6a25796c2d545417968ec49ac3f8d1c..53193c5312e95136dc1d4e92902244ed2e4ab5ea 100644 (file)
--- a/source4/smb_server/session.c
+++ b/source4/smb_server/session.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
-#include "../lib/util/dlinklist.h"
 
 
 /*

diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c
index efeee953639e97d5dc5565d1fdbf3ae7ea2f899e..ab763e39c36fbe1867ce8058ee54e9eed45ee48f 100644 (file)
--- a/source4/smb_server/smb/negprot.c
+++ b/source4/smb_server/smb/negprot.c
@@ -24,7 +24,6 @@
 #include "smb_server/smb_server.h"
 #include "libcli/smb2/smb2.h"
 #include "smb_server/smb2/smb2_server.h"
-#include "smb_server/service_smb_proto.h"
 #include "smbd/service_stream.h"
 #include "lib/stream/packet.h"
 #include "param/param.h"

diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c
index 9a039095e67f4777e0e825b744d06f3ccc277f66..f58071bf5589bb1e8b025a409a528cfc1ee14b93 100644 (file)
--- a/source4/smb_server/smb/receive.c
+++ b/source4/smb_server/smb/receive.c
@@ -23,8 +23,6 @@
 #include "system/time.h"
 #include "smbd/service_stream.h"
 #include "smb_server/smb_server.h"
-#include "smb_server/service_smb_proto.h"
-#include "ntvfs/ntvfs.h"
 #include "system/filesys.h"
 #include "param/param.h"
 

diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c
index 6846f80594f937c73b10395e4397953a1fb0786e..4bae08718753a4a9fd8044dc866771af61455e1f 100644 (file)
--- a/source4/smb_server/smb/request.c
+++ b/source4/smb_server/smb/request.c
@@ -23,7 +23,6 @@
 
 #include "includes.h"
 #include "smb_server/smb_server.h"
-#include "smb_server/service_smb_proto.h"
 #include "smbd/service_stream.h"
 #include "lib/stream/packet.h"
 #include "ntvfs/ntvfs.h"

diff --git a/source4/smb_server/smb/service.c b/source4/smb_server/smb/service.c
index 5d8d6bbc3230af4bf26c1063b4b53e6219c24fec..805dc4d558ebbbb1034f88313a1d36e93fb75668 100644 (file)
--- a/source4/smb_server/smb/service.c
+++ b/source4/smb_server/smb/service.c
@@ -21,7 +21,6 @@
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
 #include "ntvfs/ntvfs.h"
-#include "param/share.h"
 #include "param/param.h"
 
 /****************************************************************************

diff --git a/source4/smb_server/smb/sesssetup.c b/source4/smb_server/smb/sesssetup.c
index e38447703ba103c8a4e1351985f413255647916e..37f69abc12bcaa3b21ea1bcfc8ce3dfe0aa27fb9 100644 (file)
--- a/source4/smb_server/smb/sesssetup.c
+++ b/source4/smb_server/smb/sesssetup.c
@@ -24,12 +24,10 @@
 
 #include "includes.h"
 #include "version.h"
-#include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "auth/auth.h"
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
-#include "librpc/gen_ndr/nbt.h"
 #include "param/param.h"
 
 /*

diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c
index e0f6438dc6b02f5a55fa21a8a01b2706ecd4d510..a9445860f16f420bd79cfc8f859e7dc18aa6821e 100644 (file)
--- a/source4/smb_server/smb/trans2.c
+++ b/source4/smb_server/smb/trans2.c
@@ -21,9 +21,7 @@
 */
 
 #include "includes.h"
-#include "../lib/util/dlinklist.h"
 #include "smb_server/smb_server.h"
-#include "librpc/gen_ndr/ndr_misc.h"
 #include "ntvfs/ntvfs.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"

diff --git a/source4/smb_server/smb2/fileinfo.c b/source4/smb_server/smb2/fileinfo.c
index 82b006c4a1bd0f1a88523a431f5ebfc039fad8e0..3084236355eb1289823eac566f99f9f513c4bc50 100644 (file)
--- a/source4/smb_server/smb2/fileinfo.c
+++ b/source4/smb_server/smb2/fileinfo.c
@@ -21,7 +21,6 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
-#include "smb_server/service_smb_proto.h"
 #include "smb_server/smb2/smb2_server.h"
 #include "ntvfs/ntvfs.h"
 #include "librpc/gen_ndr/ndr_security.h"

diff --git a/source4/smb_server/smb2/fileio.c b/source4/smb_server/smb2/fileio.c
index 12bfd5175685548111da457abc3794d0cde79ca3..497a6c531b2149f13eee9b73cca323407c7644d9 100644 (file)
--- a/source4/smb_server/smb2/fileio.c
+++ b/source4/smb_server/smb2/fileio.c
@@ -21,10 +21,8 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
-#include "smb_server/service_smb_proto.h"
 #include "smb_server/smb2/smb2_server.h"
 #include "ntvfs/ntvfs.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "librpc/gen_ndr/ndr_security.h"
 

diff --git a/source4/smb_server/smb2/find.c b/source4/smb_server/smb2/find.c
index 10fcda943427ce364316af1195ddb455cfc35dec..cd52872a1ca6cf2db3f09f00e76f1d9a07684c14 100644 (file)
--- a/source4/smb_server/smb2/find.c
+++ b/source4/smb_server/smb2/find.c
@@ -25,7 +25,6 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
-#include "smb_server/service_smb_proto.h"
 #include "smb_server/smb2/smb2_server.h"
 #include "ntvfs/ntvfs.h"
 

diff --git a/source4/smb_server/smb2/keepalive.c b/source4/smb_server/smb2/keepalive.c
index ff47d594f025a4bd00a7614ed2baa64042479a67..c362acb7ce2a6930364c7efaacd7c5369b474f8d 100644 (file)
--- a/source4/smb_server/smb2/keepalive.c
+++ b/source4/smb_server/smb2/keepalive.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
 #include "smb_server/smb_server.h"
-#include "smb_server/service_smb_proto.h"
 #include "smb_server/smb2/smb2_server.h"
 
 static NTSTATUS smb2srv_keepalive_backend(struct smb2srv_request *req)

diff --git a/source4/smb_server/smb2/negprot.c b/source4/smb_server/smb2/negprot.c
index f915392ffaee5af9d19472ac90f0eb44d272bb61..5283a0db6e7d90ebf67508713de5377d56041c9d 100644 (file)
--- a/source4/smb_server/smb2/negprot.c
+++ b/source4/smb_server/smb2/negprot.c
@@ -27,11 +27,9 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
-#include "smb_server/service_smb_proto.h"
 #include "smb_server/smb2/smb2_server.h"
 #include "smbd/service_stream.h"
 #include "param/param.h"
-#include "librpc/ndr/libndr.h"
 
 static NTSTATUS smb2srv_negprot_secblob(struct smb2srv_request *req, DATA_BLOB *_blob)
 {

diff --git a/source4/smb_server/smb2/receive.c b/source4/smb_server/smb2/receive.c
index 5ac01dcb7c9f2740e4b3b0e8367771c14edb4ae5..abcf172738bfd09969c2b59033d885a43a649356 100644 (file)
--- a/source4/smb_server/smb2/receive.c
+++ b/source4/smb_server/smb2/receive.c
@@ -23,13 +23,11 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
-#include "smb_server/service_smb_proto.h"
 #include "smb_server/smb2/smb2_server.h"
 #include "smbd/service_stream.h"
 #include "lib/stream/packet.h"
 #include "ntvfs/ntvfs.h"
 #include "param/param.h"
-#include "auth/gensec/gensec.h"
 #include "auth/auth.h"
 
 

diff --git a/source4/smb_server/smb2/sesssetup.c b/source4/smb_server/smb2/sesssetup.c
index 9a8c1bfaa9760f43f5e73c4147f2df026d9522ec..58090305a03b1f77332d1c9c4e8c2c62e582a4bc 100644 (file)
--- a/source4/smb_server/smb2/sesssetup.c
+++ b/source4/smb_server/smb2/sesssetup.c
@@ -19,16 +19,13 @@
 */
 
 #include "includes.h"
-#include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "auth/auth.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
-#include "smb_server/service_smb_proto.h"
 #include "smb_server/smb2/smb2_server.h"
 #include "smbd/service_stream.h"
-#include "param/param.h"
 
 static void smb2srv_sesssetup_send(struct smb2srv_request *req, union smb_sesssetup *io)
 {

diff --git a/source4/smb_server/smb2/tcon.c b/source4/smb_server/smb2/tcon.c
index 843a8dac8d400bd69792104620b3c04183cd7ad5..d8021461280db2eb57e4cf82b932e82886a65650 100644 (file)
--- a/source4/smb_server/smb2/tcon.c
+++ b/source4/smb_server/smb2/tcon.c
@@ -21,12 +21,9 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
-#include "smb_server/service_smb_proto.h"
 #include "smb_server/smb2/smb2_server.h"
-#include "librpc/gen_ndr/security.h"
 #include "smbd/service_stream.h"
 #include "ntvfs/ntvfs.h"
-#include "param/param.h"
 
 /*
   send an oplock break request to a client

diff --git a/source4/smb_server/smb_samba3.c b/source4/smb_server/smb_samba3.c
index e201cdb1e9e5d04b1c279a4cbbacb305438222d1..10756396f3af3976340170b97ccfdf39e93476d7 100644 (file)
--- a/source4/smb_server/smb_samba3.c
+++ b/source4/smb_server/smb_samba3.c
@@ -20,17 +20,10 @@
 */
 
 #include "includes.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
 #include "smbd/service.h"
-#include "lib/messaging/irpc.h"
-#include "lib/stream/packet.h"
-#include "lib/socket/socket.h"
 #include "libcli/smb2/smb2.h"
-#include "smb_server/smb2/smb2_server.h"
 #include "system/network.h"
 #include "lib/socket/netif.h"
-#include "param/share.h"
 #include "param/param.h"
 #include "dynconfig/dynconfig.h"
 #include "smbd/process_model.h"

diff --git a/source4/smb_server/tcon.c b/source4/smb_server/tcon.c
index 12131ea25978cbfbfa67785a960260d94a14a479..f8243a006ce79771d9db802697cad5f4352a55de 100644 (file)
--- a/source4/smb_server/tcon.c
+++ b/source4/smb_server/tcon.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "../lib/util/dlinklist.h"
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
 #include "ntvfs/ntvfs.h"

diff --git a/source4/smbd/pidfile.c b/source4/smbd/pidfile.c
index 44600d33cfd92a94226375633e6b32f167694d70..da3f363ff9ba6a688ecbbdd71ecc094d08c85a24 100644 (file)
--- a/source4/smbd/pidfile.c
+++ b/source4/smbd/pidfile.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "smbd/pidfile.h"
 
 /**
  * @file

diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index 730e185e5a2e312cdea048f83162e8327efc7eea..49aaf8481a811361447e554834223b44dcfdf2f7 100644 (file)
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -24,9 +24,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "../tdb/include/tdb.h"
-#include "lib/socket/socket.h"
 #include "smbd/process_model.h"
-#include "param/secrets.h"
 #include "system/filesys.h"
 #include "cluster/cluster.h"
 #include "param/param.h"