diff options
| author | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
| commit | 7c51fa6d699a653cafa90df8e44911b576118ebd (patch) | |
| tree | 543bf9ca698e03eff81104898b33e77f1abed319 /source3/passdb/secrets.c | |
| parent | cc3a6770c77ec8fe1cd63bf4c682853c56201f0c (diff) | |
| parent | 3e3214fd91471bca5b6c4d3782e922d252d588fb (diff) | |
| download | samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.gz samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.bz2 samba-7c51fa6d699a653cafa90df8e44911b576118ebd.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/passdb/secrets.c')
| -rw-r--r-- | source3/passdb/secrets.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c index 36f401bc92..29e0662396 100644 --- a/source3/passdb/secrets.c +++ b/source3/passdb/secrets.c @@ -392,7 +392,7 @@ void *secrets_get_trust_account_lock(TALLOC_CTX *mem_ctx, const char *domain) Routine to get the default secure channel type for trust accounts ************************************************************************/ -uint32 get_default_sec_channel(void) +enum netr_SchannelType get_default_sec_channel(void) { if (lp_server_role() == ROLE_DOMAIN_BDC || lp_server_role() == ROLE_DOMAIN_PDC) { @@ -412,7 +412,7 @@ uint32 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, - uint32 *channel) + enum netr_SchannelType *channel) { struct machine_acct_pass *pass; size_t size = 0; @@ -458,7 +458,7 @@ bool secrets_fetch_trust_account_password_legacy(const char *domain, bool secrets_fetch_trust_account_password(const char *domain, uint8 ret_pwd[16], time_t *pass_last_set_time, - uint32 *channel) + enum netr_SchannelType *channel) { char *plaintext; @@ -793,7 +793,8 @@ bool secrets_delete_domain_sid(const char *domain) the password is assumed to be a null terminated ascii string ************************************************************************/ -bool secrets_store_machine_password(const char *pass, const char *domain, uint32 sec_channel) +bool secrets_store_machine_password(const char *pass, const char *domain, + enum netr_SchannelType sec_channel) { bool ret; uint32 last_change_time; @@ -819,7 +820,7 @@ bool secrets_store_machine_password(const char *pass, const char *domain, uint32 char *secrets_fetch_machine_password(const char *domain, time_t *pass_last_set_time, - uint32 *channel) + enum netr_SchannelType *channel) { char *ret; ret = (char *)secrets_fetch(machine_password_keystr(domain), NULL); @@ -890,6 +891,7 @@ bool fetch_ldap_pw(char **dn, char** pw) if (asprintf(&key, "%s/%s", SECRETS_LDAP_BIND_PW, *dn) < 0) { SAFE_FREE(*dn); DEBUG(0, ("fetch_ldap_pw: asprintf failed!\n")); + return false; } *pw=(char *)secrets_fetch(key, &size); |