sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Use the new client error api.

Browse Source
This commit is contained in:
Tim Potter 0001-01-01 00:00:00 +00:00
parent 6dbdb0d813
commit 688da3c41d
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/auth/auth_domain.c
View File

@ -360,7 +360,7 @@ uint32 domain_client_validate(const auth_usersupplied_info *user_info,
user_info->nt_resp.buffer, user_info->lm_resp.len,
&ctr, &info3);
cli_error(&cli, NULL, NULL, &nt_status);
nt_status = cli_nt_error(&cli);
if (nt_status != NT_STATUS_NOPROBLEMO) {
DEBUG(0,("domain_client_validate: unable to validate password for user %s in domain \
%s to Domain controller %s. Error was %s.\n", user_info->smb_username.str, user_info->domain.str, remote_machine, cli_errstr(&cli)));

4
source/lib/cmd_interp.c
View File

@ -1363,7 +1363,7 @@ int command_main(int argc, char *argv[])
/* Should we exit? Are we done? */
if (cmd_set_options & (CMD_HELP|CMD_STR)) {
free_connections();
get_safe_nt_error_msg(status, msg, sizeof(msg));
get_nt_error_msg(status, msg, sizeof(msg));
report(out_hnd, "Exit Status: %s\n", msg);
/* unix only has 8 bit error codes - blergh */
@ -1383,7 +1383,7 @@ int command_main(int argc, char *argv[])
commands = NULL;
/* report and exit */
get_safe_nt_error_msg(status, msg, sizeof(msg));
get_nt_error_msg(status, msg, sizeof(msg));
report(out_hnd, "Exit Status: %s\n", msg);
return status;
}

6
source/rpc_client/cli_pipe.c
View File

@ -81,7 +81,8 @@ static BOOL rpc_read(struct cli_state *cli, prs_struct *rdata, uint32 data_to_re
DEBUG(5,("rpc_read: num_read = %d, read offset: %d, to read: %d\n",
num_read, stream_offset, data_to_read));
if (cli_error(cli, &eclass, &ecode, NULL) &&
if (cli_is_dos_error(cli) &&
cli_dos_error(cli, &eclass, &ecode) &&
(eclass != ERRDOS && ecode != ERRmoredata)) {
DEBUG(0,("rpc_read: Error %d/%u in cli_read\n",
eclass, (unsigned int)ecode));
@ -468,7 +469,8 @@ static BOOL rpc_api_pipe(struct cli_state *cli, uint16 cmd, prs_struct *data, pr
prs_give_memory(&hps, hdr_data, sizeof(hdr_data), False);
num_read = cli_read(cli, cli->nt_pipe_fnum, hdr_data, 0, RPC_HEADER_LEN+RPC_HDR_RESP_LEN);
if (cli_error(cli, &eclass, &ecode, NULL) &&
if (cli_is_dos_error(cli) &&
cli_dos_error(cli, &eclass, &ecode) &&
(eclass != ERRDOS && ecode != ERRmoredata)) {
DEBUG(0,("rpc_api_pipe: cli_read error : %d/%d\n",
eclass, ecode));

2
source/smbd/auth_domain.c
View File

@ -360,7 +360,7 @@ uint32 domain_client_validate(const auth_usersupplied_info *user_info,
user_info->nt_resp.buffer, user_info->lm_resp.len,
&ctr, &info3);
cli_error(&cli, NULL, NULL, &nt_status);
nt_status = cli_nt_error(&cli);
if (nt_status != NT_STATUS_NOPROBLEMO) {
DEBUG(0,("domain_client_validate: unable to validate password for user %s in domain \
%s to Domain controller %s. Error was %s.\n", user_info->smb_username.str, user_info->domain.str, remote_machine, cli_errstr(&cli)));