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

s3: Avoid a few calls to cli_errstr

Browse Source 
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Mon Jan 17 08:47:25 CET 2011 on sn-devel-104
This commit is contained in:
Volker Lendecke 2011-01-16 21:13:29 +01:00 committed by Volker Lendecke
parent c7a5933e4b
commit d3abc90401
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/auth/auth_server.c
View File

@ -135,11 +135,11 @@ static struct cli_state *server_cryptkey(TALLOC_CTX *mem_ctx)
this one...
*/
if (!NT_STATUS_IS_OK(cli_session_setup(cli, "", "", 0, "", 0,
""))) {
status = cli_session_setup(cli, "", "", 0, "", 0, "");
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(mutex);
DEBUG(0,("%s rejected the initial session setup (%s)\n",
desthost, cli_errstr(cli)));
desthost, nt_errstr(status)));
cli_shutdown(cli);
return NULL;
}

16
source3/client/smbspool.c
View File

@ -558,6 +558,7 @@ smb_print(struct cli_state * cli, /* I - SMB connection */
tbytes; /* Total bytes read */
char buffer[8192], /* Buffer for copy */
*ptr; /* Pointer into title */
NTSTATUS nt_status;
/*
@ -574,10 +575,12 @@ smb_print(struct cli_state * cli, /* I - SMB connection */
* Open the printer device...
*/
if (!NT_STATUS_IS_OK(cli_open(cli, title, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum))) {
nt_status = cli_open(cli, title, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE,
&fnum);
if (!NT_STATUS_IS_OK(nt_status)) {
fprintf(stderr, "ERROR: %s opening remote spool %s\n",
cli_errstr(cli), title);
return (get_exit_code(cli, cli_nt_error(cli)));
nt_errstr(nt_status), title);
return get_exit_code(cli, nt_status);
}
/*
@ -602,10 +605,11 @@ smb_print(struct cli_state * cli, /* I - SMB connection */
tbytes += nbytes;
}
if (!NT_STATUS_IS_OK(cli_close(cli, fnum))) {
nt_status = cli_close(cli, fnum);
if (!NT_STATUS_IS_OK(nt_status)) {
fprintf(stderr, "ERROR: %s closing remote spool %s\n",
cli_errstr(cli), title);
return (get_exit_code(cli, cli_nt_error(cli)));
nt_errstr(nt_status), title);
return get_exit_code(cli, nt_status);
} else {
return (0);
}