[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Fri Apr 29 06:01:08 MDT 2011
The branch, master has been updated
via 50883cf s3-tevent: only include ../lib/util/tevent wrappers where needed.
via 1247622 s3-tsocket: only include ../lib/tsocket/tsocket.h where needed.
via bc6f24e s3-build: remove some unused headers.
from 4d41a5e s3-ldap Only prototype ldap_init_fd() when we have found it in the libraries
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 50883cfeb4eed3d538f71443060745f8747044c9
Author: Günther Deschner <gd at samba.org>
Date: Thu Apr 28 17:38:09 2011 +0200
s3-tevent: only include ../lib/util/tevent wrappers where needed.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Fri Apr 29 14:00:30 CEST 2011 on sn-devel-104
commit 12476223c6aa7473c55bcf529639eefce8450680
Author: Günther Deschner <gd at samba.org>
Date: Thu Apr 28 17:26:40 2011 +0200
s3-tsocket: only include ../lib/tsocket/tsocket.h where needed.
Guenther
commit bc6f24e89f2dd6204209fc9bacc7bfa9c22d0a57
Author: Günther Deschner <gd at samba.org>
Date: Thu Apr 28 16:37:05 2011 +0200
s3-build: remove some unused headers.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/include/includes.h | 3 ---
source3/include/proto.h | 1 +
source3/lib/addrchange.c | 1 +
source3/lib/fncall.c | 1 +
source3/lib/tldap.c | 2 ++
source3/lib/util_sock.c | 2 ++
source3/lib/util_tsock.c | 2 ++
source3/librpc/rpc/rpc_common.c | 1 -
source3/libsmb/async_smb.c | 2 ++
source3/libsmb/cli_np_tstream.c | 1 +
source3/libsmb/cliconnect.c | 1 +
source3/libsmb/clidgram.c | 1 +
source3/libsmb/clientgen.c | 1 +
source3/libsmb/clifile.c | 1 +
source3/libsmb/clifsinfo.c | 1 +
source3/libsmb/clilist.c | 1 +
source3/libsmb/climessage.c | 1 +
source3/libsmb/clioplock.c | 1 +
source3/libsmb/clirap.c | 1 +
source3/libsmb/clireadwrite.c | 1 +
source3/libsmb/clitrans.c | 1 +
source3/libsmb/namequery.c | 1 +
source3/libsmb/smbsock_connect.c | 1 +
source3/libsmb/unexpected.c | 1 +
source3/rpc_client/cli_pipe.c | 1 +
source3/rpc_client/rpc_transport_np.c | 1 +
source3/rpc_client/rpc_transport_sock.c | 1 +
source3/rpc_client/rpc_transport_tstream.c | 1 +
source3/rpc_server/rpc_ncacn_np.c | 2 ++
source3/rpc_server/srv_pipe_hnd.c | 2 ++
source3/smbd/aio.c | 1 +
source3/smbd/lanman.c | 3 ---
source3/smbd/msg_idmap.c | 2 --
source3/smbd/process.c | 1 +
source3/smbd/server.c | 1 -
source3/smbd/service.c | 1 +
source3/smbd/sesssetup.c | 1 +
source3/smbd/smb2_break.c | 1 +
source3/smbd/smb2_create.c | 1 +
source3/smbd/smb2_find.c | 1 +
source3/smbd/smb2_flush.c | 1 +
source3/smbd/smb2_getinfo.c | 1 +
source3/smbd/smb2_ioctl.c | 1 +
source3/smbd/smb2_lock.c | 1 +
source3/smbd/smb2_notify.c | 1 +
source3/smbd/smb2_read.c | 1 +
source3/smbd/smb2_server.c | 1 +
source3/smbd/smb2_setinfo.c | 1 +
source3/smbd/smb2_write.c | 1 +
source3/torture/nbench.c | 1 +
source3/torture/torture.c | 1 +
source3/winbindd/winbindd.h | 2 ++
source3/winbindd/winbindd_dual.c | 1 +
53 files changed, 55 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 014d1d4..f4cac1a 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -520,9 +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/tsocket/tsocket.h"
#include "../lib/util/data_blob.h"
#include "../lib/util/time.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index c9552d7..b4a9109 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -925,6 +925,7 @@ struct tevent_req *getaddrinfo_send(TALLOC_CTX *mem_ctx,
int getaddrinfo_recv(struct tevent_req *req, struct addrinfo **res);
int poll_one_fd(int fd, int events, int timeout, int *revents);
int poll_intr_one_fd(int fd, int events, int timeout, int *revents);
+struct tstream_context;
struct tevent_req *tstream_read_packet_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct tstream_context *stream,
diff --git a/source3/lib/addrchange.c b/source3/lib/addrchange.c
index bd4bfba..a5d2041 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 91377e0..4a013e9 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 cd1dea5..ba27028 100644
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -20,6 +20,8 @@
#include "includes.h"
#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 eb74b75..daf91fe 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 1cb88c6..35a97f5 100644
--- a/source3/lib/util_tsock.c
+++ b/source3/lib/util_tsock.c
@@ -18,6 +18,8 @@
*/
#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/librpc/rpc/rpc_common.c b/source3/librpc/rpc/rpc_common.c
index ed0320a..b4c7e1d 100644
--- a/source3/librpc/rpc/rpc_common.c
+++ b/source3/librpc/rpc/rpc_common.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "../librpc/gen_ndr/ndr_schannel.h"
#include "../librpc/gen_ndr/ndr_lsa.h"
#include "../librpc/gen_ndr/ndr_dssetup.h"
#include "../librpc/gen_ndr/ndr_samr.h"
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 8af5aa1..ea3ca2d 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 1f9e5ff..1c06760 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 5abaa4f..6d1eaad 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 92f381e..f133fe0 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 cec645b..4e1c827 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 c863552..cde2466 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 ebd04e6..4b3383a 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 552de00..1017eb5 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 2c2921a..75659d7 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 78e93a4..aed489f 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 8d1be2d..36a8e3a 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 d36b280..ff3dcff 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 dab8c10..995f2c0 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 16669c0..61814f4 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 9dc2f68..aa98099 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 c5ad9ec..1b1d8cb 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 55cc5f8..758f778 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 2be0162..c66d4b8 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_sock.c b/source3/rpc_client/rpc_transport_sock.c
index 71f979c..1dd0132 100644
--- a/source3/rpc_client/rpc_transport_sock.c
+++ b/source3/rpc_client/rpc_transport_sock.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "../lib/tsocket/tsocket.h"
#include "rpc_client/rpc_transport.h"
#include "../lib/async_req/async_sock.h"
diff --git a/source3/rpc_client/rpc_transport_tstream.c b/source3/rpc_client/rpc_transport_tstream.c
index 248b09f..e62ab4b 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 e89a366..2e99da7 100644
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -31,6 +31,8 @@
#include "../auth/auth_sam_reply.h"
#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 5252598..6aa9bf8 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -29,6 +29,8 @@
#include "rpc_dce.h"
#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 682d042..0cb94ac 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/lanman.c b/source3/smbd/lanman.c
index 13297c0..9885525 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -34,13 +34,10 @@
#include "rpc_client/cli_spoolss.h"
#include "rpc_client/init_spoolss.h"
#include "../librpc/gen_ndr/ndr_srvsvc_c.h"
-#include "../librpc/gen_ndr/srv_samr.h"
-#include "../librpc/gen_ndr/srv_srvsvc.h"
#include "../librpc/gen_ndr/rap.h"
#include "../lib/util/binsearch.h"
#include "../libcli/auth/libcli_auth.h"
#include "rpc_client/init_lsa.h"
-#include "rpc_server/rpc_ncacn_np.h"
#include "../libcli/security/security.h"
#include "printing.h"
#include "passdb/machine_sid.h"
diff --git a/source3/smbd/msg_idmap.c b/source3/smbd/msg_idmap.c
index b1ee60f..2a00f1b 100644
--- a/source3/smbd/msg_idmap.c
+++ b/source3/smbd/msg_idmap.c
@@ -27,10 +27,8 @@
#include "includes.h"
#include "smbd/smbd.h"
-#include "memcache.h"
#include "globals.h"
#include "../libcli/security/dom_sid.h"
-#include "../librpc/gen_ndr/ndr_security.h"
#include "idmap_cache.h"
#include "passdb/lookup_sid.h"
#include "auth.h"
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 248b3e4..1063269 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "../lib/tsocket/tsocket.h"
#include "system/filesys.h"
#include "smbd/smbd.h"
#include "smbd/globals.h"
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index d3c6c18..a485775 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -26,7 +26,6 @@
#include "popt_common.h"
#include "smbd/smbd.h"
#include "smbd/globals.h"
-#include "registry.h"
#include "registry/reg_init_full.h"
#include "libcli/auth/schannel.h"
#include "secrets.h"
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index b29713d..5ab612a 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -19,6 +19,7 @@
#include "includes.h"
#include "system/filesys.h"
+#include "../lib/tsocket/tsocket.h"
#include "smbd/smbd.h"
#include "smbd/globals.h"
#include "../librpc/gen_ndr/netlogon.h"
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 3cf6758..3631d58 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "../lib/tsocket/tsocket.h"
#include "smbd/smbd.h"
#include "smbd/globals.h"
#include "../libcli/auth/spnego.h"
diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c
index 925384c..5d5ab41 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 6e29246..73b8ade 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 eeb1f45..9fc8f1f 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 9395592..c3f5a30 100644
--- a/source3/smbd/smb2_flush.c
--
Samba Shared Repository
More information about the samba-cvs
mailing list