s3-tevent: only include ../lib/util/tevent wrappers where needed.
authorGünther Deschner <gd@samba.org>
Thu, 28 Apr 2011 15:38:09 +0000 (17:38 +0200)
committerGünther Deschner <gd@samba.org>
Fri, 29 Apr 2011 12:33:41 +0000 (14:33 +0200)
Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Apr 29 14:00:30 CEST 2011 on sn-devel-104
(cherry picked from commit 50883cfeb4eed3d538f71443060745f8747044c9)

44 files changed:
source3/include/includes.h
source3/lib/addrchange.c
source3/lib/fncall.c
source3/lib/tldap.c
source3/lib/util_sock.c
source3/lib/util_tsock.c
source3/libsmb/async_smb.c
source3/libsmb/cli_np_tstream.c
source3/libsmb/cliconnect.c
source3/libsmb/clidgram.c
source3/libsmb/clientgen.c
source3/libsmb/clifile.c
source3/libsmb/clifsinfo.c
source3/libsmb/clilist.c
source3/libsmb/climessage.c
source3/libsmb/clioplock.c
source3/libsmb/clirap.c
source3/libsmb/clireadwrite.c
source3/libsmb/clitrans.c
source3/libsmb/namequery.c
source3/libsmb/smbsock_connect.c
source3/libsmb/unexpected.c
source3/rpc_client/cli_pipe.c
source3/rpc_client/rpc_transport_np.c
source3/rpc_client/rpc_transport_tstream.c
source3/rpc_server/rpc_ncacn_np.c
source3/rpc_server/srv_pipe_hnd.c
source3/smbd/aio.c
source3/smbd/smb2_break.c
source3/smbd/smb2_create.c
source3/smbd/smb2_find.c
source3/smbd/smb2_flush.c
source3/smbd/smb2_getinfo.c
source3/smbd/smb2_ioctl.c
source3/smbd/smb2_lock.c
source3/smbd/smb2_notify.c
source3/smbd/smb2_read.c
source3/smbd/smb2_server.c
source3/smbd/smb2_setinfo.c
source3/smbd/smb2_write.c
source3/torture/nbench.c
source3/torture/torture.c
source3/winbindd/winbindd.h
source3/winbindd/winbindd_dual.c

index 0de129a861f69bffd48e91b707de438273e4dbbc..c5ce10a482c8108540d0a84e33d2ce74ea52d922 100644 (file)
@@ -520,8 +520,6 @@ typedef char fstring[FSTRING_LEN];
 #include <talloc.h>
 
 #include "event.h"
-#include "../lib/util/tevent_unix.h"
-#include "../lib/util/tevent_ntstatus.h"
 
 #include "../lib/util/data_blob.h"
 #include "../lib/util/time.h"
index bd4bfbaa460c30f3a532e5ed8a29c59b4ff35606..a5d204195352b6a986127a13a87117a1d5d08433 100644 (file)
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "lib/addrchange.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 #if HAVE_LINUX_RTNETLINK_H
 
index 91377e01488bf07fcfeab42d814471543cec7026..4a013e9ee60d64d6026c5c362a74974be813d000 100644 (file)
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "../lib/util/tevent_unix.h"
 
 #if WITH_PTHREADPOOL
 
index e365a43fe04cebb1b31eb34d78e5b9dd66cbf992..abef9ecf5e071f53f10532341a7b306a246c47ae 100644 (file)
@@ -21,6 +21,7 @@
 #include "tldap.h"
 #include "../lib/util/asn1.h"
 #include "../lib/tsocket/tsocket.h"
+#include "../lib/util/tevent_unix.h"
 
 static int tldap_simple_recv(struct tevent_req *req);
 
index 10b335bf01224cf2aa6f739a6158565670701357..31ea4627b1529180ed14a0a047575f36bd79ef0b 100644 (file)
@@ -25,6 +25,8 @@
 #include "../lib/async_req/async_sock.h"
 #include "../lib/util/select.h"
 #include "interfaces.h"
+#include "../lib/util/tevent_unix.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 /****************************************************************************
  Get a port number in host byte order from a sockaddr_storage.
index dce209286802dddef16d1e217ffbb0320206e686..35a97f5e692c4e59f860b12cdc15a0df6348370b 100644 (file)
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "../lib/tsocket/tsocket.h"
+#include "../lib/util/tevent_unix.h"
 
 struct tstream_read_packet_state {
        struct tevent_context *ev;
index 8af5aa10461cbf05d3979da5082d52c79f53f6d6..ea3ca2d3235709c9ca5ffffc1c39227fd94c3991 100644 (file)
@@ -19,6 +19,8 @@
 
 #include "includes.h"
 #include "../lib/async_req/async_sock.h"
+#include "../lib/util/tevent_ntstatus.h"
+#include "../lib/util/tevent_unix.h"
 #include "async_smb.h"
 #include "smb_crypt.h"
 #include "libsmb/nmblib.h"
index 1f9e5ffd36eb1066548dc6b73cbf0ed8dba93981..1c06760ff1481f31a790ccfdc487f8b9226c6b6a 100644 (file)
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/network.h"
 #include "../util/tevent_unix.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "../lib/tsocket/tsocket.h"
 #include "../lib/tsocket/tsocket_internal.h"
 #include "cli_np_tstream.h"
index 5abaa4f4ff3e02b86b5764ff934de9bc24b8d17c..6d1eaadeb065bcbe7d6c762b2fa944c274f122f5 100644 (file)
@@ -28,6 +28,7 @@
 #include "../libcli/auth/ntlmssp.h"
 #include "libads/kerberos_proto.h"
 #include "krb5_env.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "libsmb/nmblib.h"
 
index 92f381e87b4f1215c392b9ee0ddd0d221115a432..f133fe060787b607310e296c99c577cef14b6243 100644 (file)
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "libsmb/clidgram.h"
 #include "libsmb/nmblib.h"
 #include "messages.h"
index 39b0f6ec7418fe2e4c24a53dc2b497ee46ec7818..a4dff411610cd6167da3d39571598d91d5dfc204 100644 (file)
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "smb_signing.h"
 #include "async_smb.h"
 
index e1b44fd29995fa286ad0c12420abf050df210647..6f1346e8779e68f828e04d310549bd1f8a0f065f 100644 (file)
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"
 #include "trans2.h"
index ebd04e6d2b672effa59767527e43a6616d01427d..4b3383a1d2488b35bf70c38485e78f0fab966661 100644 (file)
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "../libcli/auth/spnego.h"
 #include "../libcli/auth/ntlmssp.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "smb_crypt.h"
 #include "trans2.h"
index 552de0024283744a05fa04efb94e9d72200b7a77..1017eb54bd81322c28ecba59fe2b3a4613d1d8c5 100644 (file)
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "trans2.h"
 
index 4c730c4b76e9127e1a13e504c0f45edaa40f38a9..c1542ee22ce443fb2adc936218140d22169bbda7 100644 (file)
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 
 struct cli_message_start_state {
index 78e93a4f3168a1574cca650f71c5024dda5e31a1..aed489f6f382b6c686551e1ebb1bca30d8353bbf 100644 (file)
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 
 /****************************************************************************
index e79a6944eba1bb0aa921386eed6c1f213168796d..c6f7fe9c0d98489e3aa6b0bbff68a9a01327e824 100644 (file)
@@ -23,6 +23,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/rap.h"
 #include "../lib/crypto/arcfour.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "libsmb/clirap.h"
 #include "trans2.h"
index d36b2808435ed39553247f6a22eb729d0e939a4c..ff3dcff773e50052186994151730b4feaa9aff71 100644 (file)
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "trans2.h"
 
index 42632f394f8f999be11c7fcac5d54b63089df58d..7bc4a75fe3ee33667811f8314f43d51ec56997be 100644 (file)
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 
 struct trans_recvblob {
index 752b4b1eb9f117bc23211c2c1758dc96cb48b06f..0d61720f99b8ab51d135fa16f1866fcd0e8f7676 100644 (file)
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "libads/sitename_cache.h"
 #include "libads/dns.h"
 #include "../libcli/netlogon/netlogon.h"
index 9dc2f68934312e8f2ef3e71cc17a31d1c3a007ca..aa980999405deb56af25695934a5d5a4a496d922 100644 (file)
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "../lib/async_req/async_sock.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "libsmb/nmblib.h"
 
index c5ad9ecb595282841e32f5291897b4c12b1504be..1b1d8cb12928833ae8a20fa1d531050fb0d0bccb 100644 (file)
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "lib/async_req/async_sock.h"
 #include "libsmb/nmblib.h"
 
index e7e4e76067128f5c7e35552a9cad09cffe3631f5..8e155f831b90468a0acdc4b97009b713861b4bdf 100644 (file)
@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "librpc/gen_ndr/ndr_epmapper_c.h"
 #include "../librpc/gen_ndr/ndr_schannel.h"
 #include "../librpc/gen_ndr/ndr_dssetup.h"
index 2be01621448142da49a2569d2ce00be4bb972ab4..c66d4b80227a4133053752eaece6f4ea760d7f86 100644 (file)
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "rpc_client/rpc_transport.h"
 #include "libsmb/cli_np_tstream.h"
 
index 248b09f04912b2db942feda2130e6c9cf3fa61db..e62ab4b2bb3c89c707c6d55542b66a19a3cb4663 100644 (file)
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "rpc_client/rpc_transport.h"
 #include "lib/tsocket/tsocket.h"
 #include "libsmb/cli_np_tstream.h"
index 912d05bacd5f88ee5a0cd7c398c159cc133778a7..30ddb958a1b3d688c2c8cc9f7817dfbc13f8a6ee 100644 (file)
@@ -32,6 +32,7 @@
 #include "auth.h"
 #include "ntdomain.h"
 #include "../lib/tsocket/tsocket.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
index 11689672d6a920260fefe16e8c566dbbd7391712..6aa9bf8dc2a0f8eb0ef7bfabd0edd09262268a31 100644 (file)
@@ -30,6 +30,7 @@
 #include "rpc_server/rpc_ncacn_np.h"
 #include "ntdomain.h"
 #include "../lib/tsocket/tsocket.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
index 682d042806aed3c192f037dffd4b547de832f09c..0cb94acece851857d5c0688581ef3791405f21b9 100644 (file)
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 #if defined(WITH_AIO)
 
index 925384c3bfead0b1f5d398a95b6cc345c7be11ca..5d5ab4139d90023073c10bad881a3c09d352af47 100644 (file)
@@ -23,6 +23,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 static struct tevent_req *smbd_smb2_oplock_break_send(TALLOC_CTX *mem_ctx,
                                                      struct tevent_context *ev,
index dabe638145303737eed03710a5105bd28d4fd696..3478f347f57804e19b8ebc64c40e7ce4f7b6da1a 100644 (file)
@@ -25,6 +25,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 int map_smb2_oplock_levels_to_samba(uint8_t in_oplock_level)
 {
index 2fd7720d58d1aa6be3fd9d0fc6b95a98b2aaaa2d..786a79ca1feff0d5e666ffdca379d278dfc5e400 100644 (file)
@@ -23,6 +23,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "trans2.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
                                              struct tevent_context *ev,
index 939559290770572f9d488916daf3561be7df73cc..c3f5a301290d24348d1cb2f390a7b3f32a03e7a2 100644 (file)
@@ -22,6 +22,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 static struct tevent_req *smbd_smb2_flush_send(TALLOC_CTX *mem_ctx,
                                               struct tevent_context *ev,
index 1d6b862d6ae8596f4010de8c48c40d2bbf6ee9c1..3c8c690342e260ac4f901453ed4f1efe94283846 100644 (file)
@@ -24,6 +24,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "trans2.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
                                                 struct tevent_context *ev,
index e7584d7daa3527cf6518231b50103123272500b2..baf0967c25ca29bf24829422e0253550b8902454 100644 (file)
@@ -22,6 +22,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 static struct tevent_req *smbd_smb2_ioctl_send(TALLOC_CTX *mem_ctx,
                                               struct tevent_context *ev,
index dcf1e0c6a5331c3a7e6c6a9082b6e8ec5f8e3293..fce3c7c8979ffe67288ededd6546e01d21ad08b5 100644 (file)
@@ -23,6 +23,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "messages.h"
 
 struct smbd_smb2_lock_element {
index d52b2878ecaf50c8bae73eeb5726c1d28b6d3e11..9e377ceda427eb800d79af5a59913638cdf32fc7 100644 (file)
@@ -23,6 +23,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 struct smbd_smb2_notify_state {
        struct smbd_smb2_request *smb2req;
index bffda890106be566bf5bc00a18a709387e7f8995..b21ce544d025c7c5349e394dd6e6498261841417 100644 (file)
@@ -24,6 +24,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "libcli/security/security.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
                                              struct tevent_context *ev,
index 0004e7ca8caf781cc831f491979a258f26ce4a99..ae15bd1a34fe715ce23ba3338122f82bf030c104 100644 (file)
@@ -24,6 +24,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../lib/tsocket/tsocket.h"
+#include "../lib/util/tevent_ntstatus.h"
 #include "smbprofile.h"
 
 #define OUTVEC_ALLOC_SIZE (SMB2_HDR_BODY + 9)
index 39b7aee76b5f0b280648b900fb083e8f91ddb11f..e1149408d194515359af54d80e71f96311dcf6c9 100644 (file)
@@ -24,6 +24,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "trans2.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
                                                 struct tevent_context *ev,
index 413fe0c7d179a0f3c91addc3b0ea9aac47fcf3c3..0501b50245024d42d66dd5ee5544ed73f9a88175 100644 (file)
@@ -22,6 +22,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
                                               struct tevent_context *ev,
index 182f6f7cd91b1c424e26e1a466dd51729965cf3f..beab9167e7a2aa037a7db5b85b1e614a0b253c7d 100644 (file)
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "torture/proto.h"
 #include "libsmb/clirap.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 static long long int ival(const char *str)
 {
index 216eef46b12b3ada7d360f70bb6d9ae0b6d80c4a..4cafce75d945a169326d89ef3d49bbd0c20d2760 100644 (file)
@@ -34,6 +34,7 @@
 #include "libsmb/clirap.h"
 #include "trans2.h"
 #include "libsmb/nmblib.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 extern char *optarg;
 extern int optind;
index 4f0f624d5be123c04101e1640d65f7d28e297fd6..3f1c7f558e2eb9e41bd61834410c1c0fee137922 100644 (file)
@@ -30,6 +30,8 @@
 #include "talloc_dict.h"
 #include "smb_ldap.h"
 
+#include "../lib/util/tevent_ntstatus.h"
+
 #ifdef HAVE_LIBNSCD
 #include <libnscd.h>
 #endif
index 0a1534cae1af7b0193238ad3c05ed18215f34e37..04ef3d80515e60664d9c6767c77dbbe182a8ee94 100644 (file)
@@ -36,6 +36,7 @@
 #include "system/select.h"
 #include "messages.h"
 #include "ntdomain.h"
+#include "../lib/util/tevent_unix.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND