summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2011-11-16 15:03:49 +0100
committerStefan Metzmacher <metze@samba.org>2011-11-16 19:02:12 +0100
commit9430fbf9225c60976c27cf3e3f7d1fdae88ebfb0 (patch)
tree9dba1971f2b1ed7007d7d38650c373b35adabc0e
parente4934a1e427ec01576beb4fe21d2775b75adeb0b (diff)
downloadsamba-9430fbf9225c60976c27cf3e3f7d1fdae88ebfb0.tar.gz
samba-9430fbf9225c60976c27cf3e3f7d1fdae88ebfb0.tar.bz2
samba-9430fbf9225c60976c27cf3e3f7d1fdae88ebfb0.zip
s3-torture: replace cli_errstr() with nt_errstr()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/torture/torture.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 4a5f7908a3..7b3c6a4191 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -6347,6 +6347,9 @@ static bool run_error_map_extract(int dummy) {
return False;
}
+ c_nt->map_dos_errors = false;
+ c_dos->map_dos_errors = false;
+
for (error=(0xc0000000 | 0x1); error < (0xc0000000| 0xFFF); error++) {
fstr_sprintf(user, "%X", error);
@@ -6359,11 +6362,11 @@ static bool run_error_map_extract(int dummy) {
}
/* Case #1: 32-bit NT errors */
- if (cli_is_nt_error(c_nt)) {
- nt_status = cli_nt_error(c_nt);
+ if (!NT_STATUS_IS_DOS(status)) {
+ nt_status = status;
} else {
printf("/** Dos error on NT connection! (%s) */\n",
- cli_errstr(c_nt));
+ nt_errstr(status));
nt_status = NT_STATUS(0xc0000000);
}
@@ -6376,12 +6379,13 @@ static bool run_error_map_extract(int dummy) {
}
/* Case #1: 32-bit NT errors */
- if (!cli_is_dos_error(c_dos)) {
+ if (NT_STATUS_IS_DOS(status)) {
printf("/** NT error on DOS connection! (%s) */\n",
- cli_errstr(c_dos));
+ nt_errstr(status));
errnum = errclass = 0;
} else {
- cli_dos_error(c_dos, &errclass, &errnum);
+ errclass = NT_STATUS_DOS_CLASS(status);
+ errnum = NT_STATUS_DOS_CODE(status);
}
if (NT_STATUS_V(nt_status) != error) {