sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

Converted to new error API.

Browse Source 
Now that we support NT errors from the client, appropriate values will need
to be filled in for the various invocations of check_error() within the
torture code.
(This used to be commit 577f6065f6)
This commit is contained in:
Tim Potter 2001-08-13 04:08:42 +00:00
parent ce5233ffb3
commit e7630562c9
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source3/torture/torture.c
View File

@ -171,17 +171,36 @@ static BOOL close_connection(struct cli_state *c)
static BOOL check_error(struct cli_state *c,
uint8 eclass, uint32 ecode, uint32 nterr)
{
if (cli_is_dos_error(c)) {
uint8 class;
uint32 num;
(void)cli_error(c, &class, &num, NULL);
if ((eclass != class || ecode != num) &&
num != (nterr&0xFFFFFF)) {
/* Check DOS error */
cli_dos_error(c, &class, &num);
if (eclass != class || ecode != num) {
printf("unexpected error code class=%d code=%d\n",
(int)class, (int)num);
printf(" expected %d/%d %d\n",
(int)eclass, (int)ecode, (int)nterr);
return False;
}
} else {
uint32 status;
/* Check NT error */
status = cli_nt_error(c);
if (nterr != status) {
printf("unexpected error code 0x%08x\n", status);
printf(" expected 0x%08x\n", nterr);
return False;
}
}
return True;
}
@ -2785,8 +2804,6 @@ static BOOL run_opentest(int dummy)
static struct cli_state cli1;
char *fname = "\\readonly.file";
int fnum1, fnum2;
uint8 eclass;
uint32 errnum;
char buf[20];
size_t fsize;
BOOL correct = True;
@ -2827,17 +2844,10 @@ static BOOL run_opentest(int dummy)
/* This will fail - but the error should be ERRnoaccess, not ERRbadshare. */
fnum2 = cli_open(&cli1, fname, O_RDWR, DENY_ALL);
cli_error( &cli1, &eclass, &errnum, NULL);
if (eclass != ERRDOS || errnum != ERRnoaccess) {
printf("wrong error code (%x,%x) = %s\n", (unsigned int)eclass,
(unsigned int)errnum, cli_errstr(&cli1) );
correct = False;
} else {
if (check_error(&cli1, ERRDOS, ERRnoaccess, 0)) {
printf("correct error code ERRDOS/ERRnoaccess returned\n");
}
printf("finished open test 1\n");
cli_close(&cli1, fnum1);
@ -2855,13 +2865,7 @@ static BOOL run_opentest(int dummy)
/* This will fail - but the error should be ERRshare. */
fnum2 = cli_open(&cli1, fname, O_RDWR, DENY_ALL);
cli_error( &cli1, &eclass, &errnum, NULL);
if (eclass != ERRDOS || errnum != ERRbadshare) {
printf("wrong error code (%x,%x) = %s\n", (unsigned int)eclass,
(unsigned int)errnum, cli_errstr(&cli1) );
correct = False;
} else {
if (check_error(&cli1, ERRDOS, ERRbadshare, 0)) {
printf("correct error code ERRDOS/ERRbadshare returned\n");
}