diff options
author | Andrew Bartlett <abartlet@samba.org> | 2003-01-14 08:53:59 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-14 08:53:59 +0000 |
commit | 27b7e51a3cc619f879655a3230611457ac43b9e7 (patch) | |
tree | 7aeb0ed6623ea91092320f13bb12eb167c446809 /source3/torture/locktest2.c | |
parent | d645041d6345ff2802dd2f06ebed1d8f456fee23 (diff) | |
download | samba-27b7e51a3cc619f879655a3230611457ac43b9e7.tar.gz samba-27b7e51a3cc619f879655a3230611457ac43b9e7.tar.xz samba-27b7e51a3cc619f879655a3230611457ac43b9e7.zip |
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)
Diffstat (limited to 'source3/torture/locktest2.c')
-rw-r--r-- | source3/torture/locktest2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c index 3166d6e326..97844b5609 100644 --- a/source3/torture/locktest2.c +++ b/source3/torture/locktest2.c @@ -169,7 +169,7 @@ static struct cli_state *connect_one(char *share) if (!got_pass) { char *pass = getpass("Password: "); if (pass) { - pstrcpy(password, pass); + fstrcpy(password, pass); } } @@ -504,7 +504,7 @@ static void usage(void) load_interfaces(); if (getenv("USER")) { - pstrcpy(username,getenv("USER")); + fstrcpy(username,getenv("USER")); } seed = time(NULL); @@ -512,11 +512,11 @@ static void usage(void) while ((opt = getopt(argc, argv, "U:s:ho:aAW:O")) != EOF) { switch (opt) { case 'U': - pstrcpy(username,optarg); + fstrcpy(username,optarg); p = strchr_m(username,'%'); if (p) { *p = 0; - pstrcpy(password, p+1); + fstrcpy(password, p+1); got_pass = 1; } break; |