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

RAP error strings take precedence as they are not encoded in the SMB header

Browse Source 
(ie. the call can succeed, but still be an encoded error).
Jeremy.
(This used to be commit 3c68b94199)
This commit is contained in:
Jeremy Allison 2001-12-10 19:18:56 +00:00
parent 3bc9ef34b1
commit 775c3876db
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/libsmb/clierror.c
View File

@ -72,7 +72,14 @@ char *cli_errstr(struct cli_state *cli)
uint8 errclass;
int i;
/* Case #1: 32-bit NT errors */
/* Case #1: RAP error */
for (i = 0; rap_errmap[i].message != NULL; i++) {
if (rap_errmap[i].err == cli->rap_error) {
return rap_errmap[i].message;
}
}
/* Case #2: 32-bit NT errors */
if (flgs2 & FLAGS2_32_BIT_ERROR_CODES) {
NTSTATUS status = NT_STATUS(IVAL(cli->inbuf,smb_rcls));
@ -81,18 +88,11 @@ char *cli_errstr(struct cli_state *cli)
cli_dos_error(cli, &errclass, &errnum);
/* Case #2: SMB error */
/* Case #3: SMB error */
if (errclass != 0)
return cli_smb_errstr(cli);
/* Case #3: 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, "code %d",
cli->rap_error);