[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Thu Aug 5 02:12:37 MDT 2010
The branch, master has been updated
via c136b84... s3-secrets: only include secrets.h when needed.
from 1946ab5... s4-dns: ndr_dnsp helper functions
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c136b84f0d28d1a88c5918b06f81766a271a3780
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 5 02:25:37 2010 +0200
s3-secrets: only include secrets.h when needed.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/auth/auth_domain.c | 1 +
source3/auth/auth_netlogond.c | 1 +
source3/auth/token_util.c | 1 +
source3/include/includes.h | 1 -
source3/include/passdb.h | 9 ++++
source3/include/proto.h | 47 ----------------------
source3/include/secrets.h | 56 ++++++++++++++++++++++----
source3/lib/netapi/joindomain.c | 1 +
source3/lib/netapi/netapi.c | 1 +
source3/lib/smbldap.c | 1 +
source3/lib/substitute.c | 1 +
source3/lib/util.c | 1 +
source3/libads/kerberos.c | 1 +
source3/libads/kerberos_keytab.c | 1 +
source3/libads/kerberos_verify.c | 1 +
source3/libads/util.c | 1 +
source3/libnet/libnet_join.c | 2 +-
source3/libsmb/libsmb_context.c | 1 +
source3/libsmb/trusts_util.c | 1 +
source3/modules/vfs_smb_traffic_analyzer.c | 1 +
source3/nmbd/nmbd_processlogon.c | 1 +
source3/pam_smbpass/support.c | 1 +
source3/passdb/lookup_sid.c | 1 +
source3/passdb/machine_account_secrets.c | 1 +
source3/passdb/machine_sid.c | 1 +
source3/passdb/passdb.c | 1 +
source3/passdb/pdb_ads.c | 1 +
source3/passdb/pdb_interface.c | 1 +
source3/passdb/pdb_ldap.c | 1 +
source3/passdb/secrets.c | 1 +
source3/printing/nt_printing.c | 1 +
source3/printing/nt_printing_ads.c | 1 +
source3/rpc_server/srv_dssetup_nt.c | 1 +
source3/rpc_server/srv_lsa_nt.c | 1 +
source3/rpc_server/srv_samr_nt.c | 1 +
source3/rpc_server/srv_spoolss_nt.c | 1 +
source3/rpc_server/srv_spoolss_util.c | 1 +
source3/rpcclient/cmd_netlogon.c | 1 +
source3/smbd/server.c | 1 +
source3/utils/net.c | 1 +
source3/utils/net_ads.c | 1 +
source3/utils/net_idmap.c | 1 +
source3/utils/net_rpc.c | 1 +
source3/utils/net_rpc_join.c | 1 +
source3/utils/net_util.c | 1 +
source3/utils/smbpasswd.c | 1 +
source3/utils/smbta-util.c | 2 +-
source3/winbindd/idmap_ad.c | 1 +
source3/winbindd/idmap_adex/idmap_adex.c | 1 +
source3/winbindd/idmap_adex/likewise_cell.c | 1 +
source3/winbindd/idmap_ldap.c | 1 +
source3/winbindd/winbindd.c | 1 +
source3/winbindd/winbindd_ads.c | 1 +
source3/winbindd/winbindd_cm.c | 1 +
source3/winbindd/winbindd_dual.c | 1 +
source3/winbindd/winbindd_util.c | 1 +
56 files changed, 108 insertions(+), 59 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index f25fb4a..0fc6410 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -22,6 +22,7 @@
#include "../libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
#include "rpc_client/cli_netlogon.h"
+#include "secrets.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/auth_netlogond.c b/source3/auth/auth_netlogond.c
index 7eea5af..8be2c6a 100644
--- a/source3/auth/auth_netlogond.c
+++ b/source3/auth/auth_netlogond.c
@@ -21,6 +21,7 @@
#include "../libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
#include "rpc_client/cli_netlogon.h"
+#include "secrets.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 3a288dd..7634e76 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -25,6 +25,7 @@
/* functions moved from auth/auth_util.c to minimize linker deps */
#include "includes.h"
+#include "secrets.h"
/****************************************************************************
Check for a SID in an NT_USER_TOKEN
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 35686e9..318c747 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -642,7 +642,6 @@ extern void *cmdline_lp_ctx;
#include "smb_signing.h"
#include "smb.h"
#include "nameserv.h"
-#include "secrets.h"
#include "../lib/util/byteorder.h"
#include "privileges.h"
#include "rpc_misc.h"
diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index 0837701..b07c117 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -219,6 +219,15 @@ struct pdb_domain_info {
};
/*
+ * trusted domain entry/entries returned by secrets_get_trusted_domains
+ * (used in _lsa_enum_trust_dom call)
+ */
+struct trustdom_info {
+ char *name;
+ struct dom_sid sid;
+};
+
+/*
* Types of account policy.
*/
enum pdb_policy_type {
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9fd91b4..fe97726 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4365,53 +4365,6 @@ NTSTATUS pdb_wbc_sam_init(void);
bool init_sam_from_buffer_v2(struct samu *sampass, uint8_t *buf, uint32_t buflen);
NTSTATUS pdb_tdbsam_init(void);
-/* The following definitions come from passdb/secrets.c */
-
-bool secrets_init(void);
-struct db_context *secrets_db_ctx(void);
-void secrets_shutdown(void);
-void *secrets_fetch(const char *key, size_t *size);
-bool secrets_store(const char *key, const void *data, size_t size);
-bool secrets_delete(const char *key);
-bool secrets_store_domain_sid(const char *domain, const struct dom_sid *sid);
-bool secrets_fetch_domain_sid(const char *domain, struct dom_sid *sid);
-bool secrets_store_domain_guid(const char *domain, struct GUID *guid);
-bool secrets_fetch_domain_guid(const char *domain, struct GUID *guid);
-void *secrets_get_trust_account_lock(TALLOC_CTX *mem_ctx, const char *domain);
-enum netr_SchannelType get_default_sec_channel(void);
-bool secrets_fetch_trust_account_password_legacy(const char *domain,
- uint8 ret_pwd[16],
- time_t *pass_last_set_time,
- enum netr_SchannelType *channel);
-bool secrets_fetch_trust_account_password(const char *domain, uint8 ret_pwd[16],
- time_t *pass_last_set_time,
- enum netr_SchannelType *channel);
-bool secrets_fetch_trusted_domain_password(const char *domain, char** pwd,
- struct dom_sid *sid, time_t *pass_last_set_time);
-bool secrets_store_trusted_domain_password(const char* domain, const char* pwd,
- const struct dom_sid *sid);
-bool secrets_delete_machine_password(const char *domain);
-bool secrets_delete_machine_password_ex(const char *domain);
-bool secrets_delete_domain_sid(const char *domain);
-bool secrets_store_machine_password(const char *pass, const char *domain, enum netr_SchannelType sec_channel);
-char *secrets_fetch_prev_machine_password(const char *domain);
-char *secrets_fetch_machine_password(const char *domain,
- time_t *pass_last_set_time,
- enum netr_SchannelType *channel);
-bool trusted_domain_password_delete(const char *domain);
-bool secrets_store_ldap_pw(const char* dn, char* pw);
-bool fetch_ldap_pw(char **dn, char** pw);
-NTSTATUS secrets_trusted_domains(TALLOC_CTX *mem_ctx, uint32 *num_domains,
- struct trustdom_info ***domains);
-bool secrets_store_afs_keyfile(const char *cell, const struct afs_keyfile *keyfile);
-bool secrets_fetch_afs_key(const char *cell, struct afs_key *result);
-void secrets_fetch_ipc_userpass(char **username, char **domain, char **password);
-bool secrets_store_generic(const char *owner, const char *key, const char *secret);
-char *secrets_fetch_generic(const char *owner, const char *key);
-bool secrets_delete_generic(const char *owner, const char *key);
-bool secrets_store_local_schannel_key(uint8_t schannel_key[16]);
-bool secrets_fetch_local_schannel_key(uint8_t schannel_key[16]);
-
/* The following definitions come from passdb/util_builtin.c */
bool lookup_builtin_rid(TALLOC_CTX *mem_ctx, uint32 rid, const char **name);
diff --git a/source3/include/secrets.h b/source3/include/secrets.h
index 624b146..095ab6e 100644
--- a/source3/include/secrets.h
+++ b/source3/include/secrets.h
@@ -62,15 +62,6 @@ struct machine_acct_pass {
};
/*
- * trusted domain entry/entries returned by secrets_get_trusted_domains
- * (used in _lsa_enum_trust_dom call)
- */
-struct trustdom_info {
- char *name;
- struct dom_sid sid;
-};
-
-/*
* Format of an OpenAFS keyfile
*/
@@ -88,4 +79,51 @@ struct afs_keyfile {
#define SECRETS_AFS_KEYFILE "SECRETS/AFS_KEYFILE"
+/* The following definitions come from passdb/secrets.c */
+
+bool secrets_init(void);
+struct db_context *secrets_db_ctx(void);
+void secrets_shutdown(void);
+void *secrets_fetch(const char *key, size_t *size);
+bool secrets_store(const char *key, const void *data, size_t size);
+bool secrets_delete(const char *key);
+bool secrets_store_domain_sid(const char *domain, const struct dom_sid *sid);
+bool secrets_fetch_domain_sid(const char *domain, struct dom_sid *sid);
+bool secrets_store_domain_guid(const char *domain, struct GUID *guid);
+bool secrets_fetch_domain_guid(const char *domain, struct GUID *guid);
+void *secrets_get_trust_account_lock(TALLOC_CTX *mem_ctx, const char *domain);
+enum netr_SchannelType get_default_sec_channel(void);
+bool secrets_fetch_trust_account_password_legacy(const char *domain,
+ uint8 ret_pwd[16],
+ time_t *pass_last_set_time,
+ enum netr_SchannelType *channel);
+bool secrets_fetch_trust_account_password(const char *domain, uint8 ret_pwd[16],
+ time_t *pass_last_set_time,
+ enum netr_SchannelType *channel);
+bool secrets_fetch_trusted_domain_password(const char *domain, char** pwd,
+ struct dom_sid *sid, time_t *pass_last_set_time);
+bool secrets_store_trusted_domain_password(const char* domain, const char* pwd,
+ const struct dom_sid *sid);
+bool secrets_delete_machine_password(const char *domain);
+bool secrets_delete_machine_password_ex(const char *domain);
+bool secrets_delete_domain_sid(const char *domain);
+bool secrets_store_machine_password(const char *pass, const char *domain, enum netr_SchannelType sec_channel);
+char *secrets_fetch_prev_machine_password(const char *domain);
+char *secrets_fetch_machine_password(const char *domain,
+ time_t *pass_last_set_time,
+ enum netr_SchannelType *channel);
+bool trusted_domain_password_delete(const char *domain);
+bool secrets_store_ldap_pw(const char* dn, char* pw);
+bool fetch_ldap_pw(char **dn, char** pw);
+NTSTATUS secrets_trusted_domains(TALLOC_CTX *mem_ctx, uint32 *num_domains,
+ struct trustdom_info ***domains);
+bool secrets_store_afs_keyfile(const char *cell, const struct afs_keyfile *keyfile);
+bool secrets_fetch_afs_key(const char *cell, struct afs_key *result);
+void secrets_fetch_ipc_userpass(char **username, char **domain, char **password);
+bool secrets_store_generic(const char *owner, const char *key, const char *secret);
+char *secrets_fetch_generic(const char *owner, const char *key);
+bool secrets_delete_generic(const char *owner, const char *key);
+bool secrets_store_local_schannel_key(uint8_t schannel_key[16]);
+bool secrets_fetch_local_schannel_key(uint8_t schannel_key[16]);
+
#endif /* _SECRETS_H */
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 94de573..13a06c7 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -27,6 +27,7 @@
#include "libnet/libnet_join.h"
#include "libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/cli_wkssvc.h"
+#include "secrets.h"
/****************************************************************
****************************************************************/
diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c
index bde6fd8..975e306 100644
--- a/source3/lib/netapi/netapi.c
+++ b/source3/lib/netapi/netapi.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
+#include "secrets.h"
extern bool AllowDebugChange;
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index b157153..996c1c4 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -24,6 +24,7 @@
#include "includes.h"
#include "smbldap.h"
+#include "secrets.h"
/* Try not to hit the up or down server forever */
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index b81f0a1..dbb5f7d 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -20,6 +20,7 @@
#include "includes.h"
+#include "secrets.h"
static char *alloc_sub_basic(const char *smb_name, const char *domain_name,
const char *str);
diff --git a/source3/lib/util.c b/source3/lib/util.c
index dc243ec..6770a71 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "secrets.h"
extern char *global_clobber_region_function;
extern unsigned int global_clobber_region_line;
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index c48944a..31af496 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -25,6 +25,7 @@
#include "smb_krb5.h"
#include "../librpc/gen_ndr/ndr_misc.h"
#include "libads/kerberos_proto.h"
+#include "secrets.h"
#ifdef HAVE_KRB5
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
index 33b065f..a874901 100644
--- a/source3/libads/kerberos_keytab.c
+++ b/source3/libads/kerberos_keytab.c
@@ -28,6 +28,7 @@
#include "includes.h"
#include "smb_krb5.h"
#include "ads.h"
+#include "secrets.h"
#ifdef HAVE_KRB5
diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c
index f8a6602..aaeff59 100644
--- a/source3/libads/kerberos_verify.c
+++ b/source3/libads/kerberos_verify.c
@@ -26,6 +26,7 @@
#include "includes.h"
#include "smb_krb5.h"
#include "libads/kerberos_proto.h"
+#include "secrets.h"
#ifdef HAVE_KRB5
diff --git a/source3/libads/util.c b/source3/libads/util.c
index f028c75..44b4c78 100644
--- a/source3/libads/util.c
+++ b/source3/libads/util.c
@@ -19,6 +19,7 @@
#include "includes.h"
#include "ads.h"
+#include "secrets.h"
#ifdef HAVE_KRB5
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 2d18261..bff4e1e 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -32,7 +32,7 @@
#include "lib/smbconf/smbconf.h"
#include "lib/smbconf/smbconf_reg.h"
#include "../libds/common/flags.h"
-
+#include "secrets.h"
/****************************************************************
****************************************************************/
diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index c44d92c..7f4ede4 100644
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -25,6 +25,7 @@
#include "includes.h"
#include "libsmbclient.h"
#include "libsmb_internal.h"
+#include "secrets.h"
/*
diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
index 2daacec..e122937 100644
--- a/source3/libsmb/trusts_util.c
+++ b/source3/libsmb/trusts_util.c
@@ -24,6 +24,7 @@
#include "rpc_client/cli_lsarpc.h"
#include "rpc_client/cli_netlogon.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "secrets.h"
/*********************************************************
Change the domain password on the PDC.
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index bf7b413..57d483f 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -23,6 +23,7 @@
#include "../lib/crypto/crypto.h"
#include "vfs_smb_traffic_analyzer.h"
#include "../libcli/security/dom_sid.h"
+#include "secrets.h"
/* abstraction for the send_over_network function */
enum sock_type {INTERNET_SOCKET = 0, UNIX_DOMAIN_SOCKET};
diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c
index f07628f..607260b 100644
--- a/source3/nmbd/nmbd_processlogon.c
+++ b/source3/nmbd/nmbd_processlogon.c
@@ -28,6 +28,7 @@
#include "../libcli/cldap/cldap.h"
#include "../lib/tsocket/tsocket.h"
#include "../libcli/security/dom_sid.h"
+#include "secrets.h"
struct sam_database_info {
uint32 index;
diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c
index 43b9277..715a0f4 100644
--- a/source3/pam_smbpass/support.c
+++ b/source3/pam_smbpass/support.c
@@ -19,6 +19,7 @@
#include "general.h"
#include "support.h"
+#include "secrets.h"
#include "../libcli/auth/libcli_auth.h"
#if defined(HAVE_SECURITY_PAM_EXT_H)
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 9a5edcf..0ec1f42 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "../librpc/gen_ndr/ndr_security.h"
+#include "secrets.h"
/*****************************************************************
Dissect a user-provided name into domain, name, sid and type.
diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index db99d01..c5a8faf 100644
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -24,6 +24,7 @@
#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
+#include "secrets.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c
index 703e6ef..0f735c4 100644
--- a/source3/passdb/machine_sid.c
+++ b/source3/passdb/machine_sid.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "secrets.h"
/* NOTE! the global_sam_sid is the SID of our local SAM. This is only
equal to the domain SID when we are a DC, otherwise its our
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index abcd4d1..1989f6d 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -24,6 +24,7 @@
#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
+#include "secrets.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 1c420f8..3ca24c4 100644
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -21,6 +21,7 @@
#include "tldap.h"
#include "tldap_util.h"
#include "../libds/common/flags.h"
+#include "secrets.h"
struct pdb_ads_state {
struct sockaddr_un socket_address;
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index b5da265..ba6725e 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "secrets.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 2e48023..451012d 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -45,6 +45,7 @@
#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
+#include "secrets.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index b673ad1..52c8e80 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -25,6 +25,7 @@
#include "includes.h"
#include "../libcli/auth/libcli_auth.h"
#include "librpc/gen_ndr/ndr_secrets.h"
+#include "secrets.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index a831ef2..9ead42d 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -30,6 +30,7 @@
#include "../librpc/gen_ndr/ndr_spoolss.h"
#include "rpc_server/srv_spoolss_util.h"
#include "nt_printing.h"
+#include "secrets.h"
/* Map generic permissions to printer object specific permissions */
diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c
index e59f137..fff5051 100644
--- a/source3/printing/nt_printing_ads.c
+++ b/source3/printing/nt_printing_ads.c
@@ -24,6 +24,7 @@
#include "rpc_server/srv_spoolss_util.h"
#include "nt_printing.h"
#include "ads.h"
+#include "secrets.h"
#ifdef HAVE_ADS
/*****************************************************************
diff --git a/source3/rpc_server/srv_dssetup_nt.c b/source3/rpc_server/srv_dssetup_nt.c
--
Samba Shared Repository
More information about the samba-cvs
mailing list