From 80437a4cc0d88f47fb20901abf28590c35f3b09a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 3 Jan 2002 08:36:47 +0000 Subject: Update the NT_STATUS -> DOS error table. This new table is rather different to the old one (see diff posted to the list for a sorted list of differences) and needs a *lot* of testing. It does however seem to line up much better with what NT is using, as exampled by the change to the OBJECT_NAME_COLLISION DOS error, it now matches win2k where it didn't before. I can't see any critical errors we now get wrong, and I know that the auth errors are correct as per my on-the-wire observations. This table was produced (and I hope to comment this better later) by using the ERRMAPEXTRACT smbtorture tool, a Win2k domain member and the 'name_to_ntstatus' auth module on the HEAD PDC. This module returned the username as the error, and the NT box was forced to give me a dos error becouse thats all I negotiated on that connection. Hence the map. Andrew Bartlett (This used to be commit a855dfb2e0b899d03087860e5462c2aed3ca4cad) --- source3/torture/torture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/torture/torture.c') diff --git a/source3/torture/torture.c b/source3/torture/torture.c index fbc17e0c6b..c8fe9dc0cf 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -2926,7 +2926,7 @@ static BOOL run_error_map_extract(int dummy) { if (flgs2 & FLAGS2_32_BIT_ERROR_CODES) { nt_status = NT_STATUS(IVAL(c_nt.inbuf,smb_rcls)); } else { - printf("/** Dos error on NT connection! (%s)\n */", + printf("/** Dos error on NT connection! (%s) */\n", cli_errstr(&c_nt)); nt_status = NT_STATUS(0xc0000000); } @@ -2941,7 +2941,7 @@ static BOOL run_error_map_extract(int dummy) { /* Case #1: 32-bit NT errors */ if (flgs2 & FLAGS2_32_BIT_ERROR_CODES) { - printf("/** NT error on DOS connection! (%s)\n*/", + printf("/** NT error on DOS connection! (%s) */\n", cli_errstr(&c_nt)); errnum = errclass = 0; } else { @@ -2957,7 +2957,7 @@ static BOOL run_error_map_extract(int dummy) { printf("\t{%s,\t%s,\t%s},\n", smb_dos_err_class(errclass), smb_dos_err_name(errclass, errnum), - get_nt_error_c_code(nt_status)); + get_nt_error_c_code(NT_STATUS(error))); } return True; } -- cgit