summaryrefslogtreecommitdiff
path: root/source3/torture
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-01-11 12:04:14 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-01-11 12:04:14 +0000
commit73b0a2bdf8b667a5ad70bb4bcc08409e8c9ef7aa (patch)
treeb5a056ba7516c5b4f5073b8a98338b82ff57afe2 /source3/torture
parent22d6569ed514bac025958d6cfdc99ec472a3f5cb (diff)
downloadsamba-73b0a2bdf8b667a5ad70bb4bcc08409e8c9ef7aa.tar.gz
samba-73b0a2bdf8b667a5ad70bb4bcc08409e8c9ef7aa.tar.bz2
samba-73b0a2bdf8b667a5ad70bb4bcc08409e8c9ef7aa.zip
Fix a number of client-side fstring/pstring mixups.
Andrew Bartlett (This used to be commit fe1cc779d5ea77e87dbc0e2edf7c34a354fee6e0)
Diffstat (limited to 'source3/torture')
-rw-r--r--source3/torture/locktest.c16
-rw-r--r--source3/torture/locktest2.c8
-rw-r--r--source3/torture/masktest.c8
-rw-r--r--source3/torture/torture.c8
4 files changed, 20 insertions, 20 deletions
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;
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;
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 9b83619e85..df0a047aff 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -213,7 +213,7 @@ struct cli_state *connect_one(char *share)
if (!got_pass) {
char *pass = getpass("Password: ");
if (pass) {
- pstrcpy(password, pass);
+ fstrcpy(password, pass);
}
}
@@ -456,7 +456,7 @@ static void usage(void)
load_interfaces();
if (getenv("USER")) {
- pstrcpy(username,getenv("USER"));
+ fstrcpy(username,getenv("USER"));
}
seed = time(NULL);
@@ -479,11 +479,11 @@ static void usage(void)
max_protocol = interpret_protocol(optarg, max_protocol);
break;
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;
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 5b25002213..5466d8ef9e 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -4055,7 +4055,7 @@ static void usage(void)
get_myname(myname);
if (*username == 0 && getenv("LOGNAME")) {
- pstrcpy(username,getenv("LOGNAME"));
+ fstrcpy(username,getenv("LOGNAME"));
}
argc--;
@@ -4110,11 +4110,11 @@ static void usage(void)
#endif
break;
case 'U':
- pstrcpy(username,optarg);
+ fstrcpy(username,optarg);
p = strchr_m(username,'%');
if (p) {
*p = 0;
- pstrcpy(password, p+1);
+ fstrcpy(password, p+1);
gotpass = 1;
}
break;
@@ -4128,7 +4128,7 @@ static void usage(void)
while (!gotpass) {
p = getpass("Password:");
if (p) {
- pstrcpy(password, p);
+ fstrcpy(password, p);
gotpass = 1;
}
}