From 27b7e51a3cc619f879655a3230611457ac43b9e7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 14 Jan 2003 08:53:59 +0000 Subject: Merge from HEAD: - fstring/pstring mixups - the detection code that found them (disabled) - a bit of whitespace - a static Andrew Bartlett (This used to be commit 9b70fa868e7d9481f584c83fc4046174e1dedfd9) --- source3/torture/locktest.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/torture/locktest.c') diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index a62f7af1ad..5f9a63802b 100644 --- a/source3/torture/locktest.c +++ b/source3/torture/locktest.c @@ -193,14 +193,14 @@ static struct cli_state *connect_one(char *share, int snum) if (!got_pass) { char *pass = getpass("Password: "); if (pass) { - pstrcpy(password[0], pass); - pstrcpy(password[1], pass); + fstrcpy(password[0], pass); + fstrcpy(password[1], pass); } } if (got_pass == 1) { - pstrcpy(password[1], password[0]); - pstrcpy(username[1], username[0]); + fstrcpy(password[1], password[0]); + fstrcpy(username[1], username[0]); } if (!cli_session_setup(c, username[snum], @@ -591,8 +591,8 @@ static void usage(void) load_interfaces(); if (getenv("USER")) { - pstrcpy(username[0],getenv("USER")); - pstrcpy(username[1],getenv("USER")); + fstrcpy(username[0],getenv("USER")); + fstrcpy(username[1],getenv("USER")); } seed = time(NULL); @@ -613,11 +613,11 @@ static void usage(void) d_printf("Max of 2 usernames\n"); exit(1); } - pstrcpy(username[got_pass],optarg); + fstrcpy(username[got_pass],optarg); p = strchr_m(username[got_pass],'%'); if (p) { *p = 0; - pstrcpy(password[got_pass], p+1); + fstrcpy(password[got_pass], p+1); got_pass++; } break; -- cgit