The branch, master has been updated via 2c34112... s4-torture: fixed a pipe leak via 2b90fbb... s4-selftest: the secleak test is not designed for automated running via 5e79a86... s4: ran minimal_includes.pl on source4/auth/gensec via f8109b0... s4: ran minimal_includes.pl on source4/auth/ntlmssp via 49650a2... s4: ran minimal_includes.pl on source4/auth/ntlm via 090fbdc... s4: ran minimal_includes.pl on source4/client via 95e895d... s4: ran minimal_includes.pl on source4/rpc_server via 7f1832c... s4: ran minimal_includes.pl on source4/winbind via 84d0047... s4-torture: ran minimal_includes.pl over source4/torture via 8585cf1... s4-script: cleanup tmp files in minimial_includes.pl from 14111d6... s4-selftest: skip two more scanners
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 2c34112e58ffda36dd2131016488035e625022b3 Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 20 16:34:42 2009 +1100 s4-torture: fixed a pipe leak The RPC-SAMR-PASSWORDS* tests could leak RPC pipes, causing an overallocation of fd's on the server commit 2b90fbb579d219dc013c3e6ce348644fd5f2b09f Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 20 16:18:51 2009 +1100 s4-selftest: the secleak test is not designed for automated running commit 5e79a86298b82d057956faa079718dc85309b65f Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 20 15:41:30 2009 +1100 s4: ran minimal_includes.pl on source4/auth/gensec commit f8109b0f49cd470b4500cfb35ebe56e546dd67b8 Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 20 15:39:35 2009 +1100 s4: ran minimal_includes.pl on source4/auth/ntlmssp commit 49650a226ec561f721151fac5f36b1229bd72936 Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 20 15:38:03 2009 +1100 s4: ran minimal_includes.pl on source4/auth/ntlm commit 090fbdce7d1368d3995e8543b1e9fcbaeef59808 Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 20 15:34:30 2009 +1100 s4: ran minimal_includes.pl on source4/client commit 95e895d8804c56f52e1ccfb43fa7d8d141692391 Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 20 15:32:35 2009 +1100 s4: ran minimal_includes.pl on source4/rpc_server commit 7f1832c4693f623266d8191698555e0ae9c8d7d1 Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 20 15:01:46 2009 +1100 s4: ran minimal_includes.pl on source4/winbind commit 84d004737739df28ca220f0fbc56ad43a9ae7230 Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 20 14:53:08 2009 +1100 s4-torture: ran minimal_includes.pl over source4/torture This reduces compile time somewhat. commit 8585cf1a78c3352ef6a0d3b3f32f9aacc28b609c Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 20 14:31:50 2009 +1100 s4-script: cleanup tmp files in minimial_includes.pl also changes to use perl fns, instead of shell ----------------------------------------------------------------------- Summary of changes: source4/auth/gensec/cyrus_sasl.c | 1 - source4/auth/gensec/gensec.c | 2 -- source4/auth/gensec/gensec_krb5.c | 5 ----- source4/auth/gensec/pygensec.c | 1 - source4/auth/gensec/schannel.c | 1 - source4/auth/gensec/schannel_state.c | 2 -- source4/auth/ntlm/auth_developer.c | 1 - source4/auth/ntlm/auth_sam.c | 3 --- source4/auth/ntlm/auth_server.c | 2 -- source4/auth/ntlm/auth_simple.c | 3 --- source4/auth/ntlm/auth_util.c | 4 ---- source4/auth/ntlm/pam_errors.c | 1 - source4/auth/ntlmssp/ntlmssp.c | 3 --- source4/auth/ntlmssp/ntlmssp_client.c | 1 - source4/auth/ntlmssp/ntlmssp_server.c | 3 --- source4/auth/ntlmssp/ntlmssp_sign.c | 1 - source4/client/cifsddio.c | 1 - source4/client/client.c | 4 ---- source4/rpc_server/common/server_info.c | 1 - source4/rpc_server/dcerpc_server.c | 5 ----- source4/rpc_server/drsuapi/addentry.c | 6 ------ source4/rpc_server/drsuapi/drsutil.c | 2 -- source4/rpc_server/drsuapi/getncchanges.c | 2 -- source4/rpc_server/drsuapi/updaterefs.c | 2 -- source4/rpc_server/lsa/lsa_init.c | 1 - source4/rpc_server/service_rpc.c | 2 -- source4/rpc_server/srvsvc/srvsvc_ntvfs.c | 4 ---- source4/script/minimal_includes.pl | 8 ++++++-- source4/selftest/skip | 1 + source4/torture/auth/ntlmssp.c | 1 - source4/torture/auth/pac.c | 1 - source4/torture/basic/aliases.c | 1 - source4/torture/basic/attr.c | 1 - source4/torture/basic/base.c | 2 -- source4/torture/basic/charset.c | 2 -- source4/torture/basic/delete.c | 2 -- source4/torture/basic/denytest.c | 4 ---- source4/torture/basic/dir.c | 1 - source4/torture/basic/disconnect.c | 1 - source4/torture/basic/locking.c | 2 -- source4/torture/basic/mangle_test.c | 1 - source4/torture/basic/misc.c | 2 -- source4/torture/basic/properties.c | 2 -- source4/torture/basic/rename.c | 1 - source4/torture/basic/scanner.c | 2 -- source4/torture/basic/secleak.c | 2 -- source4/torture/basic/unlink.c | 2 -- source4/torture/basic/utable.c | 1 - source4/torture/drs/internal/prefixmap_tests.c | 2 -- source4/torture/ldap/basic.c | 1 - source4/torture/ldap/cldap.c | 2 -- source4/torture/ldap/cldapbench.c | 1 - source4/torture/ldap/schema.c | 4 ---- source4/torture/ldap/uptodatevector.c | 5 ----- source4/torture/libnet/domain.c | 1 - source4/torture/libnet/libnet.c | 1 - source4/torture/libnet/libnet_BecomeDC.c | 7 ------- source4/torture/libnet/libnet_domain.c | 5 ----- source4/torture/libnet/libnet_group.c | 1 - source4/torture/libnet/libnet_lookup.c | 3 --- source4/torture/libnet/libnet_rpc.c | 4 ---- source4/torture/libnet/libnet_user.c | 1 - source4/torture/libnet/utils.c | 1 - source4/torture/local/local.c | 1 - source4/torture/local/torture.c | 2 -- source4/torture/locktest.c | 1 - source4/torture/masktest.c | 2 -- source4/torture/nbench/nbio.c | 3 --- source4/torture/nbt/dgram.c | 3 --- source4/torture/nbt/winsreplication.c | 1 - source4/torture/ndr/ndr.c | 1 - source4/torture/ntp/ntp_signd.c | 4 ---- source4/torture/rap/rap.c | 2 -- source4/torture/raw/chkpath.c | 2 -- source4/torture/raw/context.c | 3 --- source4/torture/raw/ioctl.c | 1 - source4/torture/raw/lockbench.c | 1 - source4/torture/raw/lookuprate.c | 3 --- source4/torture/raw/mkdir.c | 2 -- source4/torture/raw/mux.c | 1 - source4/torture/raw/notify.c | 1 - source4/torture/raw/offline.c | 4 ---- source4/torture/raw/open.c | 5 ----- source4/torture/raw/oplock.c | 5 ----- source4/torture/raw/pingpong.c | 2 -- source4/torture/raw/qfileinfo.c | 3 --- source4/torture/raw/qfsinfo.c | 2 -- source4/torture/raw/read.c | 2 -- source4/torture/raw/rename.c | 2 -- source4/torture/raw/samba3hide.c | 2 -- source4/torture/raw/search.c | 1 - source4/torture/raw/seek.c | 2 -- source4/torture/raw/setfileinfo.c | 3 --- source4/torture/raw/write.c | 2 -- source4/torture/rpc/alter_context.c | 2 -- source4/torture/rpc/async_bind.c | 4 ---- source4/torture/rpc/atsvc.c | 1 - source4/torture/rpc/autoidl.c | 3 --- source4/torture/rpc/bench.c | 1 - source4/torture/rpc/bind.c | 6 ------ source4/torture/rpc/browser.c | 1 - source4/torture/rpc/countcalls.c | 2 -- source4/torture/rpc/dfs.c | 3 --- source4/torture/rpc/drsuapi.c | 1 - source4/torture/rpc/drsuapi_cracknames.c | 1 - source4/torture/rpc/dssetup.c | 1 - source4/torture/rpc/dssync.c | 4 ---- source4/torture/rpc/echo.c | 1 - source4/torture/rpc/epmapper.c | 1 - source4/torture/rpc/eventlog.c | 2 -- source4/torture/rpc/frsapi.c | 2 -- source4/torture/rpc/handles.c | 1 - source4/torture/rpc/initshutdown.c | 1 - source4/torture/rpc/join.c | 2 -- source4/torture/rpc/lsa_lookup.c | 3 --- source4/torture/rpc/mgmt.c | 2 -- source4/torture/rpc/netlogon.c | 6 ------ source4/torture/rpc/ntsvcs.c | 3 --- source4/torture/rpc/object_uuid.c | 3 --- source4/torture/rpc/oxidresolve.c | 1 - source4/torture/rpc/remact.c | 1 - source4/torture/rpc/remote_pac.c | 6 ------ source4/torture/rpc/rpc.c | 2 -- source4/torture/rpc/samba3rpc.c | 11 ----------- source4/torture/rpc/samlogon.c | 2 -- source4/torture/rpc/samr.c | 2 ++ source4/torture/rpc/samr_accessmask.c | 2 -- source4/torture/rpc/samsync.c | 3 --- source4/torture/rpc/scanner.c | 2 -- source4/torture/rpc/session_key.c | 1 - source4/torture/rpc/spoolss_notify.c | 4 ---- source4/torture/rpc/spoolss_win.c | 3 --- source4/torture/rpc/srvsvc.c | 2 -- source4/torture/rpc/svcctl.c | 1 - source4/torture/rpc/testjoin.c | 2 -- source4/torture/rpc/unixinfo.c | 1 - source4/torture/rpc/winreg.c | 1 - source4/torture/smb2/compound.c | 1 - source4/torture/smb2/connect.c | 1 - source4/torture/smb2/durable_open.c | 1 - source4/torture/smb2/lease.c | 2 -- source4/torture/smb2/lock.c | 1 - source4/torture/smb2/notify.c | 1 - source4/torture/smb2/read.c | 1 - source4/torture/smb2/scan.c | 1 - source4/torture/smb2/smb2.c | 1 - source4/torture/smb2/streams.c | 5 ----- source4/torture/smb2/util.c | 3 --- source4/torture/smbtorture.c | 4 ---- source4/torture/torture.c | 2 -- source4/torture/unix/unix_info2.c | 5 ----- source4/torture/unix/whoami.c | 2 -- source4/torture/util_smb.c | 1 - source4/torture/winbind/struct_based.c | 1 - source4/winbind/idmap.c | 3 --- source4/winbind/wb_async_helpers.c | 6 ------ source4/winbind/wb_cmd_getgrgid.c | 6 ------ source4/winbind/wb_cmd_getgrnam.c | 4 ---- source4/winbind/wb_cmd_getpwent.c | 3 --- source4/winbind/wb_cmd_getpwnam.c | 2 -- source4/winbind/wb_cmd_getpwuid.c | 5 ----- source4/winbind/wb_cmd_list_groups.c | 3 --- source4/winbind/wb_cmd_list_users.c | 3 --- source4/winbind/wb_cmd_lookupname.c | 1 - source4/winbind/wb_cmd_setpwent.c | 3 --- source4/winbind/wb_connect_lsa.c | 1 - source4/winbind/wb_connect_sam.c | 1 - source4/winbind/wb_dom_info.c | 3 --- source4/winbind/wb_dom_info_trusted.c | 1 - source4/winbind/wb_gid2sid.c | 3 --- source4/winbind/wb_init_domain.c | 5 ----- source4/winbind/wb_irpc.c | 1 - source4/winbind/wb_name2domain.c | 1 - source4/winbind/wb_pam_auth.c | 2 -- source4/winbind/wb_sam_logon.c | 2 -- source4/winbind/wb_samba3_cmd.c | 2 -- source4/winbind/wb_server.c | 8 -------- source4/winbind/wb_setup_domains.c | 1 - source4/winbind/wb_sid2domain.c | 1 - source4/winbind/wb_sid2gid.c | 2 -- source4/winbind/wb_sid2uid.c | 2 -- source4/winbind/wb_sids2xids.c | 3 --- source4/winbind/wb_uid2sid.c | 3 --- source4/winbind/wb_xids2sids.c | 3 --- 184 files changed, 9 insertions(+), 424 deletions(-) mode change 100755 => 100644 source4/torture/raw/pingpong.c Changeset truncated at 500 lines: diff --git a/source4/auth/gensec/cyrus_sasl.c b/source4/auth/gensec/cyrus_sasl.c index 54d5396..da96d23 100644 --- a/source4/auth/gensec/cyrus_sasl.c +++ b/source4/auth/gensec/cyrus_sasl.c @@ -20,7 +20,6 @@ */ #include "includes.h" -#include "auth/auth.h" #include "auth/credentials/credentials.h" #include "auth/gensec/gensec.h" #include "auth/gensec/gensec_proto.h" diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c index 5df9128..68f8188 100644 --- a/source4/auth/gensec/gensec.c +++ b/source4/auth/gensec/gensec.c @@ -21,12 +21,10 @@ */ #include "includes.h" -#include "auth/auth.h" #include "lib/events/events.h" #include "librpc/rpc/dcerpc.h" #include "auth/credentials/credentials.h" #include "auth/gensec/gensec.h" -#include "auth/gensec/gensec_proto.h" #include "param/param.h" /* the list of currently registered GENSEC backends */ diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c index f4ef36a..ee5f9c3 100644 --- a/source4/auth/gensec/gensec_krb5.c +++ b/source4/auth/gensec/gensec_krb5.c @@ -26,18 +26,13 @@ #include "includes.h" #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" -#include "librpc/gen_ndr/krb5pac.h" #include "auth/auth.h" -#include "lib/ldb/include/ldb.h" -#include "auth/auth_sam.h" #include "lib/socket/socket.h" #include "librpc/rpc/dcerpc.h" #include "auth/credentials/credentials.h" -#include "auth/credentials/credentials_krb5.h" #include "auth/gensec/gensec.h" #include "auth/gensec/gensec_proto.h" #include "param/param.h" -#include "auth/session_proto.h" #include "auth/auth_sam_reply.h" enum GENSEC_KRB5_STATE { diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c index d6d1f63..c799ffd 100644 --- a/source4/auth/gensec/pygensec.c +++ b/source4/auth/gensec/pygensec.c @@ -18,7 +18,6 @@ #include "includes.h" #include <Python.h> -#include "param/param.h" #include "param/pyparam.h" #include "auth/gensec/gensec.h" #include "libcli/util/pyerrors.h" diff --git a/source4/auth/gensec/schannel.c b/source4/auth/gensec/schannel.c index f911dd3..2fe97fe 100644 --- a/source4/auth/gensec/schannel.c +++ b/source4/auth/gensec/schannel.c @@ -30,7 +30,6 @@ #include "auth/gensec/schannel_state.h" #include "librpc/rpc/dcerpc.h" #include "param/param.h" -#include "auth/session_proto.h" static size_t schannel_sig_size(struct gensec_security *gensec_security, size_t data_size) { diff --git a/source4/auth/gensec/schannel_state.c b/source4/auth/gensec/schannel_state.c index 1320db8..7aa0ba3 100644 --- a/source4/auth/gensec/schannel_state.c +++ b/source4/auth/gensec/schannel_state.c @@ -23,10 +23,8 @@ #include "lib/ldb/include/ldb.h" #include "ldb_wrap.h" #include "../lib/util/util_ldb.h" -#include "libcli/auth/libcli_auth.h" #include "auth/auth.h" #include "param/param.h" -#include "auth/gensec/schannel_state.h" /** connect to the schannel ldb diff --git a/source4/auth/ntlm/auth_developer.c b/source4/auth/ntlm/auth_developer.c index 3b8c83c..c904831 100644 --- a/source4/auth/ntlm/auth_developer.c +++ b/source4/auth/ntlm/auth_developer.c @@ -23,7 +23,6 @@ #include "auth/auth.h" #include "auth/ntlm/auth_proto.h" #include "libcli/security/security.h" -#include "librpc/gen_ndr/ndr_samr.h" static NTSTATUS name_to_ntstatus_want_check(struct auth_method_context *ctx, TALLOC_CTX *mem_ctx, diff --git a/source4/auth/ntlm/auth_sam.c b/source4/auth/ntlm/auth_sam.c index 58a21d2..46cdd8d 100644 --- a/source4/auth/ntlm/auth_sam.c +++ b/source4/auth/ntlm/auth_sam.c @@ -20,7 +20,6 @@ */ #include "includes.h" -#include "librpc/gen_ndr/ndr_netlogon.h" #include "system/time.h" #include "lib/ldb/include/ldb.h" #include "../lib/util/util_ldb.h" @@ -29,8 +28,6 @@ #include "auth/ntlm/auth_proto.h" #include "auth/auth_sam.h" #include "dsdb/samdb/samdb.h" -#include "libcli/security/security.h" -#include "libcli/ldap/ldap_ndr.h" #include "param/param.h" extern const char *user_attrs[]; diff --git a/source4/auth/ntlm/auth_server.c b/source4/auth/ntlm/auth_server.c index fd0ef0f..12849aa 100644 --- a/source4/auth/ntlm/auth_server.c +++ b/source4/auth/ntlm/auth_server.c @@ -21,10 +21,8 @@ #include "includes.h" #include "auth/auth.h" -#include "auth/ntlm/auth_proto.h" #include "auth/credentials/credentials.h" #include "libcli/security/security.h" -#include "librpc/gen_ndr/ndr_samr.h" #include "libcli/smb_composite/smb_composite.h" #include "param/param.h" #include "libcli/resolve/resolve.h" diff --git a/source4/auth/ntlm/auth_simple.c b/source4/auth/ntlm/auth_simple.c index ccf677b..1de74ec 100644 --- a/source4/auth/ntlm/auth_simple.c +++ b/source4/auth/ntlm/auth_simple.c @@ -23,9 +23,6 @@ #include "includes.h" #include "auth/auth.h" -#include "lib/events/events.h" -#include "param/param.h" -#include "auth/session_proto.h" /* It's allowed to pass NULL as session_info, diff --git a/source4/auth/ntlm/auth_util.c b/source4/auth/ntlm/auth_util.c index 2f8ef10..5543cbe 100644 --- a/source4/auth/ntlm/auth_util.c +++ b/source4/auth/ntlm/auth_util.c @@ -23,11 +23,7 @@ #include "includes.h" #include "auth/auth.h" -#include "auth/auth_proto.h" -#include "libcli/security/security.h" #include "libcli/auth/libcli_auth.h" -#include "dsdb/samdb/samdb.h" -#include "auth/credentials/credentials.h" #include "param/param.h" /* this default function can be used by mostly all backends diff --git a/source4/auth/ntlm/pam_errors.c b/source4/auth/ntlm/pam_errors.c index 29fa4a8..9774ad8 100644 --- a/source4/auth/ntlm/pam_errors.c +++ b/source4/auth/ntlm/pam_errors.c @@ -18,7 +18,6 @@ */ #include "includes.h" -#include "auth/ntlm/pam_errors.h" #ifdef WITH_HAVE_SECURITY_PAM_APPL_H #include <security/pam_appl.h> diff --git a/source4/auth/ntlmssp/ntlmssp.c b/source4/auth/ntlmssp/ntlmssp.c index 633199f..f52d02d 100644 --- a/source4/auth/ntlmssp/ntlmssp.c +++ b/source4/auth/ntlmssp/ntlmssp.c @@ -23,13 +23,10 @@ #include "includes.h" #include "auth/ntlmssp/ntlmssp.h" -#include "../librpc/gen_ndr/ntlmssp.h" #include "../libcli/auth/libcli_auth.h" #include "librpc/gen_ndr/ndr_dcerpc.h" -#include "auth/credentials/credentials.h" #include "auth/gensec/gensec.h" #include "auth/gensec/gensec_proto.h" -#include "param/param.h" /** * Callbacks for NTLMSSP - for both client and server operating modes diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c index 87794ae..7aef086 100644 --- a/source4/auth/ntlmssp/ntlmssp_client.c +++ b/source4/auth/ntlmssp/ntlmssp_client.c @@ -23,7 +23,6 @@ #include "includes.h" #include "auth/ntlmssp/ntlmssp.h" -#include "../librpc/gen_ndr/ntlmssp.h" #include "../lib/crypto/crypto.h" #include "../libcli/auth/libcli_auth.h" #include "auth/credentials/credentials.h" diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index a56b21a..63cbf68 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -24,14 +24,11 @@ #include "includes.h" #include "system/network.h" #include "auth/ntlmssp/ntlmssp.h" -#include "../librpc/gen_ndr/ntlmssp.h" #include "../libcli/auth/libcli_auth.h" #include "../lib/crypto/crypto.h" #include "auth/gensec/gensec.h" #include "auth/auth.h" -#include "auth/ntlm/auth_proto.h" #include "param/param.h" -#include "auth/session_proto.h" /** * Set a username on an NTLMSSP context - ensures it is talloc()ed diff --git a/source4/auth/ntlmssp/ntlmssp_sign.c b/source4/auth/ntlmssp/ntlmssp_sign.c index 6e5a08c..957d0a8 100644 --- a/source4/auth/ntlmssp/ntlmssp_sign.c +++ b/source4/auth/ntlmssp/ntlmssp_sign.c @@ -21,7 +21,6 @@ #include "includes.h" #include "auth/ntlmssp/ntlmssp.h" -#include "../librpc/gen_ndr/ntlmssp.h" #include "../libcli/auth/libcli_auth.h" #include "../lib/crypto/crypto.h" #include "auth/gensec/gensec.h" diff --git a/source4/client/cifsddio.c b/source4/client/cifsddio.c index ab18dd0..47caf6b 100644 --- a/source4/client/cifsddio.c +++ b/source4/client/cifsddio.c @@ -20,7 +20,6 @@ #include "includes.h" #include "system/filesys.h" -#include "libcli/raw/libcliraw.h" #include "libcli/libcli.h" #include "lib/cmdline/popt_common.h" diff --git a/source4/client/client.c b/source4/client/client.c index c1292a2..71e666b 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -35,9 +35,6 @@ #include "lib/events/events.h" #include "lib/cmdline/popt_common.h" #include "librpc/gen_ndr/ndr_srvsvc_c.h" -#include "librpc/gen_ndr/ndr_lsa.h" -#include "librpc/gen_ndr/ndr_security.h" -#include "libcli/raw/libcliraw.h" #include "libcli/util/clilsa.h" #include "system/dir.h" #include "system/filesys.h" @@ -51,7 +48,6 @@ #include "lib/smbreadline/smbreadline.h" #include "librpc/gen_ndr/ndr_nbt.h" #include "param/param.h" -#include "librpc/rpc/dcerpc.h" #include "libcli/raw/raw_proto.h" /* the default pager to use for the client "more" command. Users can diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c index 66264fe..2906b89 100644 --- a/source4/rpc_server/common/server_info.c +++ b/source4/rpc_server/common/server_info.c @@ -25,7 +25,6 @@ #include "dsdb/samdb/samdb.h" #include "auth/auth.h" #include "param/param.h" -#include "rpc_server/common/common.h" /* Here are common server info functions used by some dcerpc server interfaces diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 75c5035..918646f 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -21,17 +21,12 @@ */ #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 "librpc/rpc/dcerpc_proto.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 "param/param.h" diff --git a/source4/rpc_server/drsuapi/addentry.c b/source4/rpc_server/drsuapi/addentry.c index dbaf627..89b664d 100644 --- a/source4/rpc_server/drsuapi/addentry.c +++ b/source4/rpc_server/drsuapi/addentry.c @@ -22,15 +22,9 @@ #include "includes.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" -#include "librpc/gen_ndr/ndr_drsblobs.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/rpc_server/drsuapi/drsutil.c b/source4/rpc_server/drsuapi/drsutil.c index 752861c..a62f911 100644 --- a/source4/rpc_server/drsuapi/drsutil.c +++ b/source4/rpc_server/drsuapi/drsutil.c @@ -22,8 +22,6 @@ #include "includes.h" #include "rpc_server/dcerpc_server.h" #include "dsdb/samdb/samdb.h" -#include "libcli/security/dom_sid.h" -#include "rpc_server/drsuapi/dcesrv_drsuapi.h" #include "libcli/security/security.h" #include "param/param.h" diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c index 90ddab0..ca404c4 100644 --- a/source4/rpc_server/drsuapi/getncchanges.c +++ b/source4/rpc_server/drsuapi/getncchanges.c @@ -21,12 +21,10 @@ */ #include "includes.h" -#include "librpc/gen_ndr/ndr_drsuapi.h" #include "rpc_server/dcerpc_server.h" #include "dsdb/samdb/samdb.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" diff --git a/source4/rpc_server/drsuapi/updaterefs.c b/source4/rpc_server/drsuapi/updaterefs.c index 60a70c5..6e2efed 100644 --- a/source4/rpc_server/drsuapi/updaterefs.c +++ b/source4/rpc_server/drsuapi/updaterefs.c @@ -22,9 +22,7 @@ #include "includes.h" #include "rpc_server/dcerpc_server.h" #include "dsdb/samdb/samdb.h" -#include "auth/auth.h" #include "rpc_server/drsuapi/dcesrv_drsuapi.h" -#include "libcli/security/security.h" struct repsTo { uint32_t count; diff --git a/source4/rpc_server/lsa/lsa_init.c b/source4/rpc_server/lsa/lsa_init.c index dd7d46b..8125746 100644 --- a/source4/rpc_server/lsa/lsa_init.c +++ b/source4/rpc_server/lsa/lsa_init.c @@ -21,7 +21,6 @@ */ #include "rpc_server/lsa/lsa.h" -#include "dsdb/samdb/samdb_proto.h" NTSTATUS dcesrv_lsa_get_policy_state(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct lsa_policy_state **_state) diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c index ea41689..ac760fd 100644 --- a/source4/rpc_server/service_rpc.c +++ b/source4/rpc_server/service_rpc.c @@ -27,9 +27,7 @@ #include "../lib/util/dlinklist.h" #include "rpc_server/dcerpc_server.h" #include "rpc_server/dcerpc_server_proto.h" -#include "smbd/service.h" #include "system/filesys.h" -#include "lib/socket/socket.h" #include "lib/messaging/irpc.h" #include "system/network.h" #include "lib/socket/netif.h" diff --git a/source4/rpc_server/srvsvc/srvsvc_ntvfs.c b/source4/rpc_server/srvsvc/srvsvc_ntvfs.c index 15bd749..7b33706 100644 --- a/source4/rpc_server/srvsvc/srvsvc_ntvfs.c +++ b/source4/rpc_server/srvsvc/srvsvc_ntvfs.c @@ -21,10 +21,6 @@ #include "includes.h" #include "ntvfs/ntvfs.h" #include "rpc_server/dcerpc_server.h" -#include "librpc/gen_ndr/ndr_srvsvc.h" -#include "rpc_server/common/common.h" -#include "rpc_server/srvsvc/proto.h" -#include "lib/socket/socket.h" #include "param/param.h" struct socket_address *srvsvc_get_my_addr(void *p, TALLOC_CTX *mem_ctx) diff --git a/source4/script/minimal_includes.pl b/source4/script/minimal_includes.pl index d64409e..990ff00 100755 --- a/source4/script/minimal_includes.pl +++ b/source4/script/minimal_includes.pl @@ -67,7 +67,10 @@ sub test_include($$$$) $lines->[$i] = ""; - `/bin/mv -f $fname $fname.misaved` && die "failed to rename $fname"; + my $mname = $fname . ".misaved"; + + unlink($mname); + rename($fname, $mname) || die "failed to rename $fname"; save_lines($fname, $lines); my $out = test_compile($fname); @@ -79,6 +82,7 @@ sub test_include($$$$) print "$fname: not removing system include $line\n"; } else { print "$fname: removing $line\n"; + unlink($mname); return; } } else { @@ -87,7 +91,7 @@ sub test_include($$$$) } $lines->[$i] = $line; - `/bin/mv -f $fname.misaved $fname` && die "failed to restore $fname"; + rename($mname, $fname) || die "failed to restore $fname"; } sub process_file($) diff --git a/source4/selftest/skip b/source4/selftest/skip index b9d9192..843181e 100644 --- a/source4/selftest/skip +++ b/source4/selftest/skip @@ -70,3 +70,4 @@ samba4.ldap.secdesc.python # this is expected to fail until the acl module is co trans2.scan # uses huge number of file descriptors base.scan.ioctl # bad idea in make test base.scan.pipe_number # bad idea in make test +base.secleak # no point on build farm diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c index e62b150..259896d 100644 --- a/source4/torture/auth/ntlmssp.c +++ b/source4/torture/auth/ntlmssp.c @@ -19,7 +19,6 @@ #include "includes.h" #include "auth/gensec/gensec.h" -#include "auth/gensec/gensec_proto.h" #include "auth/ntlmssp/ntlmssp.h" #include "lib/cmdline/popt_common.h" #include "torture/torture.h" diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c index 076120b..182478a 100644 --- a/source4/torture/auth/pac.c +++ b/source4/torture/auth/pac.c @@ -24,7 +24,6 @@ #include "system/kerberos.h" #include "auth/auth.h" #include "auth/kerberos/kerberos.h" -#include "librpc/gen_ndr/ndr_krb5pac.h" #include "samba3/samba3.h" #include "libcli/security/security.h" #include "torture/torture.h" diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c index 0309557..6d3447d 100644 --- a/source4/torture/basic/aliases.c +++ b/source4/torture/basic/aliases.c @@ -21,7 +21,6 @@ #include "../lib/util/dlinklist.h" #include "libcli/raw/libcliraw.h" #include "libcli/raw/raw_proto.h" -#include "torture/torture.h" #include "libcli/libcli.h" #include "torture/util.h" diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c index 07071bb..6c18e18 100644 --- a/source4/torture/basic/attr.c +++ b/source4/torture/basic/attr.c @@ -20,7 +20,6 @@ */ -- Samba Shared Repository