diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-07-14 22:18:29 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-07-15 11:49:29 +1000 |
| commit | 4b61c4891a309172057caf058c39931fe752bd65 (patch) | |
| tree | 99bb5fe1969cbe328468534703d80f4effe0cbfb /source3 | |
| parent | 726ecf6a915ff534af4076e9d0cdebf8b5435d61 (diff) | |
| download | samba-4b61c4891a309172057caf058c39931fe752bd65.tar.gz samba-4b61c4891a309172057caf058c39931fe752bd65.tar.bz2 samba-4b61c4891a309172057caf058c39931fe752bd65.zip | |
s3-secrets: Use C99 types
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/secrets.h | 10 | ||||
| -rw-r--r-- | source3/passdb/machine_account_secrets.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source3/include/secrets.h b/source3/include/secrets.h index 5b778d11e2..fa215fff8d 100644 --- a/source3/include/secrets.h +++ b/source3/include/secrets.h @@ -58,7 +58,7 @@ /* structure for storing machine account password (ie. when samba server is member of a domain */ struct machine_acct_pass { - uint8 hash[16]; + uint8_t hash[16]; time_t mod_time; }; @@ -69,12 +69,12 @@ struct machine_acct_pass { #define SECRETS_AFS_MAXKEYS 8 struct afs_key { - uint32 kvno; + uint32_t kvno; char key[8]; }; struct afs_keyfile { - uint32 nkeys; + uint32_t nkeys; struct afs_key entry[SECRETS_AFS_MAXKEYS]; }; @@ -100,10 +100,10 @@ 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], + uint8_t 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], +bool secrets_fetch_trust_account_password(const char *domain, uint8_t ret_pwd[16], time_t *pass_last_set_time, enum netr_SchannelType *channel); bool secrets_fetch_trusted_domain_password(const char *domain, char** pwd, diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c index 463de714c1..30f5f822ff 100644 --- a/source3/passdb/machine_account_secrets.c +++ b/source3/passdb/machine_account_secrets.c @@ -313,7 +313,7 @@ enum netr_SchannelType get_default_sec_channel(void) ************************************************************************/ bool secrets_fetch_trust_account_password_legacy(const char *domain, - uint8 ret_pwd[16], + uint8_t ret_pwd[16], time_t *pass_last_set_time, enum netr_SchannelType *channel) { @@ -351,7 +351,7 @@ bool secrets_fetch_trust_account_password_legacy(const char *domain, the above secrets_lock_trust_account_password(). ************************************************************************/ -bool secrets_fetch_trust_account_password(const char *domain, uint8 ret_pwd[16], +bool secrets_fetch_trust_account_password(const char *domain, uint8_t ret_pwd[16], time_t *pass_last_set_time, enum netr_SchannelType *channel) { @@ -442,8 +442,8 @@ bool secrets_store_machine_password(const char *pass, const char *domain, enum netr_SchannelType sec_channel) { bool ret; - uint32 last_change_time; - uint32 sec_channel_type; + uint32_t last_change_time; + uint32_t sec_channel_type; if (!secrets_store_prev_machine_password(domain)) { return false; @@ -487,7 +487,7 @@ char *secrets_fetch_machine_password(const char *domain, if (pass_last_set_time) { size_t size; - uint32 *last_set_time; + uint32_t *last_set_time; last_set_time = (unsigned int *)secrets_fetch(machine_last_change_time_keystr(domain), &size); if (last_set_time) { *pass_last_set_time = IVAL(last_set_time,0); @@ -499,7 +499,7 @@ char *secrets_fetch_machine_password(const char *domain, if (channel) { size_t size; - uint32 *channel_type; + uint32_t *channel_type; channel_type = (unsigned int *)secrets_fetch(machine_sec_channel_type_keystr(domain), &size); if (channel_type) { *channel = IVAL(channel_type,0); |