The branch, master has been updated via 62544c5 s3-build: only include smbldap.h where needed. via 8e16d6d s3-build: only include ctdbd_conn.h where needed. via c7fe04a s3-build: only include async headers where needed. from 58c79b8 s4-smbtorture: add NetRemoteTOD libnetapi torture test.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 62544c5d2b9caab818ce82eb0b3877854a9719b6 Author: Günther Deschner <g...@samba.org> Date: Thu Aug 26 14:07:20 2010 +0200 s3-build: only include smbldap.h where needed. Guenther commit 8e16d6dbdfdbfd42de32497d92f3fae32cd39ba4 Author: Günther Deschner <g...@samba.org> Date: Thu Aug 26 10:14:07 2010 +0200 s3-build: only include ctdbd_conn.h where needed. Guenther commit c7fe04abc791dd1b3c5272a96fb5f26f6ce5c252 Author: Günther Deschner <g...@samba.org> Date: Thu Aug 26 09:58:09 2010 +0200 s3-build: only include async headers where needed. Guenther ----------------------------------------------------------------------- Summary of changes: source3/include/includes.h | 7 ----- source3/include/proto.h | 41 +++---------------------------- source3/include/smbldap.h | 37 ++++++++++++++++++++++++++++ source3/lib/ctdbd_conn.c | 1 + source3/lib/g_lock.c | 1 + source3/lib/util.c | 1 + source3/lib/util_sock.c | 1 + source3/libads/ldap.c | 1 + source3/libnet/libnet_samsync_ldif.c | 1 + source3/libsmb/async_smb.c | 2 + source3/libsmb/cliconnect.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 | 2 +- source3/param/loadparm.c | 1 + source3/rpc_client/rpc_transport_sock.c | 1 + source3/smbd/process.c | 2 + source3/smbd/server.c | 1 + source3/torture/torture.c | 1 + source3/utils/net_sam.c | 1 + 26 files changed, 66 insertions(+), 45 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/includes.h b/source3/include/includes.h index 2e45b79..7626a53 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -653,18 +653,11 @@ extern void *cmdline_lp_ctx; #include "session.h" #include "module.h" #include "packet.h" -#include "ctdbd_conn.h" #include "../lib/util/talloc_stack.h" #include "serverid.h" -#include "async_smb.h" -#include "../lib/async_req/async_sock.h" #include "../lib/util/smb_threads.h" #include "../lib/util/smb_threads_internal.h" -/* forward declarations from smbldap.c */ - -#include "smbldap.h" - /* * Reasons for cache flush. */ diff --git a/source3/include/proto.h b/source3/include/proto.h index c104f06..9902198 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -740,43 +740,6 @@ bool share_access_check(const struct security_token *token, const char *sharenam uint32 desired_access); bool parse_usershare_acl(TALLOC_CTX *ctx, const char *acl_str, struct security_descriptor **ppsd); -/* The following definitions come from lib/smbldap.c */ - -int smb_ldap_start_tls(LDAP *ldap_struct, int version); -int smb_ldap_setup_full_conn(LDAP **ldap_struct, const char *uri); -int smbldap_search(struct smbldap_state *ldap_state, - const char *base, int scope, const char *filter, - const char *attrs[], int attrsonly, - LDAPMessage **res); -int smbldap_search_paged(struct smbldap_state *ldap_state, - const char *base, int scope, const char *filter, - const char **attrs, int attrsonly, int pagesize, - LDAPMessage **res, void **cookie); -int smbldap_modify(struct smbldap_state *ldap_state, const char *dn, LDAPMod *attrs[]); -int smbldap_add(struct smbldap_state *ldap_state, const char *dn, LDAPMod *attrs[]); -int smbldap_delete(struct smbldap_state *ldap_state, const char *dn); -int smbldap_extended_operation(struct smbldap_state *ldap_state, - LDAP_CONST char *reqoid, struct berval *reqdata, - LDAPControl **serverctrls, LDAPControl **clientctrls, - char **retoidp, struct berval **retdatap); -int smbldap_search_suffix (struct smbldap_state *ldap_state, - const char *filter, const char **search_attr, - LDAPMessage ** result); -void smbldap_free_struct(struct smbldap_state **ldap_state) ; -NTSTATUS smbldap_init(TALLOC_CTX *mem_ctx, struct event_context *event_ctx, - const char *location, - struct smbldap_state **smbldap_state); -bool smbldap_has_control(LDAP *ld, const char *control); -bool smbldap_has_extension(LDAP *ld, const char *extension); -bool smbldap_has_naming_context(LDAP *ld, const char *naming_context); -bool smbldap_set_creds(struct smbldap_state *ldap_state, bool anon, const char *dn, const char *secret); - -/* The following definitions come from lib/smbldap_util.c */ - -NTSTATUS smbldap_search_domain_info(struct smbldap_state *ldap_state, - LDAPMessage ** result, const char *domain_name, - bool try_add); - /* The following definitions come from lib/smbrun.c */ int smbrun_no_sanitize(const char *cmd, int *outfd); @@ -3943,6 +3906,8 @@ NTSTATUS make_pdb_method( struct pdb_methods **methods ) ; /* The following definitions come from passdb/pdb_ldap.c */ +struct ldapsam_privates; + const char** get_userattr_list( TALLOC_CTX *mem_ctx, int schema_ver ); int ldapsam_search_suffix_by_name(struct ldapsam_privates *ldap_state, const char *user, @@ -3954,6 +3919,8 @@ NTSTATUS pdb_ldap_init(void); /* The following definitions come from passdb/pdb_nds.c */ +struct smbldap_state; + int pdb_nds_get_password( struct smbldap_state *ldap_state, char *object_dn, diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h index 060fcc2..ffe618d 100644 --- a/source3/include/smbldap.h +++ b/source3/include/smbldap.h @@ -233,6 +233,43 @@ char *smbldap_talloc_dn(TALLOC_CTX *mem_ctx, LDAP *ld, LDAPMessage *entry); +/* The following definitions come from lib/smbldap.c */ + +int smb_ldap_start_tls(LDAP *ldap_struct, int version); +int smb_ldap_setup_full_conn(LDAP **ldap_struct, const char *uri); +int smbldap_search(struct smbldap_state *ldap_state, + const char *base, int scope, const char *filter, + const char *attrs[], int attrsonly, + LDAPMessage **res); +int smbldap_search_paged(struct smbldap_state *ldap_state, + const char *base, int scope, const char *filter, + const char **attrs, int attrsonly, int pagesize, + LDAPMessage **res, void **cookie); +int smbldap_modify(struct smbldap_state *ldap_state, const char *dn, LDAPMod *attrs[]); +int smbldap_add(struct smbldap_state *ldap_state, const char *dn, LDAPMod *attrs[]); +int smbldap_delete(struct smbldap_state *ldap_state, const char *dn); +int smbldap_extended_operation(struct smbldap_state *ldap_state, + LDAP_CONST char *reqoid, struct berval *reqdata, + LDAPControl **serverctrls, LDAPControl **clientctrls, + char **retoidp, struct berval **retdatap); +int smbldap_search_suffix (struct smbldap_state *ldap_state, + const char *filter, const char **search_attr, + LDAPMessage ** result); +void smbldap_free_struct(struct smbldap_state **ldap_state) ; +NTSTATUS smbldap_init(TALLOC_CTX *mem_ctx, struct event_context *event_ctx, + const char *location, + struct smbldap_state **smbldap_state); +bool smbldap_has_control(LDAP *ld, const char *control); +bool smbldap_has_extension(LDAP *ld, const char *extension); +bool smbldap_has_naming_context(LDAP *ld, const char *naming_context); +bool smbldap_set_creds(struct smbldap_state *ldap_state, bool anon, const char *dn, const char *secret); + +/* The following definitions come from lib/smbldap_util.c */ + +NTSTATUS smbldap_search_domain_info(struct smbldap_state *ldap_state, + LDAPMessage ** result, const char *domain_name, + bool try_add); + #else #define LDAP void #define LDAPMessage void diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index ff28614..e0682f3 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -24,6 +24,7 @@ #include "librpc/gen_ndr/messaging.h" #include "librpc/gen_ndr/ndr_messaging.h" +#include "ctdbd_conn.h" /* paths to these include files come from --with-ctdb= in configure */ #include "ctdb.h" diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c index 6e4c6d7..edb7786 100644 --- a/source3/lib/g_lock.c +++ b/source3/lib/g_lock.c @@ -20,6 +20,7 @@ #include "includes.h" #include "g_lock.h" #include "librpc/gen_ndr/messaging.h" +#include "ctdbd_conn.h" static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx, const char *name, struct server_id pid); diff --git a/source3/lib/util.c b/source3/lib/util.c index fab622b..2833651 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -24,6 +24,7 @@ #include "includes.h" #include "popt_common.h" #include "secrets.h" +#include "ctdbd_conn.h" extern char *global_clobber_region_function; extern unsigned int global_clobber_region_line; diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index 46926f6..2b33816 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -21,6 +21,7 @@ #include "includes.h" #include "memcache.h" +#include "../lib/async_req/async_sock.h" /**************************************************************************** Get a port number in host byte order from a sockaddr_storage. diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 97d89dc..3525876 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -27,6 +27,7 @@ #include "libads/cldap.h" #include "libads/dns.h" #include "../libds/common/flags.h" +#include "smbldap.h" #ifdef HAVE_LDAP diff --git a/source3/libnet/libnet_samsync_ldif.c b/source3/libnet/libnet_samsync_ldif.c index 96bad4d..454f0a9 100644 --- a/source3/libnet/libnet_samsync_ldif.c +++ b/source3/libnet/libnet_samsync_ldif.c @@ -25,6 +25,7 @@ #include "includes.h" #include "libnet/libnet_samsync.h" +#include "smbldap.h" #ifdef HAVE_LDAP diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c index 8e08d6f..0aaeea2 100644 --- a/source3/libsmb/async_smb.c +++ b/source3/libsmb/async_smb.c @@ -18,6 +18,8 @@ */ #include "includes.h" +#include "../lib/async_req/async_sock.h" +#include "async_smb.h" /* * Read an smb packet asynchronously, discard keepalives diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index ebfc98b..92e5bb2 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -26,6 +26,7 @@ #include "../libcli/auth/ntlmssp.h" #include "libads/kerberos_proto.h" #include "krb5_env.h" +#include "async_smb.h" static const struct { int prot; diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index cdf51c7..2c49a8b 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -20,6 +20,7 @@ #include "includes.h" #include "smb_signing.h" +#include "async_smb.h" /******************************************************************* Setup the word count and byte count for a client smb message. diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index d6b2e31..ce8d7a5 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "async_smb.h" /*********************************************************** Common function for pushing stings, used by smb_bytes_push_str() diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c index 6cbf710..5ca76ac 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 "async_smb.h" /**************************************************************************** Get UNIX extensions version info. diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index b580172..280f876 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "async_smb.h" /**************************************************************************** Calculate a safe next_entry_offset. diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c index 3777c41..4c730c4 100644 --- a/source3/libsmb/climessage.c +++ b/source3/libsmb/climessage.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "async_smb.h" struct cli_message_start_state { uint16_t grp; diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c index 8904ac9..09f9869 100644 --- a/source3/libsmb/clioplock.c +++ b/source3/libsmb/clioplock.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "async_smb.h" /**************************************************************************** send an ack for an oplock break request diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index a1b911c..3ac9f44 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 "async_smb.h" /**************************************************************************** Call a remote api diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c index 24c9d9f..370c068 100644 --- a/source3/libsmb/clireadwrite.c +++ b/source3/libsmb/clireadwrite.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "async_smb.h" /**************************************************************************** Calculate the recommended read buffer size diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c index dd0873d..4379e14 100644 --- a/source3/libsmb/clitrans.c +++ b/source3/libsmb/clitrans.c @@ -18,7 +18,7 @@ */ #include "includes.h" - +#include "async_smb.h" /**************************************************************************** Send a SMB trans or trans2 request. diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 4ae699a..4567f36 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -62,6 +62,7 @@ #include "smb_signing.h" #include "dbwrap.h" +#include "smbldap.h" #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> diff --git a/source3/rpc_client/rpc_transport_sock.c b/source3/rpc_client/rpc_transport_sock.c index b7bb7d7..359ec47 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/async_req/async_sock.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_CLI diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 40009c8..b890687 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -22,6 +22,8 @@ #include "smbd/globals.h" #include "librpc/gen_ndr/netlogon.h" #include "librpc/gen_ndr/messaging.h" +#include "../lib/async_req/async_sock.h" +#include "ctdbd_conn.h" extern bool global_machine_password_needs_changing; diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 247cbb8..e2edaf3 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -29,6 +29,7 @@ #include "libcli/auth/schannel.h" #include "secrets.h" #include "memcache.h" +#include "ctdbd_conn.h" #include "../librpc/gen_ndr/srv_dfs.h" #include "../librpc/gen_ndr/srv_dssetup.h" diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 06ed264..d19c983 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -29,6 +29,7 @@ #include "nsswitch/winbind_client.h" #include "dbwrap.h" #include "talloc_dict.h" +#include "async_smb.h" extern char *optarg; extern int optind; diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c index a5be714..ff2a8db 100644 --- a/source3/utils/net_sam.c +++ b/source3/utils/net_sam.c @@ -21,6 +21,7 @@ #include "includes.h" #include "utils/net.h" #include "../librpc/gen_ndr/samr.h" +#include "smbldap.h" /* * Set a user's data -- Samba Shared Repository