[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-545-gc386c02
Andrew Tridgell
tridge at samba.org
Sat Sep 19 15:12:53 MDT 2009
The branch, master has been updated
via c386c027e7a5ea55a9e6375eaf736718c6dbaae0 (commit)
via 1261d694f05bed1e466412b96da50d0062146470 (commit)
via 9c6979562677a91063f47e11a099f06480b330bf (commit)
via 72c60db12675d5b40e145921bef6684484b02635 (commit)
via c35bbad63e50b9975fb5753cdd60901020e2d81f (commit)
via 7c807de6b87a57352fe408d27b32c217523a95cd (commit)
via 22054523dce137c3eba443cfb5a197796c0dbfcf (commit)
via 86383f0003a5dddea465a4338182d0abdadea429 (commit)
via cb6f8689349d3f383ac352a602bc6564c6d399c1 (commit)
from 017092a028104a22f12aac7b143aaf848cc3adec (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c386c027e7a5ea55a9e6375eaf736718c6dbaae0
Author: Andrew Tridgell <tridge at samba.org>
Date: Sat Sep 19 12:42:57 2009 -0700
s4-ldb: bump minimum version in ldb too
commit 1261d694f05bed1e466412b96da50d0062146470
Author: Andrew Tridgell <tridge at samba.org>
Date: Sat Sep 19 12:41:32 2009 -0700
more include minimisation
commit 9c6979562677a91063f47e11a099f06480b330bf
Author: Andrew Tridgell <tridge at samba.org>
Date: Sat Sep 19 12:41:00 2009 -0700
tdb: increase minor version
we depend on reads in transactions for s4 replication
commit 72c60db12675d5b40e145921bef6684484b02635
Author: Andrew Tridgell <tridge at samba.org>
Date: Sat Sep 19 12:28:32 2009 -0700
s4-smbd: removed unnecessary includes
commit c35bbad63e50b9975fb5753cdd60901020e2d81f
Author: Andrew Tridgell <tridge at samba.org>
Date: Sat Sep 19 12:28:02 2009 -0700
s4-scripts: make minimal_includes handle our -I overrides
commit 7c807de6b87a57352fe408d27b32c217523a95cd
Author: Andrew Tridgell <tridge at samba.org>
Date: Sat Sep 19 11:49:33 2009 -0700
s4-smbd: minimise includes in smbd/ and smb_server
commit 22054523dce137c3eba443cfb5a197796c0dbfcf
Author: Andrew Tridgell <tridge at samba.org>
Date: Sat Sep 19 11:47:12 2009 -0700
s4-testparm: fixed -v option
never pass a bool pointer to popt
commit 86383f0003a5dddea465a4338182d0abdadea429
Author: Andrew Tridgell <tridge at samba.org>
Date: Sat Sep 19 11:38:04 2009 -0700
s4-rpc_server: removed remaining unnecessary #includes
commit cb6f8689349d3f383ac352a602bc6564c6d399c1
Author: Andrew Tridgell <tridge at samba.org>
Date: Sat Sep 19 11:33:39 2009 -0700
s4-rpc: remove some unnecessary #include lines
I should remember to run script/minimal_includes.pl more often
-----------------------------------------------------------------------
Summary of changes:
lib/tdb/configure.ac | 2 +-
source4/lib/ldb/external/libtdb.m4 | 2 +-
source4/min_versions.m4 | 2 +-
source4/rpc_server/browser/dcesrv_browser.c | 1 -
source4/rpc_server/common/forward.c | 4 ---
source4/rpc_server/common/server_info.c | 2 -
source4/rpc_server/common/share_info.c | 2 -
source4/rpc_server/dcesrv_mgmt.c | 1 -
source4/rpc_server/drsuapi/addentry.c | 3 +-
source4/rpc_server/drsuapi/dcesrv_drsuapi.c | 3 --
source4/rpc_server/drsuapi/drsutil.c | 5 ----
source4/rpc_server/drsuapi/getncchanges.c | 3 --
source4/rpc_server/drsuapi/updaterefs.c | 5 ----
source4/rpc_server/epmapper/rpc_epmapper.c | 1 -
source4/rpc_server/lsa/dcesrv_lsa.c | 2 -
source4/rpc_server/netlogon/dcerpc_netlogon.c | 6 -----
source4/rpc_server/samr/samr_password.c | 5 ----
source4/rpc_server/service_rpc.c | 6 -----
source4/rpc_server/spoolss/dcesrv_spoolss.c | 2 -
source4/rpc_server/srvsvc/dcesrv_srvsvc.c | 1 -
source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 2 -
source4/rpc_server/winreg/rpc_winreg.c | 2 -
source4/script/minimal_includes.pl | 30 ++++++++++++++++--------
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_model.c | 1 -
source4/smbd/process_standard.c | 2 -
source4/smbd/server.c | 3 --
source4/smbd/service_named_pipe.c | 2 -
source4/smbd/service_stream.c | 3 --
source4/smbd/service_task.c | 2 -
source4/utils/testparm.c | 2 +-
50 files changed, 26 insertions(+), 119 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/configure.ac b/lib/tdb/configure.ac
index 1558494..2b4d8de 100644
--- a/lib/tdb/configure.ac
+++ b/lib/tdb/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.50)
AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
AC_DEFUN([SMB_ENABLE], [echo -n ""])
-AC_INIT(tdb, 1.1.5)
+AC_INIT(tdb, 1.1.6)
AC_CONFIG_SRCDIR([common/tdb.c])
AC_CONFIG_HEADER(include/config.h)
AC_LIBREPLACE_ALL_CHECKS
diff --git a/source4/lib/ldb/external/libtdb.m4 b/source4/lib/ldb/external/libtdb.m4
index 2554f27..44971e1 100644
--- a/source4/lib/ldb/external/libtdb.m4
+++ b/source4/lib/ldb/external/libtdb.m4
@@ -4,4 +4,4 @@ AC_SUBST(TDB_LIBS)
AC_CHECK_HEADER(tdb.h,
[AC_CHECK_LIB(tdb, tdb_open, [TDB_LIBS="-ltdb"]) ],
- [PKG_CHECK_MODULES(TDB, tdb >= 1.1.5)])
+ [PKG_CHECK_MODULES(TDB, tdb >= 1.1.6)])
diff --git a/source4/min_versions.m4 b/source4/min_versions.m4
index 0ca6046..bc7bf18 100644
--- a/source4/min_versions.m4
+++ b/source4/min_versions.m4
@@ -1,6 +1,6 @@
# Minimum and exact required versions for various libraries
# if we use the ones installed in the system.
-define(TDB_MIN_VERSION,1.1.5)
+define(TDB_MIN_VERSION,1.1.6)
define(TALLOC_MIN_VERSION,2.0.0)
define(LDB_REQUIRED_VERSION,0.9.6)
define(TEVENT_REQUIRED_VERSION,0.9.8)
diff --git a/source4/rpc_server/browser/dcesrv_browser.c b/source4/rpc_server/browser/dcesrv_browser.c
index 33fed50..19b5609 100644
--- a/source4/rpc_server/browser/dcesrv_browser.c
+++ b/source4/rpc_server/browser/dcesrv_browser.c
@@ -22,7 +22,6 @@
#include "includes.h"
#include "rpc_server/dcerpc_server.h"
#include "librpc/gen_ndr/ndr_browser.h"
-#include "rpc_server/common/common.h"
/*
diff --git a/source4/rpc_server/common/forward.c b/source4/rpc_server/common/forward.c
index e0fac0e..07cf1c8 100644
--- a/source4/rpc_server/common/forward.c
+++ b/source4/rpc_server/common/forward.c
@@ -20,11 +20,7 @@
*/
#include "includes.h"
-#include "librpc/gen_ndr/ndr_srvsvc.h"
-#include "librpc/gen_ndr/svcctl.h"
#include "rpc_server/dcerpc_server.h"
-#include "rpc_server/common/common.h"
-#include "rpc_server/common/proto.h"
#include "messaging/irpc.h"
struct dcesrv_forward_state {
diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index a7384f1..66264fe 100644
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -21,13 +21,11 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_srvsvc.h"
-#include "librpc/gen_ndr/svcctl.h"
#include "rpc_server/dcerpc_server.h"
#include "dsdb/samdb/samdb.h"
#include "auth/auth.h"
#include "param/param.h"
#include "rpc_server/common/common.h"
-#include "rpc_server/common/proto.h"
/*
Here are common server info functions used by some dcerpc server interfaces
diff --git a/source4/rpc_server/common/share_info.c b/source4/rpc_server/common/share_info.c
index 48870e6..3ca5f3a 100644
--- a/source4/rpc_server/common/share_info.c
+++ b/source4/rpc_server/common/share_info.c
@@ -23,8 +23,6 @@
#include "param/share.h"
#include "librpc/gen_ndr/srvsvc.h"
#include "rpc_server/dcerpc_server.h"
-#include "rpc_server/common/common.h"
-#include "rpc_server/common/proto.h"
/*
Here are common server info functions used by some dcerpc server interfaces
diff --git a/source4/rpc_server/dcesrv_mgmt.c b/source4/rpc_server/dcesrv_mgmt.c
index 3a8f995..8c4eb63 100644
--- a/source4/rpc_server/dcesrv_mgmt.c
+++ b/source4/rpc_server/dcesrv_mgmt.c
@@ -22,7 +22,6 @@
#include "includes.h"
#include "rpc_server/dcerpc_server.h"
#include "librpc/gen_ndr/ndr_mgmt.h"
-#include "rpc_server/common/common.h"
/*
mgmt_inq_if_ids
diff --git a/source4/rpc_server/drsuapi/addentry.c b/source4/rpc_server/drsuapi/addentry.c
index edf46aa..25f2aaa 100644
--- a/source4/rpc_server/drsuapi/addentry.c
+++ b/source4/rpc_server/drsuapi/addentry.c
@@ -21,7 +21,6 @@
*/
#include "includes.h"
-#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "rpc_server/dcerpc_server.h"
#include "rpc_server/common/common.h"
#include "dsdb/samdb/samdb.h"
@@ -31,6 +30,8 @@
#include "auth/auth.h"
#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
#include "libcli/security/security.h"
+#include "librpc/gen_ndr/ndr_drsblobs.h"
+#include "librpc/gen_ndr/ndr_drsuapi.h"
/*
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index 9ae9519..f96c4c0 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -25,9 +25,6 @@
#include "rpc_server/dcerpc_server.h"
#include "rpc_server/common/common.h"
#include "dsdb/samdb/samdb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "param/param.h"
-#include "librpc/gen_ndr/ndr_drsblobs.h"
#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
#include "libcli/security/security.h"
diff --git a/source4/rpc_server/drsuapi/drsutil.c b/source4/rpc_server/drsuapi/drsutil.c
index f873614..305e298 100644
--- a/source4/rpc_server/drsuapi/drsutil.c
+++ b/source4/rpc_server/drsuapi/drsutil.c
@@ -20,13 +20,8 @@
*/
#include "includes.h"
-#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "rpc_server/dcerpc_server.h"
-#include "rpc_server/common/common.h"
#include "dsdb/samdb/samdb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "param/param.h"
-#include "librpc/gen_ndr/ndr_drsblobs.h"
#include "libcli/security/dom_sid.h"
#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c
index 14d4f0d..52d751b 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -23,16 +23,13 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "rpc_server/dcerpc_server.h"
-#include "rpc_server/common/common.h"
#include "dsdb/samdb/samdb.h"
-#include "lib/ldb/include/ldb_errors.h"
#include "param/param.h"
#include "librpc/gen_ndr/ndr_drsblobs.h"
#include "auth/auth.h"
#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
#include "rpc_server/dcerpc_server_proto.h"
#include "../libcli/drsuapi/drsuapi.h"
-#include "../libcli/security/dom_sid.h"
#include "libcli/security/security.h"
/*
diff --git a/source4/rpc_server/drsuapi/updaterefs.c b/source4/rpc_server/drsuapi/updaterefs.c
index 34ff0ca..6e97024 100644
--- a/source4/rpc_server/drsuapi/updaterefs.c
+++ b/source4/rpc_server/drsuapi/updaterefs.c
@@ -20,13 +20,8 @@
*/
#include "includes.h"
-#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "rpc_server/dcerpc_server.h"
-#include "rpc_server/common/common.h"
#include "dsdb/samdb/samdb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "param/param.h"
-#include "librpc/gen_ndr/ndr_drsblobs.h"
#include "auth/auth.h"
#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
#include "libcli/security/security.h"
diff --git a/source4/rpc_server/epmapper/rpc_epmapper.c b/source4/rpc_server/epmapper/rpc_epmapper.c
index b9b0296..535f19e 100644
--- a/source4/rpc_server/epmapper/rpc_epmapper.c
+++ b/source4/rpc_server/epmapper/rpc_epmapper.c
@@ -23,7 +23,6 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_epmapper.h"
#include "rpc_server/dcerpc_server.h"
-#include "rpc_server/common/common.h"
typedef uint32_t error_status_t;
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 7bde42c..13f045f 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -23,8 +23,6 @@
*/
#include "rpc_server/lsa/lsa.h"
-#include "../lib/util/util_ldb.h"
-#include "libcli/ldap/ldap_ndr.h"
#include "system/kerberos.h"
#include "auth/kerberos/kerberos.h"
#include "librpc/gen_ndr/ndr_drsblobs.h"
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index ab7cc34..1f0bb61 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -23,22 +23,16 @@
#include "includes.h"
#include "rpc_server/dcerpc_server.h"
-#include "rpc_server/common/common.h"
-#include "lib/ldb/include/ldb.h"
#include "auth/auth.h"
#include "auth/auth_sam_reply.h"
#include "dsdb/samdb/samdb.h"
-#include "../libds/common/flags.h"
-#include "rpc_server/samr/proto.h"
#include "../lib/util/util_ldb.h"
-#include "libcli/auth/libcli_auth.h"
#include "../libcli/auth/schannel.h"
#include "auth/gensec/schannel_state.h"
#include "libcli/security/security.h"
#include "param/param.h"
#include "lib/messaging/irpc.h"
#include "librpc/gen_ndr/ndr_irpc.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
struct netlogon_server_pipe_state {
struct netr_Credential client_challenge;
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index 6f12d2f..450af82 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -22,18 +22,13 @@
#include "includes.h"
#include "rpc_server/dcerpc_server.h"
-#include "rpc_server/common/common.h"
#include "rpc_server/samr/dcesrv_samr.h"
#include "system/time.h"
#include "../lib/crypto/crypto.h"
-#include "../libds/common/flags.h"
-#include "libcli/ldap/ldap.h"
#include "dsdb/samdb/samdb.h"
#include "auth/auth.h"
-#include "rpc_server/samr/proto.h"
#include "libcli/auth/libcli_auth.h"
#include "../lib/util/util_ldb.h"
-#include "param/param.h"
/*
samr_ChangePasswordUser
diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index 1c23eb9..64c6728 100644
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -24,17 +24,11 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_dcerpc.h"
#include "auth/auth.h"
-#include "auth/gensec/gensec.h"
#include "../lib/util/dlinklist.h"
#include "rpc_server/dcerpc_server.h"
#include "rpc_server/dcerpc_server_proto.h"
-#include "rpc_server/service_rpc.h"
-#include "lib/events/events.h"
-#include "smbd/service_task.h"
-#include "smbd/service_stream.h"
#include "smbd/service.h"
#include "system/filesys.h"
-#include "libcli/security/security.h"
#include "lib/socket/socket.h"
#include "lib/messaging/irpc.h"
#include "system/network.h"
diff --git a/source4/rpc_server/spoolss/dcesrv_spoolss.c b/source4/rpc_server/spoolss/dcesrv_spoolss.c
index f39db4b..d380b10 100644
--- a/source4/rpc_server/spoolss/dcesrv_spoolss.c
+++ b/source4/rpc_server/spoolss/dcesrv_spoolss.c
@@ -23,10 +23,8 @@
#include "includes.h"
#include "rpc_server/dcerpc_server.h"
#include "librpc/gen_ndr/ndr_spoolss.h"
-#include "rpc_server/common/common.h"
#include "ntptr/ntptr.h"
#include "lib/socket/socket.h"
-#include "smbd/service_stream.h"
#include "librpc/gen_ndr/ndr_spoolss_c.h"
#include "auth/credentials/credentials.h"
#include "param/param.h"
diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index be804ba..ac53fd7 100644
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -24,7 +24,6 @@
#include "rpc_server/dcerpc_server.h"
#include "librpc/gen_ndr/ndr_srvsvc.h"
#include "rpc_server/common/common.h"
-#include "rpc_server/common/proto.h"
#include "auth/auth.h"
#include "libcli/security/security.h"
#include "system/time.h"
diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
index a1d76ef..20c1a39 100644
--- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
+++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
@@ -21,10 +21,8 @@
#include "includes.h"
#include "rpc_server/dcerpc_server.h"
-#include "rpc_server/common/common.h"
#include "librpc/gen_ndr/ndr_unixinfo.h"
#include "libcli/wbclient/wbclient.h"
-#include "lib/events/events.h"
#include "system/passwd.h"
static NTSTATUS dcerpc_unixinfo_bind(struct dcesrv_call_state *dce_call,
diff --git a/source4/rpc_server/winreg/rpc_winreg.c b/source4/rpc_server/winreg/rpc_winreg.c
index 6158730..c365d82 100644
--- a/source4/rpc_server/winreg/rpc_winreg.c
+++ b/source4/rpc_server/winreg/rpc_winreg.c
@@ -24,9 +24,7 @@
#include "rpc_server/dcerpc_server.h"
#include "lib/registry/registry.h"
#include "librpc/gen_ndr/ndr_winreg.h"
-#include "rpc_server/common/common.h"
#include "librpc/gen_ndr/ndr_security.h"
-#include "param/param.h"
#include "libcli/security/security.h"
enum handle_types { HTYPE_REGVAL, HTYPE_REGKEY };
diff --git a/source4/script/minimal_includes.pl b/source4/script/minimal_includes.pl
index 963dc10..2bcbd11 100755
--- a/source4/script/minimal_includes.pl
+++ b/source4/script/minimal_includes.pl
@@ -10,6 +10,7 @@ use Getopt::Long;
my $opt_help = 0;
my $opt_remove = 0;
+my $opt_skip_system = 0;
#####################################################################
# write a string into a file
@@ -62,24 +63,31 @@ sub test_include($$$$)
my $i = shift;
my $original = shift;
my $line = $lines->[$i];
+ my $testfname;
$lines->[$i] = "";
- save_lines("_testcompile.c", $lines);
+
+ `/bin/mv -f $fname $fname.misaved` && die "failed to rename $fname";
+ save_lines($fname, $lines);
- my $out = test_compile("_testcompile.c");
- $out =~ s/_testcompile.c/$fname/g;
+ my $out = test_compile($fname);
if ($out eq $original) {
if ($opt_remove) {
- print "$fname: removing $line\n";
- save_lines($fname, $lines);
- return;
+ if ($opt_skip_system &&
+ $line =~ /system\//) {
+ print "$fname: not removing system include $line\n";
+ } else {
+ print "$fname: removing $line\n";
+ return;
+ }
+ } else {
+ print "$fname: might be able to remove $line\n";
}
- print "$fname: might be able to remove $line\n";
}
$lines->[$i] = $line;
- unlink("_testcompile.c");
+ `/bin/mv -f $fname.misaved $fname` && die "failed to restore $fname";
}
sub process_file($)
@@ -127,8 +135,9 @@ sub ShowHelp()
Usage: minimal_includes.pl [options] <C files....>
Options:
- --help show help
- --remove remove includes, don't just list them
+ --help show help
+ --remove remove includes, don't just list them
+ --skip-system don't remove system/ includes
";
}
@@ -137,6 +146,7 @@ sub ShowHelp()
GetOptions (
'h|help|?' => \$opt_help,
'remove' => \$opt_remove,
+ 'skip-system' => \$opt_skip_system,
);
if ($opt_help) {
diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index f720748..bf8985c 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 6ee4e16..931f77a 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 0e62630..53193c5 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 efeee95..ab763e3 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 9a03909..f58071b 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 6846f80..4bae087 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"
--
Samba Shared Repository
More information about the samba-cvs
mailing list