diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-30 15:26:43 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-04-30 15:26:43 -0700 |
| commit | 8cf78ff55312768d0b454b1d7e0560e04e6296da (patch) | |
| tree | 0a2180f063e3bb9872c2565c92075dfb5dccac81 /source3/torture/mangle_test.c | |
| parent | ab4b8c9c0438bc5afca17e3ebf05dde6f98bc0aa (diff) | |
| download | samba-8cf78ff55312768d0b454b1d7e0560e04e6296da.tar.gz samba-8cf78ff55312768d0b454b1d7e0560e04e6296da.tar.bz2 samba-8cf78ff55312768d0b454b1d7e0560e04e6296da.zip | |
Get medieval on our ass about SMB1 file descriptors being 16 bits, not an int.
Convert all uses of cli_open(), cli_nt_createXXX to NTSTATUS versions.
This is smaller than it looks, it just fixes a lot of old code.
Next up, ensure all cli_XX functions return NTSTATUS.
Jeremy.
Diffstat (limited to 'source3/torture/mangle_test.c')
| -rw-r--r-- | source3/torture/mangle_test.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/torture/mangle_test.c b/source3/torture/mangle_test.c index e4468945c1..6ea6c5732c 100644 --- a/source3/torture/mangle_test.c +++ b/source3/torture/mangle_test.c @@ -29,7 +29,7 @@ static unsigned total, collisions, failures; static bool test_one(struct cli_state *cli, const char *name) { - int fnum; + uint16_t fnum; fstring shortname; fstring name2; NTSTATUS status; @@ -37,8 +37,7 @@ static bool test_one(struct cli_state *cli, const char *name) total++; - fnum = cli_open(cli, name, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - if (fnum == -1) { + if (!NT_STATUS_IS_OK(cli_open(cli, name, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum))) { printf("open of %s failed (%s)\n", name, cli_errstr(cli)); return False; } @@ -63,8 +62,7 @@ static bool test_one(struct cli_state *cli, const char *name) } /* recreate by short name */ - fnum = cli_open(cli, name2, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - if (fnum == -1) { + if (!NT_STATUS_IS_OK(cli_open(cli, name2, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum))) { printf("open2 of %s failed (%s)\n", name2, cli_errstr(cli)); return False; } |