diff options
44 files changed, 46 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 6c1e0b4d4e..f4cac1a88f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -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" diff --git a/source3/lib/addrchange.c b/source3/lib/addrchange.c index bd4bfbaa46..a5d2041953 100644 --- a/source3/lib/addrchange.c +++ b/source3/lib/addrchange.c @@ -18,6 +18,7 @@ #include "includes.h" #include "lib/addrchange.h" +#include "../lib/util/tevent_ntstatus.h" #if HAVE_LINUX_RTNETLINK_H diff --git a/source3/lib/fncall.c b/source3/lib/fncall.c index 91377e0148..4a013e9ee6 100644 --- a/source3/lib/fncall.c +++ b/source3/lib/fncall.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "../lib/util/tevent_unix.h" #if WITH_PTHREADPOOL diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c index b5be3a8e24..ba27028649 100644 --- a/source3/lib/tldap.c +++ b/source3/lib/tldap.c @@ -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); diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index eb74b75960..daf91fef03 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -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. diff --git a/source3/lib/util_tsock.c b/source3/lib/util_tsock.c index dce2092868..35a97f5e69 100644 --- a/source3/lib/util_tsock.c +++ b/source3/lib/util_tsock.c @@ -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; diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c index 8af5aa1046..ea3ca2d323 100644 --- a/source3/libsmb/async_smb.c +++ b/source3/libsmb/async_smb.c @@ -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" diff --git a/source3/libsmb/cli_np_tstream.c b/source3/libsmb/cli_np_tstream.c index 1f9e5ffd36..1c06760ff1 100644 --- a/source3/libsmb/cli_np_tstream.c +++ b/source3/libsmb/cli_np_tstream.c @@ -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" diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 5abaa4f4ff..6d1eaadeb0 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -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" diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c index 92f381e87b..f133fe0607 100644 --- a/source3/libsmb/clidgram.c +++ b/source3/libsmb/clidgram.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "../lib/util/tevent_ntstatus.h" #include "libsmb/clidgram.h" #include "libsmb/nmblib.h" #include "messages.h" diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index cec645b4a6..4e1c827368 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "../lib/util/tevent_ntstatus.h" #include "smb_signing.h" #include "async_smb.h" diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index c86355237e..cde2466175 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -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" diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c index ebd04e6d2b..4b3383a1d2 100644 --- a/source3/libsmb/clifsinfo.c +++ b/source3/libsmb/clifsinfo.c @@ -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" diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index 552de00242..1017eb54bd 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "../lib/util/tevent_ntstatus.h" #include "async_smb.h" #include "trans2.h" diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c index 2c2921aa0c..75659d7cc4 100644 --- a/source3/libsmb/climessage.c +++ b/source3/libsmb/climessage.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "../lib/util/tevent_ntstatus.h" #include "async_smb.h" struct cli_message_start_state { diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c index 78e93a4f31..aed489f6f3 100644 --- a/source3/libsmb/clioplock.c +++ b/source3/libsmb/clioplock.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "../lib/util/tevent_ntstatus.h" #include "async_smb.h" /**************************************************************************** diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index 8d1be2d66e..36a8e3a559 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -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" diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c index d36b280843..ff3dcff773 100644 --- a/source3/libsmb/clireadwrite.c +++ b/source3/libsmb/clireadwrite.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "../lib/util/tevent_ntstatus.h" #include "async_smb.h" #include "trans2.h" diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c index dab8c10c84..995f2c0505 100644 --- a/source3/libsmb/clitrans.c +++ b/source3/libsmb/clitrans.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "../lib/util/tevent_ntstatus.h" #include "async_smb.h" struct trans_recvblob { diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index 16669c0532..61814f490c 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -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" diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c index 9dc2f68934..aa98099940 100644 --- a/source3/libsmb/smbsock_connect.c +++ b/source3/libsmb/smbsock_connect.c @@ -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" diff --git a/source3/libsmb/unexpected.c b/source3/libsmb/unexpected.c index c5ad9ecb59..1b1d8cb129 100644 --- a/source3/libsmb/unexpected.c +++ b/source3/libsmb/unexpected.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "../lib/util/tevent_ntstatus.h" #include "lib/async_req/async_sock.h" #include "libsmb/nmblib.h" diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 55cc5f8b34..758f778656 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -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" diff --git a/source3/rpc_client/rpc_transport_np.c b/source3/rpc_client/rpc_transport_np.c index 2be0162144..c66d4b8022 100644 --- a/source3/rpc_client/rpc_transport_np.c +++ b/source3/rpc_client/rpc_transport_np.c @@ -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" diff --git a/source3/rpc_client/rpc_transport_tstream.c b/source3/rpc_client/rpc_transport_tstream.c index 248b09f049..e62ab4b2bb 100644 --- a/source3/rpc_client/rpc_transport_tstream.c +++ b/source3/rpc_client/rpc_transport_tstream.c @@ -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" diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c index bd75178857..2e99da72ed 100644 --- a/source3/rpc_server/rpc_ncacn_np.c +++ b/source3/rpc_server/rpc_ncacn_np.c @@ -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 diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c index 11689672d6..6aa9bf8dc2 100644 --- a/source3/rpc_server/srv_pipe_hnd.c +++ b/source3/rpc_server/srv_pipe_hnd.c @@ -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 diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c index 682d042806..0cb94acece 100644 --- a/source3/smbd/aio.c +++ b/source3/smbd/aio.c @@ -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) diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c index 925384c3bf..5d5ab4139d 100644 --- a/source3/smbd/smb2_break.c +++ b/source3/smbd/smb2_break.c @@ -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, diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index 6e292468f9..73b8ade5bd 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -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) { diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c index eeb1f45e51..9fc8f1fef2 100644 --- a/source3/smbd/smb2_find.c +++ b/source3/smbd/smb2_find.c @@ -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, diff --git a/source3/smbd/smb2_flush.c b/source3/smbd/smb2_flush.c index 9395592907..c3f5a30129 100644 --- a/source3/smbd/smb2_flush.c +++ b/source3/smbd/smb2_flush.c @@ -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, diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c index 1d6b862d6a..3c8c690342 100644 --- a/source3/smbd/smb2_getinfo.c +++ b/source3/smbd/smb2_getinfo.c @@ -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, diff --git a/source3/smbd/smb2_ioctl.c b/source3/smbd/smb2_ioctl.c index 6ee9318212..a716b9000e 100644 --- a/source3/smbd/smb2_ioctl.c +++ b/source3/smbd/smb2_ioctl.c @@ -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, diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c index dcf1e0c6a5..fce3c7c897 100644 --- a/source3/smbd/smb2_lock.c +++ b/source3/smbd/smb2_lock.c @@ -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 { diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c index d52b2878ec..9e377ceda4 100644 --- a/source3/smbd/smb2_notify.c +++ b/source3/smbd/smb2_notify.c @@ -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; diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index bffda89010..b21ce544d0 100644 --- a/source3/smbd/smb2_read.c +++ b/source3/smbd/smb2_read.c @@ -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, diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index 0004e7ca8c..ae15bd1a34 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -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) diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c index 39b7aee76b..e1149408d1 100644 --- a/source3/smbd/smb2_setinfo.c +++ b/source3/smbd/smb2_setinfo.c @@ -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, diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c index 413fe0c7d1..0501b50245 100644 --- a/source3/smbd/smb2_write.c +++ b/source3/smbd/smb2_write.c @@ -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, diff --git a/source3/torture/nbench.c b/source3/torture/nbench.c index 182f6f7cd9..beab9167e7 100644 --- a/source3/torture/nbench.c +++ b/source3/torture/nbench.c @@ -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) { diff --git a/source3/torture/torture.c b/source3/torture/torture.c index b887e2965b..3c5de28ad5 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -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; diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h index 4f0f624d5b..3f1c7f558e 100644 --- a/source3/winbindd/winbindd.h +++ b/source3/winbindd/winbindd.h @@ -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 diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c index 0a1534cae1..04ef3d8051 100644 --- a/source3/winbindd/winbindd_dual.c +++ b/source3/winbindd/winbindd_dual.c @@ -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 |