s4: ran minimal_includes.pl on source4/winbind

diff --git a/source4/winbind/idmap.c b/source4/winbind/idmap.c
index d0efbb159b7f9673cae4e061af51131ee38052d7..2ef6c939708e381ffd1864b4a08e6e637ae2c703 100644 (file)
--- 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 a50a0fe4737f70f4ba2a84f994cc233dcf3269b1..9f851586465d7ce5f0b0c8740fb5822ba22446f0 100644 (file)
--- 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 010fa220b1838742320fcd7e04ed15bc8aec11be..93e01c8cf434892b70a305c974d6360f50078150 100644 (file)
--- 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 0e498811f9f8c89fbc1413f58add399544603274..70732093061bafdb93b97aa6684fc9c2138dedde 100644 (file)
--- 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 980a8a4d92d3c6af44d8bf960882423e2c3813d1..45b966377adf1882c49e0a351d0d8dc0077d5cab 100644 (file)
--- 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 be43684f827b889934d9d69ad2071ac7a46d4c7a..a82387bd636c4352f011e02e73986b401984faad 100644 (file)
--- 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 488af561e2fa0da975e8998fb338b9f785b64fe1..f5e7f6b4b154c9f3c16aa2ed53dd42aad63fb6c5 100644 (file)
--- 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 04a4fc39df489c863923fcd049f47def3fe8c394..afb96b46fadc7d75b69c51e8ec5e79f38888a1f1 100644 (file)
--- 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 755d45786b5ffac3b5b020f2fb047689e939cb75..ac44794acd7e84fe1c5a94c79cf92ee62c0dc6b9 100644 (file)
--- 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 9839e2cd8083051562a41871fc4c8cec8e633cf9..5178187ea8bfb9efca0b605ea66f5cec2504005a 100644 (file)
--- 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 50ab2fdff61f4548f609fd35f38be6aa5a00dde0..7fb1889be52fa5b21fe7607ff07f939cca992b4d 100644 (file)
--- 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 a728f8abe4545116ed99ff3ac950a4f8fe750872..1b9baecc3678efb7f9a237455a3a2b08c6f7a83d 100644 (file)
--- 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 efd715b1648d643be54b413e998139505a524296..f8512cec048af7d75e7b3251cd499f5ee094e1c6 100644 (file)
--- 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 4fcbf3a6e535a3476e4b8fa05c239b1b865f4750..bce8bfbe55255f97e64bc86878961cf4ef8eb516 100644 (file)
--- 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 c3bc754f69585e472dfee00ca3a199bafca53c45..5730acda40b8805a6bd862cac3fb9458acd54df2 100644 (file)
--- 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 7fb77bfc353d44f014ba269d97f86e062a5de85f..e569ceaca506781047524082c467d2d568ff5494 100644 (file)
--- 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 1f560c17ce391ba268b3270e681d09df7dd0fc6a..ae3666ff0a5d7772d41235a80153383b8f2b1d4d 100644 (file)
--- 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 efbc310b68180d6f50665c15ecec42d1f3e2baa4..bfb31e66a76d11ae3474234a2833fdcf16335c84 100644 (file)
--- 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 e19703b1e59245eadeb60899ce6dd9b6b482b9d3..9da3d43ebcf90587e5603670d32187183bfc91f1 100644 (file)
--- 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 0a9c37911bf423c13b1b182297258fd2d0d8bac0..7b1aa98266830f58749b950dab94dcabf29e0ba4 100644 (file)
--- 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 fa3d6032c8482a563ae2f975933e309da79e95e7..c924b0e4cd2351345fbf7ab7a8cb25fdf9f2ed4a 100644 (file)
--- 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 c5fba92f147d7b3bdd72781dfc4da081252045cc..3945815ae6676b95720e319d476964dcbabebb24 100644 (file)
--- 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 d3142ff52a5880843e052594002c56dc6ae41fd1..3265aa90f0c16586efc6e1192f9b25630ddf4717 100644 (file)
--- 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 92b91c182fd56a798389f8d50edb7de6ded71871..4791495e7f3ab302eb2cfe88b210b0ff668699d3 100644 (file)
--- 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 cb9fa3ada28d189158718a027c952ec6c7eda084..bdbfc3eceb1423ad2fce4c0dde6aba9f0700c3c2 100644 (file)
--- 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 282d10c9c9166c98c9bd3b79438657ce2397e90b..eb4d6b0d21b74a5fbe00d9ef859a88b81f9c7356 100644 (file)
--- 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 151f39906bcdcfe9ba763f3db23cb037f7808f1d..ee5b09c7fa660434778d8831105bbe4fb2b5d5e4 100644 (file)
--- 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 d31ac08cf7eb764840a1d6e277a4423320d75724..51fa2212ee70a43985b4296eb8858216756a373a 100644 (file)
--- 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 d626f58eb68bf17d99782a665eaee4f4d282375e..4c3feb735d02cb2421929f979eeef860d6f6006c 100644 (file)
--- 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 dfad51943b91fdab9fc8bbbe419ff66b1545d576..7cb57929cb10d20815d8eea8d5788d339be83bf7 100644 (file)
--- 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;