diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-04-28 08:54:51 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-04-28 08:54:51 +0000 |
| commit | d031ba5c83d3243a7509692097c3a1a25aa34553 (patch) | |
| tree | 2acdc279c9e497cb31d7ce703ba6fc696cb063ce /source3/torture/scanner.c | |
| parent | d31cb1b4684e7b3288d5841bf206379ba8149e8a (diff) | |
| download | samba-d031ba5c83d3243a7509692097c3a1a25aa34553.tar.gz samba-d031ba5c83d3243a7509692097c3a1a25aa34553.tar.bz2 samba-d031ba5c83d3243a7509692097c3a1a25aa34553.zip | |
Merge compile and other fixes from 3.0 to HEAD.
Including smbtorture bugfixes, and a better TCONDEV test.
Andrew Bartlett
(This used to be commit 52c5806004022f153af7d022afdb3ec7cc0d2548)
Diffstat (limited to 'source3/torture/scanner.c')
| -rw-r--r-- | source3/torture/scanner.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c index 7db3dde9c0..93f89c105c 100644 --- a/source3/torture/scanner.c +++ b/source3/torture/scanner.c @@ -191,7 +191,7 @@ static BOOL scan_trans2(struct cli_state *cli, int op, int level, BOOL torture_trans2_scan(int dummy) { - static struct cli_state cli; + static struct cli_state *cli; int op, level; const char *fname = "\\scanner.dat"; int fnum, dnum; @@ -202,26 +202,26 @@ BOOL torture_trans2_scan(int dummy) return False; } - fnum = cli_open(&cli, fname, O_RDWR | O_CREAT | O_TRUNC, + fnum = cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); - dnum = cli_open(&cli, "\\", O_RDONLY, DENY_NONE); + dnum = cli_open(cli, "\\", O_RDONLY, DENY_NONE); for (op=OP_MIN; op<=OP_MAX; op++) { printf("Scanning op=%d\n", op); for (level = 0; level <= 50; level++) { - scan_trans2(&cli, op, level, fnum, dnum, fname); + scan_trans2(cli, op, level, fnum, dnum, fname); } for (level = 0x100; level <= 0x130; level++) { - scan_trans2(&cli, op, level, fnum, dnum, fname); + scan_trans2(cli, op, level, fnum, dnum, fname); } for (level = 1000; level < 1050; level++) { - scan_trans2(&cli, op, level, fnum, dnum, fname); + scan_trans2(cli, op, level, fnum, dnum, fname); } } - torture_close_connection(&cli); + torture_close_connection(cli); printf("trans2 scan finished\n"); return True; @@ -393,7 +393,7 @@ static BOOL scan_nttrans(struct cli_state *cli, int op, int level, BOOL torture_nttrans_scan(int dummy) { - static struct cli_state cli; + static struct cli_state *cli; int op, level; const char *fname = "\\scanner.dat"; int fnum, dnum; @@ -404,26 +404,26 @@ BOOL torture_nttrans_scan(int dummy) return False; } - fnum = cli_open(&cli, fname, O_RDWR | O_CREAT | O_TRUNC, + fnum = cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); - dnum = cli_open(&cli, "\\", O_RDONLY, DENY_NONE); + dnum = cli_open(cli, "\\", O_RDONLY, DENY_NONE); for (op=OP_MIN; op<=OP_MAX; op++) { printf("Scanning op=%d\n", op); for (level = 0; level <= 50; level++) { - scan_nttrans(&cli, op, level, fnum, dnum, fname); + scan_nttrans(cli, op, level, fnum, dnum, fname); } for (level = 0x100; level <= 0x130; level++) { - scan_nttrans(&cli, op, level, fnum, dnum, fname); + scan_nttrans(cli, op, level, fnum, dnum, fname); } for (level = 1000; level < 1050; level++) { - scan_nttrans(&cli, op, level, fnum, dnum, fname); + scan_nttrans(cli, op, level, fnum, dnum, fname); } } - torture_close_connection(&cli); + torture_close_connection(cli); printf("nttrans scan finished\n"); return True; |