summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2002-08-29 16:37:39 +0000
committerJelmer Vernooij <jelmer@samba.org>2002-08-29 16:37:39 +0000
commit52ea319236d9aab761aa1429e285ae1eead2589b (patch)
treea9ea8275ed87594d3a705c3b1414fa2250403e7f
parent1ddc80f1b920b5c36d2ac3e0b5b32bfb02caa782 (diff)
downloadsamba-52ea319236d9aab761aa1429e285ae1eead2589b.tar.gz
samba-52ea319236d9aab761aa1429e285ae1eead2589b.tar.bz2
samba-52ea319236d9aab761aa1429e285ae1eead2589b.zip
Correct popt argument info in vfstest
Don't use global_ctx in samtest.c (This used to be commit 0428eb422b50135327daf3040067f5982f1b0b92)
-rw-r--r--source3/torture/samtest.c39
-rw-r--r--source3/torture/vfstest.c2
2 files changed, 2 insertions, 39 deletions
diff --git a/source3/torture/samtest.c b/source3/torture/samtest.c
index a6d1a288b2..56b87dc257 100644
--- a/source3/torture/samtest.c
+++ b/source3/torture/samtest.c
@@ -189,6 +189,7 @@ static NTSTATUS do_cmd(struct sam_context *sam, struct cmd_set *cmd_entry, char
{
char *p = cmd, **argv = NULL;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ TALLOC_CTX *mem_ctx;
pstring buf;
int argc = 0, i;
@@ -327,18 +328,6 @@ BOOL reload_services(BOOL test)
return True;
}
-/* Print usage information */
-static void usage(void)
-{
- printf("Usage: samtest [options]\n");
-
- printf("\t-c or --command \"command string\" execute semicolon separated cmds\n");
- printf("\t-d or --debug debuglevel set the debuglevel\n");
- printf("\t-l or --logfile logfile logfile to use instead of stdout\n");
- printf("\t-h or --help Print this help message.\n");
- printf("\n");
-}
-
/* Main function */
int main(int argc, char *argv[])
@@ -382,32 +371,6 @@ int main(int argc, char *argv[])
lp_set_logfile(logfile);
interactive = False;
break;
-
- case 'd':
- DEBUGLEVEL = opt_debuglevel;
- break;
-
- /*
- case 'U': {
- char *lp;
-
- pstrcpy(username,opt_username);
-
- if ((lp=strchr_m(username,'%'))) {
- *lp = 0;
- pstrcpy(password,lp+1);
- got_pass = 1;
- memset(strchr_m(opt_username,'%') + 1, 'X',
- strlen(password));
- }
- break;
- }
- */
-
- case 'h':
- default:
- usage();
- exit(1);
}
}
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 824e8108bf..9f8062a02e 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -493,7 +493,7 @@ int main(int argc, char *argv[])
POPT_AUTOHELP
{"file", 'f', POPT_ARG_STRING, &filename, 0, },
{"command", 'c', POPT_ARG_STRING, &cmdstr, 0, "Execute specified list of commands" },
- {"logfile", 'l', POPT_ARG_STRING, &opt_logfile, 'l', 0, "Write output to specified logfile" },
+ {"logfile", 'l', POPT_ARG_STRING, &opt_logfile, 'l', "Write output to specified logfile" },
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
{ 0, 0, 0, 0}
};