From 2941d3233cc6f2cf6f031ee1254610219f12652a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 22 May 2004 14:40:49 +0000 Subject: r821: prompt user for password if not given by -U user%pass and not as torture:password in smb.conf metze (This used to be commit 9de377a914292be19cdffd1020d613d50df7f4e6) --- source4/torture/torture.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 78674990e8..a3669129de 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -4128,7 +4128,7 @@ static BOOL run_test(const char *name) */ static void parse_user(const char *user) { - char *username, *password, *p; + char *username, *password = NULL, *p; username = strdup(user); p = strchr_m(username,'%'); @@ -4138,9 +4138,17 @@ static void parse_user(const char *user) } lp_set_cmdline("torture:username", username); - lp_set_cmdline("torture:password", password); -} + if (password) { + lp_set_cmdline("torture:password", password); + } + + if (!lp_parm_string(-1,"torture","password")) { + password = getpass("password:"); + + lp_set_cmdline("torture:password", password); + } +} static void usage(void) { @@ -4310,6 +4318,10 @@ static void usage(void) } } + if (!lp_parm_string(-1,"torture","password")) { + lp_set_cmdline("torture:password", ""); + } + if (argc == optind) { printf("You must specify a test to run, or 'ALL'\n"); } else { -- cgit