From 45e93c19ef95978f908f5b14962770510634cd3b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 29 May 2004 08:11:46 +0000 Subject: r943: change samba4 to use 'uint8_t' instead of 'unsigned char' metze (This used to be commit b5378803fdcb3b3afe7c2932a38828e83470f61a) --- source4/auth/auth_domain.c | 12 ++++++------ source4/auth/auth_server.c | 2 +- source4/auth/auth_util.c | 12 ++++++------ source4/auth/pass_check.c | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'source4/auth') diff --git a/source4/auth/auth_domain.c b/source4/auth/auth_domain.c index 3064da72de..f59c82c553 100644 --- a/source4/auth/auth_domain.c +++ b/source4/auth/auth_domain.c @@ -124,7 +124,7 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli, const char *server, const char *setup_creds_as, uint16_t sec_chan, - const unsigned char *trust_passwd, + const uint8_t *trust_passwd, BOOL *retry) { struct in_addr dest_ip; @@ -235,7 +235,7 @@ static NTSTATUS attempt_connect_to_dc(struct cli_state **cli, struct in_addr *ip, const char *setup_creds_as, uint16_t sec_chan, - const unsigned char *trust_passwd) + const uint8_t *trust_passwd) { NTSTATUS ret = NT_STATUS_UNSUCCESSFUL; BOOL retry = True; @@ -266,7 +266,7 @@ static NTSTATUS find_connect_dc(struct cli_state **cli, const char *domain, const char *setup_creds_as, uint16_t sec_chan, - unsigned char *trust_passwd, + uint8_t *trust_passwd, time_t last_change_time) { struct in_addr dc_ip; @@ -294,7 +294,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx, auth_serversupplied_info **server_info, const char *server, const char *setup_creds_as, uint16_t sec_chan, - unsigned char trust_passwd[16], + uint8_t trust_passwd[16], time_t last_change_time) { fstring remote_machine; @@ -399,7 +399,7 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context, { NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE; char *password_server; - unsigned char trust_passwd[16]; + uint8_t trust_passwd[16]; time_t last_change_time; const char *domain = lp_workgroup(); @@ -477,7 +477,7 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte auth_serversupplied_info **server_info) { NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE; - unsigned char trust_md4_password[16]; + uint8_t trust_md4_password[16]; char *trust_password; time_t last_change_time; DOM_SID sid; diff --git a/source4/auth/auth_server.c b/source4/auth/auth_server.c index 620d9a33c8..076fa8e70e 100644 --- a/source4/auth/auth_server.c +++ b/source4/auth/auth_server.c @@ -218,7 +218,7 @@ static NTSTATUS check_smbserver_security(const struct auth_context *auth_context auth_serversupplied_info **server_info) { struct cli_state *cli; - static unsigned char badpass[24]; + static uint8_t badpass[24]; static fstring baduser; static BOOL tested_password_server = False; static BOOL bad_password_server = False; diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c index 8a10a33b0c..b04b93d63f 100644 --- a/source4/auth/auth_util.c +++ b/source4/auth/auth_util.c @@ -200,9 +200,9 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info, { char lm_pwd[16]; char nt_pwd[16]; - unsigned char local_lm_response[24]; - unsigned char local_nt_response[24]; - unsigned char key[16]; + uint8_t local_lm_response[24]; + uint8_t local_nt_response[24]; + uint8_t key[16]; ZERO_STRUCT(key); memcpy(key, dc_sess_key, 8); @@ -236,10 +236,10 @@ BOOL make_user_info_netlogon_interactive(auth_usersupplied_info **user_info, #endif if (lm_interactive_pwd) - SMBOWFencrypt((const unsigned char *)lm_pwd, chal, local_lm_response); + SMBOWFencrypt((const uint8_t *)lm_pwd, chal, local_lm_response); if (nt_interactive_pwd) - SMBOWFencrypt((const unsigned char *)nt_pwd, chal, local_nt_response); + SMBOWFencrypt((const uint8_t *)nt_pwd, chal, local_nt_response); /* Password info paranoia */ ZERO_STRUCT(key); @@ -307,7 +307,7 @@ BOOL make_user_info_for_reply(auth_usersupplied_info **user_info, DEBUG(5,("make_user_info_for_reply: User passwords not in encrypted format.\n")); if (plaintext_password.data) { - unsigned char local_lm_response[24]; + uint8_t local_lm_response[24]; #ifdef DEBUG_PASSWORD DEBUG(10,("Unencrypted password (len %d):\n",plaintext_password.length)); diff --git a/source4/auth/pass_check.c b/source4/auth/pass_check.c index 88b82e3474..c468db5558 100644 --- a/source4/auth/pass_check.c +++ b/source4/auth/pass_check.c @@ -100,7 +100,7 @@ static BOOL dfs_auth(char *user, char *password) struct passwd *pw; sec_passwd_rec_t passwd_rec; sec_login_auth_src_t auth_src = sec_login_auth_src_network; - unsigned char dce_errstr[dce_c_error_string_len]; + uint8_t dce_errstr[dce_c_error_string_len]; gid_t egid; if (dcelogin_atmost_once) @@ -174,7 +174,7 @@ static BOOL dfs_auth(char *user, char *password) } sec_key_mgmt_get_key(rpc_c_authn_dce_secret, NULL, - (unsigned char *)pw->pw_name, + (uint8_t *)pw->pw_name, sec_c_key_version_none, (void **)&key, &err); if (err != error_status_ok) @@ -205,7 +205,7 @@ static BOOL dfs_auth(char *user, char *password) } } - if (sec_login_setup_identity((unsigned char *)user, + if (sec_login_setup_identity((uint8_t *)user, sec_login_no_flags, &my_dce_sec_context, &err) == 0) { @@ -248,7 +248,7 @@ static BOOL dfs_auth(char *user, char *password) set_effective_gid(pw->pw_gid); set_effective_uid(pw->pw_uid); - if (sec_login_setup_identity((unsigned char *)user, + if (sec_login_setup_identity((uint8_t *)user, sec_login_no_flags, &my_dce_sec_context, &err) == 0) { @@ -359,7 +359,7 @@ void dfs_unlogin(void) { error_status_t err; int err2; - unsigned char dce_errstr[dce_c_error_string_len]; + uint8_t dce_errstr[dce_c_error_string_len]; sec_login_purge_context(&my_dce_sec_context, &err); if (err != error_status_ok) -- cgit