summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-01-16 21:13:29 +0100
committerVolker Lendecke <vlendec@samba.org>2011-01-17 08:47:25 +0100
commitd3abc90401c65e66de26cdfb2432ef023732dce7 (patch)
treef0b1b91e399b67baa210f90a84e789276fd8158a
parentc7a5933e4b907d0dc50c01b299a5822392c86049 (diff)
downloadsamba-d3abc90401c65e66de26cdfb2432ef023732dce7.tar.gz
samba-d3abc90401c65e66de26cdfb2432ef023732dce7.tar.bz2
samba-d3abc90401c65e66de26cdfb2432ef023732dce7.zip
s3: Avoid a few calls to cli_errstr
Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Mon Jan 17 08:47:25 CET 2011 on sn-devel-104
-rw-r--r--source3/auth/auth_server.c6
-rw-r--r--source3/client/smbspool.c16
2 files changed, 13 insertions, 9 deletions
diff --git a/source3/auth/auth_server.c b/source3/auth/auth_server.c
index ac757d5a35..fc46ce0148 100644
--- a/source3/auth/auth_server.c
+++ b/source3/auth/auth_server.c
@@ -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;
}
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 0804eb56ec..c80ad42dd9 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -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);
}