summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-05-24 21:11:34 +0000
committerAndrew Tridgell <tridge@samba.org>2000-05-24 21:11:34 +0000
commitd29f8af77babe826158191a1caaea3846626236a (patch)
tree15f37e48b287be1a66473bd14f13c701ed70c7bb
parent0fca9817b16bdd2fe6f25fb2dd1836dac108a141 (diff)
downloadsamba-d29f8af77babe826158191a1caaea3846626236a.tar.gz
samba-d29f8af77babe826158191a1caaea3846626236a.tar.bz2
samba-d29f8af77babe826158191a1caaea3846626236a.zip
minor fixes
(This used to be commit 4d00314ec5b056101b05c38cc68dd4934c83c825)
-rw-r--r--source3/utils/locktest.c4
-rw-r--r--source3/utils/masktest.c7
2 files changed, 4 insertions, 7 deletions
diff --git a/source3/utils/locktest.c b/source3/utils/locktest.c
index e2d05b7aa0..2c24b7d36e 100644
--- a/source3/utils/locktest.c
+++ b/source3/utils/locktest.c
@@ -456,7 +456,6 @@ static void usage(void)
"Usage:\n\
locktest //server1/share1 //server2/share2 [options..]\n\
options:\n\
- -W workgroup\n\
-U user%%pass\n\
-s seed\n\
-o numops\n\
@@ -541,9 +540,6 @@ static void usage(void)
case 'h':
usage();
exit(1);
- case 'W':
- pstrcpy(workgroup, optarg);
- break;
default:
printf("Unknown option %c (%d)\n", (char)opt, opt);
exit(1);
diff --git a/source3/utils/masktest.c b/source3/utils/masktest.c
index dc394dddb5..434494a92a 100644
--- a/source3/utils/masktest.c
+++ b/source3/utils/masktest.c
@@ -204,9 +204,10 @@ static void testpair(struct cli_state *cli, char *mask, char *file)
if (old_list) {
cli_list_old(cli, mask, aHIDDEN | aDIR, listfn);
} else {
- cli_list(cli, mask, aHIDDEN | aDIR, listfn);
- finfo = NULL;
get_short_name(cli, file, short_name);
+ finfo = NULL;
+ fstrcpy(res1, "---");
+ cli_list(cli, mask, aHIDDEN | aDIR, listfn);
}
res2 = reg_test(mask, file, short_name);
@@ -218,7 +219,7 @@ static void testpair(struct cli_state *cli, char *mask, char *file)
cli_unlink(cli, file);
- if (count % 500 == 0) DEBUG(0,("%d\n", count));
+ if (count % 100 == 0) DEBUG(0,("%d\n", count));
}
static void test_mask(int argc, char *argv[],