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)

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;
 		}
 	}