From 7c807de6b87a57352fe408d27b32c217523a95cd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 19 Sep 2009 11:49:33 -0700 Subject: s4-smbd: minimise includes in smbd/ and smb_server --- source4/smb_server/blob.c | 2 -- source4/smb_server/handle.c | 2 -- source4/smb_server/session.c | 1 - source4/smb_server/smb/negprot.c | 1 - source4/smb_server/smb/receive.c | 2 -- source4/smb_server/smb/request.c | 1 - source4/smb_server/smb/service.c | 1 - source4/smb_server/smb/sesssetup.c | 2 -- source4/smb_server/smb/trans2.c | 2 -- source4/smb_server/smb2/fileinfo.c | 1 - source4/smb_server/smb2/fileio.c | 2 -- source4/smb_server/smb2/find.c | 1 - source4/smb_server/smb2/keepalive.c | 1 - source4/smb_server/smb2/negprot.c | 2 -- source4/smb_server/smb2/receive.c | 2 -- source4/smb_server/smb2/sesssetup.c | 3 --- source4/smb_server/smb2/tcon.c | 3 --- source4/smb_server/smb_samba3.c | 7 ------- source4/smb_server/tcon.c | 1 - source4/smbd/pidfile.c | 1 - source4/smbd/process_standard.c | 2 -- 21 files changed, 40 deletions(-) diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c index f72074898af..bf8985ccdf6 100644 --- 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 6ee4e163ad3..931f77abc4b 100644 --- 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 0e626307d6a..53193c5312e 100644 --- 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 efeee953639..ab763e39c36 100644 --- 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 9a039095e67..f58071bf558 100644 --- 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 6846f80594f..4bae0871875 100644 --- 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 5d8d6bbc323..805dc4d558e 100644 --- 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 e38447703ba..37f69abc12b 100644 --- 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 e0f6438dc6b..a9445860f16 100644 --- 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 82b006c4a1b..3084236355e 100644 --- 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 12bfd517568..497a6c531b2 100644 --- 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 10fcda94342..cd52872a1ca 100644 --- 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 ff47d594f02..c362acb7ce2 100644 --- 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 f915392ffae..5283a0db6e7 100644 --- 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 5ac01dcb7c9..abcf172738b 100644 --- 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 9a8c1bfaa97..58090305a03 100644 --- 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 843a8dac8d4..d8021461280 100644 --- 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 e201cdb1e9e..10756396f3a 100644 --- 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 12131ea2597..f8243a006ce 100644 --- 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 44600d33cfd..da3f363ff9b 100644 --- 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 730e185e5a2..49aaf8481a8 100644 --- 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" -- cgit