From 7f1832c4693f623266d8191698555e0ae9c8d7d1 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 20 Oct 2009 15:01:46 +1100 Subject: s4: ran minimal_includes.pl on source4/winbind --- 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 --- 30 files changed, 84 deletions(-) (limited to 'source4/winbind') diff --git a/source4/winbind/idmap.c b/source4/winbind/idmap.c index d0efbb159b..2ef6c93970 100644 --- a/source4/winbind/idmap.c +++ b/source4/winbind/idmap.c @@ -21,11 +21,8 @@ #include "includes.h" #include "auth/auth.h" -#include "librpc/gen_ndr/lsa.h" -#include "librpc/gen_ndr/samr.h" #include "librpc/gen_ndr/ndr_security.h" #include "lib/ldb/include/ldb.h" -#include "lib/ldb/include/ldb_errors.h" #include "lib/ldb_wrap.h" #include "param/param.h" #include "winbind/idmap.h" diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c index a50a0fe473..9f85158646 100644 --- a/source4/winbind/wb_async_helpers.c +++ b/source4/winbind/wb_async_helpers.c @@ -24,16 +24,10 @@ #include "libcli/composite/composite.h" #include "winbind/wb_async_helpers.h" -#include "lib/messaging/irpc.h" -#include "librpc/gen_ndr/irpc.h" -#include "auth/credentials/credentials.h" #include "libcli/security/security.h" -#include "libcli/auth/libcli_auth.h" -#include "librpc/gen_ndr/ndr_netlogon_c.h" #include "librpc/gen_ndr/ndr_lsa_c.h" #include "librpc/gen_ndr/ndr_samr_c.h" -#include "winbind/wb_helper.h" struct lsa_lookupsids_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_cmd_getgrgid.c b/source4/winbind/wb_cmd_getgrgid.c index 010fa220b1..93e01c8cf4 100644 --- a/source4/winbind/wb_cmd_getgrgid.c +++ b/source4/winbind/wb_cmd_getgrgid.c @@ -22,13 +22,7 @@ #include "includes.h" #include "libcli/composite/composite.h" #include "winbind/wb_server.h" -#include "winbind/wb_async_helpers.h" -#include "winbind/wb_helper.h" #include "smbd/service_task.h" -#include "libnet/libnet_proto.h" -#include "param/param.h" -#include "libcli/security/security.h" -#include "auth/credentials/credentials.h" struct cmd_getgrgid_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_cmd_getgrnam.c b/source4/winbind/wb_cmd_getgrnam.c index 0e498811f9..7073209306 100644 --- a/source4/winbind/wb_cmd_getgrnam.c +++ b/source4/winbind/wb_cmd_getgrnam.c @@ -22,12 +22,8 @@ #include "includes.h" #include "libcli/composite/composite.h" #include "winbind/wb_server.h" -#include "winbind/wb_async_helpers.h" -#include "param/param.h" #include "winbind/wb_helper.h" #include "smbd/service_task.h" -#include "libnet/libnet_proto.h" -#include "libcli/security/security.h" struct cmd_getgrnam_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_cmd_getpwent.c b/source4/winbind/wb_cmd_getpwent.c index 980a8a4d92..45b966377a 100644 --- a/source4/winbind/wb_cmd_getpwent.c +++ b/source4/winbind/wb_cmd_getpwent.c @@ -22,10 +22,7 @@ #include "includes.h" #include "libcli/composite/composite.h" #include "winbind/wb_server.h" -#include "winbind/wb_async_helpers.h" -#include "winbind/wb_helper.h" #include "smbd/service_task.h" -#include "libnet/libnet_proto.h" struct cmd_getpwent_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_cmd_getpwnam.c b/source4/winbind/wb_cmd_getpwnam.c index be43684f82..a82387bd63 100644 --- a/source4/winbind/wb_cmd_getpwnam.c +++ b/source4/winbind/wb_cmd_getpwnam.c @@ -22,11 +22,9 @@ #include "includes.h" #include "libcli/composite/composite.h" #include "winbind/wb_server.h" -#include "winbind/wb_async_helpers.h" #include "param/param.h" #include "winbind/wb_helper.h" #include "smbd/service_task.h" -#include "libnet/libnet_proto.h" #include "libcli/security/security.h" struct cmd_getpwnam_state { diff --git a/source4/winbind/wb_cmd_getpwuid.c b/source4/winbind/wb_cmd_getpwuid.c index 488af561e2..f5e7f6b4b1 100644 --- a/source4/winbind/wb_cmd_getpwuid.c +++ b/source4/winbind/wb_cmd_getpwuid.c @@ -22,13 +22,8 @@ #include "includes.h" #include "libcli/composite/composite.h" #include "winbind/wb_server.h" -#include "winbind/wb_async_helpers.h" -#include "winbind/wb_helper.h" #include "smbd/service_task.h" -#include "libnet/libnet_proto.h" #include "param/param.h" -#include "libcli/security/security.h" -#include "auth/credentials/credentials.h" struct cmd_getpwuid_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_cmd_list_groups.c b/source4/winbind/wb_cmd_list_groups.c index 04a4fc39df..afb96b46fa 100644 --- a/source4/winbind/wb_cmd_list_groups.c +++ b/source4/winbind/wb_cmd_list_groups.c @@ -22,10 +22,7 @@ #include "includes.h" #include "libcli/composite/composite.h" #include "winbind/wb_server.h" -#include "winbind/wb_async_helpers.h" -#include "winbind/wb_helper.h" #include "smbd/service_task.h" -#include "libnet/libnet_proto.h" struct cmd_list_groups_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_cmd_list_users.c b/source4/winbind/wb_cmd_list_users.c index 755d45786b..ac44794acd 100644 --- a/source4/winbind/wb_cmd_list_users.c +++ b/source4/winbind/wb_cmd_list_users.c @@ -22,10 +22,7 @@ #include "includes.h" #include "libcli/composite/composite.h" #include "winbind/wb_server.h" -#include "winbind/wb_async_helpers.h" -#include "winbind/wb_helper.h" #include "smbd/service_task.h" -#include "libnet/libnet_proto.h" struct cmd_list_users_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_cmd_lookupname.c b/source4/winbind/wb_cmd_lookupname.c index 9839e2cd80..5178187ea8 100644 --- a/source4/winbind/wb_cmd_lookupname.c +++ b/source4/winbind/wb_cmd_lookupname.c @@ -22,7 +22,6 @@ #include "includes.h" #include "libcli/composite/composite.h" #include "winbind/wb_server.h" -#include "winbind/wb_async_helpers.h" #include "winbind/wb_helper.h" #include "smbd/service_task.h" diff --git a/source4/winbind/wb_cmd_setpwent.c b/source4/winbind/wb_cmd_setpwent.c index 50ab2fdff6..7fb1889be5 100644 --- a/source4/winbind/wb_cmd_setpwent.c +++ b/source4/winbind/wb_cmd_setpwent.c @@ -22,10 +22,7 @@ #include "includes.h" #include "libcli/composite/composite.h" #include "winbind/wb_server.h" -#include "winbind/wb_async_helpers.h" -#include "winbind/wb_helper.h" #include "smbd/service_task.h" -#include "libnet/libnet_proto.h" struct cmd_setpwent_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_connect_lsa.c b/source4/winbind/wb_connect_lsa.c index a728f8abe4..1b9baecc36 100644 --- a/source4/winbind/wb_connect_lsa.c +++ b/source4/winbind/wb_connect_lsa.c @@ -24,7 +24,6 @@ #include "includes.h" #include "libcli/composite/composite.h" -#include "libcli/raw/libcliraw.h" #include "librpc/gen_ndr/ndr_lsa_c.h" #include "winbind/wb_server.h" diff --git a/source4/winbind/wb_connect_sam.c b/source4/winbind/wb_connect_sam.c index efd715b164..f8512cec04 100644 --- a/source4/winbind/wb_connect_sam.c +++ b/source4/winbind/wb_connect_sam.c @@ -23,7 +23,6 @@ #include "includes.h" #include "libcli/composite/composite.h" -#include "libcli/raw/libcliraw.h" #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_samr_c.h" #include "winbind/wb_server.h" diff --git a/source4/winbind/wb_dom_info.c b/source4/winbind/wb_dom_info.c index 4fcbf3a6e5..bce8bfbe55 100644 --- a/source4/winbind/wb_dom_info.c +++ b/source4/winbind/wb_dom_info.c @@ -26,9 +26,6 @@ #include "libcli/security/security.h" #include "winbind/wb_server.h" #include "smbd/service_task.h" -#include "librpc/gen_ndr/ndr_irpc.h" -#include "librpc/gen_ndr/samr.h" -#include "lib/messaging/irpc.h" #include "libcli/finddcs.h" #include "param/param.h" diff --git a/source4/winbind/wb_dom_info_trusted.c b/source4/winbind/wb_dom_info_trusted.c index c3bc754f69..5730acda40 100644 --- a/source4/winbind/wb_dom_info_trusted.c +++ b/source4/winbind/wb_dom_info_trusted.c @@ -27,7 +27,6 @@ #include "smbd/service_task.h" #include "librpc/gen_ndr/ndr_netlogon_c.h" #include "libcli/libcli.h" -#include "param/param.h" struct trusted_dom_info_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_gid2sid.c b/source4/winbind/wb_gid2sid.c index 7fb77bfc35..e569ceaca5 100644 --- a/source4/winbind/wb_gid2sid.c +++ b/source4/winbind/wb_gid2sid.c @@ -23,9 +23,6 @@ #include "libcli/composite/composite.h" #include "winbind/wb_server.h" #include "smbd/service_task.h" -#include "winbind/wb_helper.h" -#include "libcli/security/security.h" -#include "winbind/idmap.h" struct gid2sid_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c index 1f560c17ce..ae3666ff0a 100644 --- a/source4/winbind/wb_init_domain.c +++ b/source4/winbind/wb_init_domain.c @@ -22,20 +22,15 @@ #include "includes.h" #include "libcli/composite/composite.h" -#include "libcli/smb_composite/smb_composite.h" #include "winbind/wb_server.h" -#include "winbind/wb_async_helpers.h" -#include "winbind/wb_helper.h" #include "smbd/service_task.h" #include "librpc/gen_ndr/ndr_netlogon.h" #include "librpc/gen_ndr/ndr_lsa_c.h" #include "librpc/gen_ndr/ndr_samr_c.h" #include "libcli/libcli.h" -#include "libcli/auth/credentials.h" #include "libcli/security/security.h" -#include "libcli/ldap/ldap_client.h" #include "auth/credentials/credentials.h" #include "param/param.h" diff --git a/source4/winbind/wb_irpc.c b/source4/winbind/wb_irpc.c index efbc310b68..bfb31e66a7 100644 --- a/source4/winbind/wb_irpc.c +++ b/source4/winbind/wb_irpc.c @@ -22,7 +22,6 @@ #include "winbind/wb_server.h" #include "lib/messaging/irpc.h" #include "libcli/composite/composite.h" -#include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_winbind.h" #include "smbd/service_task.h" diff --git a/source4/winbind/wb_name2domain.c b/source4/winbind/wb_name2domain.c index e19703b1e5..9da3d43ebc 100644 --- a/source4/winbind/wb_name2domain.c +++ b/source4/winbind/wb_name2domain.c @@ -24,7 +24,6 @@ #include "winbind/wb_server.h" #include "smbd/service_task.h" #include "winbind/wb_helper.h" -#include "param/param.h" struct name2domain_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_pam_auth.c b/source4/winbind/wb_pam_auth.c index 0a9c37911b..7b1aa98266 100644 --- a/source4/winbind/wb_pam_auth.c +++ b/source4/winbind/wb_pam_auth.c @@ -27,8 +27,6 @@ #include "auth/credentials/credentials.h" #include "libcli/auth/libcli_auth.h" #include "librpc/gen_ndr/ndr_netlogon.h" -#include "librpc/gen_ndr/ndr_netlogon_c.h" -#include "librpc/gen_ndr/winbind.h" #include "param/param.h" /* Oh, there is so much to keep an eye on when authenticating a user. Oh my! */ diff --git a/source4/winbind/wb_sam_logon.c b/source4/winbind/wb_sam_logon.c index fa3d6032c8..c924b0e4cd 100644 --- a/source4/winbind/wb_sam_logon.c +++ b/source4/winbind/wb_sam_logon.c @@ -27,9 +27,7 @@ #include "smbd/service_task.h" #include "auth/credentials/credentials.h" #include "libcli/auth/libcli_auth.h" -#include "librpc/gen_ndr/ndr_netlogon.h" #include "librpc/gen_ndr/ndr_netlogon_c.h" -#include "librpc/gen_ndr/winbind.h" struct wb_sam_logon_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c index c5fba92f14..3945815ae6 100644 --- a/source4/winbind/wb_samba3_cmd.c +++ b/source4/winbind/wb_samba3_cmd.c @@ -23,12 +23,10 @@ #include "includes.h" #include "winbind/wb_server.h" -#include "winbind/wb_async_helpers.h" #include "param/param.h" #include "winbind/wb_helper.h" #include "libcli/composite/composite.h" #include "version.h" -#include "librpc/gen_ndr/netlogon.h" #include "librpc/gen_ndr/ndr_netlogon.h" #include "libcli/security/security.h" #include "auth/ntlm/pam_errors.h" diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c index d3142ff52a..3265aa90f0 100644 --- a/source4/winbind/wb_server.c +++ b/source4/winbind/wb_server.c @@ -20,17 +20,9 @@ */ #include "includes.h" -#include "lib/socket/socket.h" -#include "../lib/util/dlinklist.h" -#include "lib/events/events.h" -#include "smbd/service_task.h" #include "smbd/process_model.h" -#include "smbd/service_stream.h" -#include "nsswitch/winbind_nss_config.h" #include "winbind/wb_server.h" #include "lib/stream/packet.h" -#include "smbd/service.h" -#include "param/secrets.h" #include "param/param.h" void wbsrv_terminate_connection(struct wbsrv_connection *wbconn, const char *reason) diff --git a/source4/winbind/wb_setup_domains.c b/source4/winbind/wb_setup_domains.c index 92b91c182f..4791495e7f 100644 --- a/source4/winbind/wb_setup_domains.c +++ b/source4/winbind/wb_setup_domains.c @@ -20,7 +20,6 @@ #include "includes.h" #include "winbind/wb_server.h" #include "smbd/service_task.h" -#include "auth/credentials/credentials.h" #include "param/secrets.h" #include "param/param.h" diff --git a/source4/winbind/wb_sid2domain.c b/source4/winbind/wb_sid2domain.c index cb9fa3ada2..bdbfc3eceb 100644 --- a/source4/winbind/wb_sid2domain.c +++ b/source4/winbind/wb_sid2domain.c @@ -23,7 +23,6 @@ #include "libcli/composite/composite.h" #include "winbind/wb_server.h" #include "smbd/service_task.h" -#include "winbind/wb_async_helpers.h" #include "libcli/security/security.h" #include "../lib/util/dlinklist.h" #include "param/param.h" diff --git a/source4/winbind/wb_sid2gid.c b/source4/winbind/wb_sid2gid.c index 282d10c9c9..eb4d6b0d21 100644 --- a/source4/winbind/wb_sid2gid.c +++ b/source4/winbind/wb_sid2gid.c @@ -23,9 +23,7 @@ #include "libcli/composite/composite.h" #include "winbind/wb_server.h" #include "smbd/service_task.h" -#include "winbind/wb_helper.h" #include "libcli/security/security.h" -#include "winbind/idmap.h" struct sid2gid_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_sid2uid.c b/source4/winbind/wb_sid2uid.c index 151f39906b..ee5b09c7fa 100644 --- a/source4/winbind/wb_sid2uid.c +++ b/source4/winbind/wb_sid2uid.c @@ -23,9 +23,7 @@ #include "libcli/composite/composite.h" #include "winbind/wb_server.h" #include "smbd/service_task.h" -#include "winbind/wb_helper.h" #include "libcli/security/security.h" -#include "winbind/idmap.h" struct sid2uid_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_sids2xids.c b/source4/winbind/wb_sids2xids.c index d31ac08cf7..51fa2212ee 100644 --- a/source4/winbind/wb_sids2xids.c +++ b/source4/winbind/wb_sids2xids.c @@ -23,9 +23,6 @@ #include "libcli/composite/composite.h" #include "winbind/wb_server.h" #include "smbd/service_task.h" -#include "winbind/wb_helper.h" -#include "libcli/security/security.h" -#include "winbind/idmap.h" struct sids2xids_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_uid2sid.c b/source4/winbind/wb_uid2sid.c index d626f58eb6..4c3feb735d 100644 --- a/source4/winbind/wb_uid2sid.c +++ b/source4/winbind/wb_uid2sid.c @@ -23,9 +23,6 @@ #include "libcli/composite/composite.h" #include "winbind/wb_server.h" #include "smbd/service_task.h" -#include "winbind/wb_helper.h" -#include "libcli/security/security.h" -#include "winbind/idmap.h" struct uid2sid_state { struct composite_context *ctx; diff --git a/source4/winbind/wb_xids2sids.c b/source4/winbind/wb_xids2sids.c index dfad51943b..7cb57929cb 100644 --- a/source4/winbind/wb_xids2sids.c +++ b/source4/winbind/wb_xids2sids.c @@ -23,9 +23,6 @@ #include "libcli/composite/composite.h" #include "winbind/wb_server.h" #include "smbd/service_task.h" -#include "winbind/wb_helper.h" -#include "libcli/security/security.h" -#include "winbind/idmap.h" struct xids2sids_state { struct composite_context *ctx; -- cgit