s3-secrets: only include secrets.h when needed.

Guenther

diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index f25fb4a2c75362b6e6254cbba41a5706a1ec5902..0fc6410fec3e70d5df698a7ef8cab37087a2681c 100644 (file)
--- 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 7eea5af605244a72385dca05145d1068553b1939..8be2c6a00c009e4ca18d37ccc0cd78820a8a9783 100644 (file)
--- 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 3a288ddcf2f15723de9b0ef515006de5244e4ad7..7634e76f1c98148ce163ca28c059662a6ef3b2cc 100644 (file)
--- 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 35686e9f313fe218725c76b7dbf4e5ecfd71bae6..318c747d53fcfedb7ce5c62c0b57adb8c0792293 100644 (file)
--- 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 08377010d4f95c35fd0a55509b44711cf8487052..b07c1178536dfc5d4ee11f57741ef5212b9e9d12 100644 (file)
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -218,6 +218,15 @@ struct pdb_domain_info {
        struct GUID guid;
 };
 
+/*
+ * 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.
  */

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9fd91b4724ccffc363506a331545645c7937c749..fe977262b6ba42903d1eb8cbab3f774d4909f9d9 100644 (file)
--- 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 624b1465bb8174a15b0e1fe80f9e77e195d049db..095ab6ee78b96eac4b0cb9804a40be899bd1fce8 100644 (file)
--- a/source3/include/secrets.h
+++ b/source3/include/secrets.h
@@ -61,15 +61,6 @@ struct machine_acct_pass {
        time_t mod_time;
 };
 
-/*
- * 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 94de573395c04a1be49c51cbb9e95160accbed6a..13a06c7136c97b7d8637802648c88195f73d0809 100644 (file)
--- 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 bde6fd823fdd203acf403bc5f64324fb43993c7d..975e306b5d214a1c468a14b845c37bdb305140fe 100644 (file)
--- 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 b1571536eb02ab701b0ab4c7020cf59c730fdc55..996c1c4c85337be87be7c4fc43409226c9c59d9e 100644 (file)
--- 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 b81f0a1ec8084830105403ce87ca6a5867d95118..dbb5f7d08adc15b785253d2ca8d028317387768f 100644 (file)
--- 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 dc243ecf1d091cb0430fcd86cedd2ded757fb919..6770a715d8893dc0fea289db07be20981e75b520 100644 (file)
--- 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 c48944ae6f8ba3eec1f88f631ea7506c8e15ef09..31af49685a8ae6b7b4f389f1f61dd6a6a8964040 100644 (file)
--- 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 33b065f654341d131accfb8a12f6d8d4e5042b9f..a874901caf3b303170bdc6f563eae5f7e224faa9 100644 (file)
--- 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 f8a66021948fd71c01b3fa3e153b8fa83f7c3639..aaeff59182b443870f053e99c25b25c587c962c2 100644 (file)
--- 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 f028c75cfe25d79cd7c7cc8fd707a1db51a7c75c..44b4c78038e7f74a9558d3d10ac2463d2d93f86e 100644 (file)
--- 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 2d18261bfb8e0cd71763c927eee02a151af923d6..bff4e1ebc5fb75e892b4155113093cdb120f2803 100644 (file)
--- 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 c44d92c99a4a7362beb49f5eb5729ced07cae430..7f4ede49efae985d6b6b45a4ea9352b31fabfc75 100644 (file)
--- 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 2daacec9127e9189ca923661372496bfefb0246a..e122937d6e7a7ad16e082353975345479a0b9145 100644 (file)
--- 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 bf7b4138d061b60f293cf5356757098612bf4661..57d483fa46bd4491be3fa13850a133d979bee54c 100644 (file)
--- 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 f07628f3ef2acaa2d280798be1c360e17af35f9f..607260b230a529367c3fba1681a211de8633fe86 100644 (file)
--- 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 43b9277702185514e5bbc61407cf99b084550b6b..715a0f43bb64c255f96b874b4f726cf57bebbe00 100644 (file)
--- 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 9a5edcfa3ac3a10345554eaaaf0f0dbf38ea45f5..0ec1f420f92c94e1ee6cd8767545ee722177fb91 100644 (file)
--- 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 db99d010ec4ddc38606249f9d1f45a02cc0c438a..c5a8faf694dd137ea62e4e6a5dfb74df1443eeda 100644 (file)
--- 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 703e6ef2681b1378bdcbd2a4653d6066c4262413..0f735c40efb476caab99d5fa15eb639b65b40671 100644 (file)
--- 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 abcd4d1dc36c111944d3b01eb4009db4939134e4..1989f6d19194f5c6c0ebd2aa50a870ce6b1fbc41 100644 (file)
--- 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 1c420f85847a2fa871ce6eae481be2a796a3ec08..3ca24c499115b2459cd4ed6e6da52d76dcb2092d 100644 (file)
--- 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 b5da2658e2648232596a6d94c617bffb83505e6b..ba6725e7a5eda9cd815633822095d02c80cb3c57 100644 (file)
--- 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 2e48023d8bd227778c0deeb93fb3b067386dc666..451012d5b04a52740bbfa02e06a0c2e88629cce6 100644 (file)
--- 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 b673ad12a4984f4a17a4231ce4478a9e3432fb06..52c8e8060fe2b29ec66c328081a6ce49abccec79 100644 (file)
--- 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 a831ef220ee707628d1b11a565bb68333f629936..9ead42df5b6b11b148fc02621305adbc77d241de 100644 (file)
--- 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 e59f137ed5cd1b8985d58af9fadf48387a28c4b6..fff50513087a84069b6dc7ddcb6b8008bed9d3a2 100644 (file)
--- 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
index e690969679d22b1ebe8acadd26e73b1a877248f5..cbc08c0880e1f50835753fb40c8ef02125408710 100644 (file)
--- a/source3/rpc_server/srv_dssetup_nt.c
+++ b/source3/rpc_server/srv_dssetup_nt.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_dssetup.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 10ea1e3b971f708cbccaadcfbccc51742d1733d1..68fc2b18f38f5debca425e2581e44d897975760c 100644 (file)
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -30,6 +30,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_lsa.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 95f69a3bba39402468328f0156d3d206234e575d..e101240dbeedc69c825a4acd142fe244f3fe2c2a 100644 (file)
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -37,6 +37,7 @@
 #include "../librpc/gen_ndr/srv_samr.h"
 #include "rpc_server/srv_samr_util.h"
 #include "../lib/crypto/arcfour.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index d0473ed62a9455e9e6dfd5ec4ef0cd5647ef74ea..7ada5fdb9a366e9343a9cc3728ab1e6b0e2340aa 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -38,6 +38,7 @@
 #include "registry.h"
 #include "registry/reg_objects.h"
 #include "include/printing.h"
+#include "secrets.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \

diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index 5b47154f41ba82fc249e984c3fa6d8dd6cba3aa0..ab6be2f69d02c9345a071b70111bdc3a215408d4 100644 (file)
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/srv_winreg.h"
 #include "../librpc/gen_ndr/cli_winreg.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "secrets.h"
 
 #define TOP_LEVEL_PRINT_KEY "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print"
 #define TOP_LEVEL_PRINT_PRINTERS_KEY TOP_LEVEL_PRINT_KEY "\\Printers"

diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index faa2bfff3efaf35cec28193d4a159659d06cc2d8..0917badbdfe0d70412afb86f819233a0ec4a46ef 100644 (file)
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -24,6 +24,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_netlogon.h"
 #include "rpc_client/cli_netlogon.h"
+#include "secrets.h"
 
 static WERROR cmd_netlogon_logon_ctrl2(struct rpc_pipe_client *cli,
                                       TALLOC_CTX *mem_ctx, int argc,

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 7b788e8d1a1b54f5fb7b034c4e742fabd33220c9..dba5204326d7db982755d6c93afccb135d5a45df 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "registry.h"
 #include "libcli/auth/schannel.h"
+#include "secrets.h"
 
 static_decl_rpc;
 

diff --git a/source3/utils/net.c b/source3/utils/net.c
index c677e3a9ba551b1ed735c1fe479f3472df2181ef..1c342858ee3f2e00c7c530a215b7d7e6955648d5 100644 (file)
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -42,6 +42,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "secrets.h"
 
 extern bool AllowDebugChange;
 

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 71181990b583180a40426bf7134a9382bad4b15e..ced5674b100d44daa97bc917e2bc010cd6cd66cc 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -32,6 +32,7 @@
 #include "librpc/gen_ndr/libnet_join.h"
 #include "libnet/libnet_join.h"
 #include "smb_krb5.h"
+#include "secrets.h"
 
 #ifdef HAVE_ADS
 

diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index 1400e31174c62012153fb4ec3d0a9d8942e93a50..702c6f9eeeb2383c3ef193714322cc50655dea0e 100644 (file)
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -20,6 +20,7 @@
 #define FOO(x) (x)
 #include "includes.h"
 #include "utils/net.h"
+#include "secrets.h"
 
 #define ALLOC_CHECK(mem) do { \
        if (!mem) { \

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index d27545d1c630284a9e1510a96c8194facd227700..00ebe13af5f815e02bc9ececabdf1894bef3a07c 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -33,6 +33,7 @@
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "../librpc/gen_ndr/cli_initshutdown.h"
 #include "../librpc/gen_ndr/cli_winreg.h"
+#include "secrets.h"
 
 static int net_mode_share;
 static bool sync_files(struct copy_clistate *cp_clistate, const char *mask);

diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 4659fe52ec8f606006dab89e21d3664bfabfdd1d..c17dfa4c3264db12c003d672f3861430410496d2 100644 (file)
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -27,6 +27,7 @@
 #include "rpc_client/init_samr.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "rpc_client/cli_netlogon.h"
+#include "secrets.h"
 
 /* Macro for checking RPC error codes to make things more readable */
 

diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index b6ab03d9132cfa4fd7117e7d23f6a386b3bb8a6f..11ef42cd61c7ac09f35bce730efd0051694b97c3 100644 (file)
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -24,6 +24,7 @@
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/cli_dssetup.h"
+#include "secrets.h"
 
 NTSTATUS net_rpc_lookup_name(struct net_context *c,
                             TALLOC_CTX *mem_ctx, struct cli_state *cli,

diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 7957dd8a62a5250401336ae1b81a74aaea68ea83..08ccab21261adf628155d73728395944a3e75a5d 100644 (file)
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -17,6 +17,7 @@
  * this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
+#include "secrets.h"
 
 extern bool AllowDebugChange;
 

diff --git a/source3/utils/smbta-util.c b/source3/utils/smbta-util.c
index 75669c1159a59a7d5e609c4fa74bd800842926ec..e4f81445bce9b9a5d0d402b259275d6712afb719 100644 (file)
--- a/source3/utils/smbta-util.c
+++ b/source3/utils/smbta-util.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
-
+#include "secrets.h"
 
 static void delete_key(void);
 

diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index def41c6c116e3d4d76ccfa3a0c31bb4ae95f3d49..37095c12c873063437017005eb7ae90ee9338ae8 100644 (file)
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -31,6 +31,7 @@
 #include "ads.h"
 #include "libads/ldap_schema.h"
 #include "nss_info.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/idmap_adex/idmap_adex.c b/source3/winbindd/idmap_adex/idmap_adex.c
index c815e75a2919018bffa53278b2ed0fd6a2b2b9be..ea6d688b72f84ea1abdf537eab531f43f9252266 100644 (file)
--- a/source3/winbindd/idmap_adex/idmap_adex.c
+++ b/source3/winbindd/idmap_adex/idmap_adex.c
@@ -22,6 +22,7 @@
 #include "ads.h"
 #include "idmap_adex.h"
 #include "nss_info.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/idmap_adex/likewise_cell.c b/source3/winbindd/idmap_adex/likewise_cell.c
index 24343eb554627765696fd1c5961a525f4e2476a5..3e529b427a4e830ece3f391c8c9ecda82a0398f3 100644 (file)
--- a/source3/winbindd/idmap_adex/likewise_cell.c
+++ b/source3/winbindd/idmap_adex/likewise_cell.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "ads.h"
 #include "idmap_adex.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index e7928bf3f7815bb1849004b5e0753e862332e5ac..71a7d0e3a2b1cf0a36c650bc120dde3886ff9e73 100644 (file)
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 9efa8ed98453e17a94265ffe83f357905d7b014b..05114b2432a8000f6b2e41356867a6b2f64db172 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/srv_lsa.h"
 #include "../librpc/gen_ndr/srv_samr.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 949e206d0425e7da04d75c4827135d49b4a93647..1d9f1f0174162ccd3e300bd22de9f93828ca57c1 100644 (file)
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/cli_netlogon.h"
 #include "../libds/common/flags.h"
 #include "ads.h"
+#include "secrets.h"
 
 #ifdef HAVE_ADS
 

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index c10d82cb4907bead05a785ca8112960cd4cf71a7..0ca8513f81143c4988e7b7c5fea418269988bb98 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -71,6 +71,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "libsmb/clidgram.h"
 #include "ads.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 47348b997f502d74bad0882ad7d3abb339db87a7..c8bd066747071c030bedd8fc41caf65e50dee598 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -31,6 +31,7 @@
 #include "winbindd.h"
 #include "../../nsswitch/libwbclient/wbc_async.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 55874e057f13416027d24025825df0cde20f542c..bd1e1b5bee9e621a951fa66c909e1c42bb7a7ad6 100644 (file)
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND