#include "includes.h"
#include "libsmb/libsmb.h"
-
-/*****************************************************
- RAP error codes - a small start but will be extended.
-
- XXX: Perhaps these should move into a common function because they're
- duplicated in clirap2.c
-
-*******************************************************/
-
-static const struct {
- int err;
- const char *message;
-} rap_errmap[] = {
- {5, "RAP5: User has insufficient privilege" },
- {50, "RAP50: Not supported by server" },
- {65, "RAP65: Access denied" },
- {86, "RAP86: The specified password is invalid" },
- {2220, "RAP2220: Group does not exist" },
- {2221, "RAP2221: User does not exist" },
- {2226, "RAP2226: Operation only permitted on a Primary Domain Controller" },
- {2237, "RAP2237: User is not in group" },
- {2242, "RAP2242: The password of this user has expired." },
- {2243, "RAP2243: The password of this user cannot change." },
- {2244, "RAP2244: This password cannot be used now (password history conflict)." },
- {2245, "RAP2245: The password is shorter than required." },
- {2246, "RAP2246: The password of this user is too recent to change."},
-
- {0, NULL}
-};
-
-/****************************************************************************
- Return a description of an SMB error.
-****************************************************************************/
-
-static const char *cli_smb_errstr(struct cli_state *cli)
-{
- return smb_dos_errstr(cli->inbuf);
-}
-
-/****************************************************************************
- Convert a socket error into an NTSTATUS.
-****************************************************************************/
-
-static NTSTATUS cli_smb_rw_error_to_ntstatus(struct cli_state *cli)
-{
- switch(cli->smb_rw_error) {
- case SMB_READ_TIMEOUT:
- return NT_STATUS_IO_TIMEOUT;
- case SMB_READ_EOF:
- return NT_STATUS_END_OF_FILE;
- /* What we shoud really do for read/write errors is convert from errno. */
- /* FIXME. JRA. */
- case SMB_READ_ERROR:
- return NT_STATUS_INVALID_NETWORK_RESPONSE;
- case SMB_WRITE_ERROR:
- return NT_STATUS_UNEXPECTED_NETWORK_ERROR;
- case SMB_READ_BAD_SIG:
- return NT_STATUS_INVALID_PARAMETER;
- case SMB_NO_MEMORY:
- return NT_STATUS_NO_MEMORY;
- default:
- break;
- }
- return NT_STATUS_UNSUCCESSFUL;
-}
+#include "../libcli/smb/smbXcli_base.h"
/***************************************************************************
Return an error message - either an NT error, SMB error or a RAP error.
const char *cli_errstr(struct cli_state *cli)
{
fstring cli_error_message;
- uint32 flgs2 = SVAL(cli->inbuf,smb_flg2), errnum;
- uint8 errclass;
- int i;
char *result;
if (!cli->initialised) {
goto done;
}
- /* Was it server socket error ? */
- if (cli->fd == -1 && cli->smb_rw_error) {
- switch(cli->smb_rw_error) {
- case SMB_READ_TIMEOUT:
- slprintf(cli_error_message, sizeof(cli_error_message) - 1,
- "Call timed out: server did not respond after %d milliseconds",
- cli->timeout);
- break;
- case SMB_READ_EOF:
- slprintf(cli_error_message, sizeof(cli_error_message) - 1,
- "Call returned zero bytes (EOF)" );
- break;
- case SMB_READ_ERROR:
- slprintf(cli_error_message, sizeof(cli_error_message) - 1,
- "Read error: %s", strerror(errno) );
- break;
- case SMB_WRITE_ERROR:
- slprintf(cli_error_message, sizeof(cli_error_message) - 1,
- "Write error: %s", strerror(errno) );
- break;
- case SMB_READ_BAD_SIG:
- slprintf(cli_error_message, sizeof(cli_error_message) - 1,
- "Server packet had invalid SMB signature!");
- break;
- case SMB_NO_MEMORY:
- slprintf(cli_error_message, sizeof(cli_error_message) - 1,
- "Out of memory");
- break;
- default:
- slprintf(cli_error_message, sizeof(cli_error_message) - 1,
- "Unknown error code %d\n", cli->smb_rw_error );
- break;
- }
- goto done;
- }
-
/* Case #1: RAP error */
if (cli->rap_error) {
- for (i = 0; rap_errmap[i].message != NULL; i++) {
- if (rap_errmap[i].err == cli->rap_error) {
- return rap_errmap[i].message;
- }
- }
-
- slprintf(cli_error_message, sizeof(cli_error_message) - 1, "RAP code %d",
- cli->rap_error);
-
+ strlcpy(cli_error_message, win_errstr(W_ERROR(cli->rap_error)),
+ sizeof(cli_error_message));
goto done;
}
- /* Case #2: 32-bit NT errors */
- if (flgs2 & FLAGS2_32_BIT_ERROR_CODES) {
- NTSTATUS status = NT_STATUS(IVAL(cli->inbuf,smb_rcls));
-
- return nt_errstr(status);
- }
-
- cli_dos_error(cli, &errclass, &errnum);
-
- /* Case #3: SMB error */
-
- return cli_smb_errstr(cli);
+ if (!cli_state_is_connected(cli) && NT_STATUS_IS_OK(cli->raw_status)) {
+ return nt_errstr(NT_STATUS_CONNECTION_DISCONNECTED);
+ }
+ return nt_errstr(cli->raw_status);
done:
result = talloc_strdup(talloc_tos(), cli_error_message);
SMB_ASSERT(result);
NTSTATUS cli_nt_error(struct cli_state *cli)
{
- int flgs2 = SVAL(cli->inbuf,smb_flg2);
-
/* Deal with socket errors first. */
- if (cli->fd == -1 && cli->smb_rw_error) {
- return cli_smb_rw_error_to_ntstatus(cli);
+ if (!cli_state_is_connected(cli)) {
+ return NT_STATUS_CONNECTION_DISCONNECTED;
}
- if (!(flgs2 & FLAGS2_32_BIT_ERROR_CODES)) {
- int e_class = CVAL(cli->inbuf,smb_rcls);
- int code = SVAL(cli->inbuf,smb_err);
+ if (NT_STATUS_IS_DOS(cli->raw_status)) {
+ int e_class = NT_STATUS_DOS_CLASS(cli->raw_status);
+ int code = NT_STATUS_DOS_CODE(cli->raw_status);
return dos_to_ntstatus(e_class, code);
- }
+ }
- return NT_STATUS(IVAL(cli->inbuf,smb_rcls));
+ return cli->raw_status;
}
void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode)
{
- int flgs2;
-
- if(!cli->initialised) {
+ if (!cli_state_is_connected(cli)) {
+ *eclass = ERRDOS;
+ *ecode = ERRnotconnected;
return;
}
- /* Deal with socket errors first. */
- if (cli->fd == -1 && cli->smb_rw_error) {
- NTSTATUS status = cli_smb_rw_error_to_ntstatus(cli);
- ntstatus_to_dos( status, eclass, ecode);
+ if (!NT_STATUS_IS_DOS(cli->raw_status)) {
+ ntstatus_to_dos(cli->raw_status, eclass, ecode);
return;
}
- flgs2 = SVAL(cli->inbuf,smb_flg2);
-
- if (flgs2 & FLAGS2_32_BIT_ERROR_CODES) {
- NTSTATUS ntstatus = NT_STATUS(IVAL(cli->inbuf, smb_rcls));
- ntstatus_to_dos(ntstatus, eclass, ecode);
- return;
- }
-
- *eclass = CVAL(cli->inbuf,smb_rcls);
- *ecode = SVAL(cli->inbuf,smb_err);
+ *eclass = NT_STATUS_DOS_CLASS(cli->raw_status);
+ *ecode = NT_STATUS_DOS_CODE(cli->raw_status);
}
bool cli_is_error(struct cli_state *cli)
{
- uint32 flgs2 = SVAL(cli->inbuf,smb_flg2), rcls = 0;
-
/* A socket error is always an error. */
- if (cli->fd == -1 && cli->smb_rw_error != 0) {
- return True;
+ if (!cli_state_is_connected(cli)) {
+ return true;
}
- if (flgs2 & FLAGS2_32_BIT_ERROR_CODES) {
- /* Return error is error bits are set */
- rcls = IVAL(cli->inbuf, smb_rcls);
- return (rcls & 0xF0000000) == 0xC0000000;
- }
-
- /* Return error if error class in non-zero */
+ if (NT_STATUS_IS_DOS(cli->raw_status)) {
+ /* Return error if error class in non-zero */
+ uint8_t rcls = NT_STATUS_DOS_CLASS(cli->raw_status);
+ return rcls != 0;
+ }
- rcls = CVAL(cli->inbuf, smb_rcls);
- return rcls != 0;
+ return NT_STATUS_IS_ERR(cli->raw_status);
}
/* Return true if the last error was an NT error */
bool cli_is_nt_error(struct cli_state *cli)
{
- uint32 flgs2 = SVAL(cli->inbuf,smb_flg2);
-
/* A socket error is always an NT error. */
- if (cli->fd == -1 && cli->smb_rw_error != 0) {
- return True;
+ if (!cli_state_is_connected(cli)) {
+ return true;
}
- return cli_is_error(cli) && (flgs2 & FLAGS2_32_BIT_ERROR_CODES);
+ return cli_is_error(cli) && !NT_STATUS_IS_DOS(cli->raw_status);
}
/* Return true if the last error was a DOS error */
bool cli_is_dos_error(struct cli_state *cli)
{
- uint32 flgs2 = SVAL(cli->inbuf,smb_flg2);
-
/* A socket error is always a DOS error. */
- if (cli->fd == -1 && cli->smb_rw_error != 0) {
- return True;
+ if (!cli_state_is_connected(cli)) {
+ return true;
}
- return cli_is_error(cli) && !(flgs2 & FLAGS2_32_BIT_ERROR_CODES);
+ return cli_is_error(cli) && NT_STATUS_IS_DOS(cli->raw_status);
}
bool cli_state_is_connected(struct cli_state *cli)
return false;
}
- if (cli->fd == -1) {
- return false;
- }
-
- return true;
+ return smbXcli_conn_is_connected(cli->conn);
}
-
git.samba.org / sfrench / samba-autobuild / .git / blobdiff