sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

r549: added support for DOS error codes in NTSTATUS returns. This uses a

Browse Source 
range of NTSTATUS codes that are normally invalid to prevent conflicts
with real error codes.

use the new DOS facility to fix the ERRbaduid return that volker found
(This used to be commit 10fdfb52398857b604fff9684ee65a96d970bdaa)
This commit is contained in:
Andrew Tridgell 2004-05-07 11:56:13 +00:00 committed by Gerald (Jerry) Carter
parent 998aab3d29
commit 7e921fb96d
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source4/include/nt_status.h
View File

@ -60,4 +60,12 @@ typedef uint32 WERROR;
#define W_ERROR_IS_OK(x) (W_ERROR_V(x) == 0)
#define W_ERROR_EQUAL(x,y) (W_ERROR_V(x) == W_ERROR_V(y))
/* this defines special NTSTATUS codes to represent DOS errors. I
have chosen this macro to produce status codes in the invalid
NTSTATUS range */
#define NT_STATUS_DOS(class, code) NT_STATUS(0xF1000000 | ((class)<<16) | code)
#define NT_STATUS_IS_DOS(status) ((NT_STATUS_V(status) & 0xFF000000) == 0xF1000000)
#define NT_STATUS_DOS_CLASS(status) ((NT_STATUS_V(status) >> 16) & 0xFF)
#define NT_STATUS_DOS_CODE(status) (NT_STATUS_V(status) & 0xFFFF)
#endif

11
source4/smb_server/request.c
View File

@ -310,8 +310,15 @@ void req_reply_error(struct request_context *req, NTSTATUS status)
return;
}
SIVAL(req->out.hdr, HDR_RCLS, NT_STATUS_V(status));
SSVAL(req->out.hdr, HDR_FLG2, SVAL(req->out.hdr, HDR_FLG2) | FLAGS2_32_BIT_ERROR_CODES);
if (NT_STATUS_IS_DOS(status)) {
/* its a encoded DOS error, using the reserved range */
SSVAL(req->out.hdr, HDR_RCLS, NT_STATUS_DOS_CLASS(status));
SSVAL(req->out.hdr, HDR_ERR, NT_STATUS_DOS_CODE(status));
SSVAL(req->out.hdr, HDR_FLG2, SVAL(req->out.hdr, HDR_FLG2) & ~FLAGS2_32_BIT_ERROR_CODES);
} else {
SIVAL(req->out.hdr, HDR_RCLS, NT_STATUS_V(status));
SSVAL(req->out.hdr, HDR_FLG2, SVAL(req->out.hdr, HDR_FLG2) | FLAGS2_32_BIT_ERROR_CODES);
}
req_send_reply(req);
}

8
source4/smb_server/smb_server.c
View File

@ -480,6 +480,14 @@ static void switch_message(int type, struct request_context *req)
return;
}
/* see if the vuid is valid */
if ((flags & AS_USER) && !req->user_ctx->vuser) {
if (!(flags & AS_GUEST)) {
req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRbaduid));
return;
}
}
/* does this protocol need to be run as the connected user? */
#if HACK_REWRITE
if ((flags & AS_USER) && !change_to_user(req->conn,session_tag)) {