diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/include/passdb.h | 9 | ||||
| -rw-r--r-- | source3/include/proto.h | 47 | ||||
| -rw-r--r-- | source3/include/secrets.h | 56 |
4 files changed, 56 insertions, 57 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 35686e9f31..318c747d53 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 08377010d4..b07c117853 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 9fd91b4724..fe977262b6 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 624b1465bb..095ab6ee78 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 */ |