summaryrefslogtreecommitdiff
path: root/source3/torture
diff options
context:
space:
mode:
Diffstat (limited to 'source3/torture')
-rw-r--r--source3/torture/locktest.c4
-rw-r--r--source3/torture/locktest2.c4
-rw-r--r--source3/torture/masktest.c10
-rw-r--r--source3/torture/rpctorture.c4
-rw-r--r--source3/torture/torture.c4
5 files changed, 13 insertions, 13 deletions
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index 2eaa6057c6..f7f7c580aa 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -120,7 +120,7 @@ struct cli_state *connect_one(char *share)
static int count;
fstrcpy(server,share+2);
- share = strchr(server,'\\');
+ share = strchr_m(server,'\\');
if (!share) return NULL;
*share = 0;
share++;
@@ -524,7 +524,7 @@ static void usage(void)
switch (opt) {
case 'U':
pstrcpy(username,optarg);
- p = strchr(username,'%');
+ p = strchr_m(username,'%');
if (p) {
*p = 0;
pstrcpy(password, p+1);
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 171386dec3..37baa62b73 100644
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -162,7 +162,7 @@ struct cli_state *connect_one(char *share)
static int count;
fstrcpy(server,share+2);
- share = strchr(server,'\\');
+ share = strchr_m(server,'\\');
if (!share) return NULL;
*share = 0;
share++;
@@ -577,7 +577,7 @@ static void usage(void)
switch (opt) {
case 'U':
pstrcpy(username,optarg);
- p = strchr(username,'%');
+ p = strchr_m(username,'%');
if (p) {
*p = 0;
pstrcpy(password, p+1);
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index a10a4e954c..0acdb0d95c 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -76,7 +76,7 @@ int ms_fnmatch_lanman_core(char *pattern, char *string)
case '<':
for (; *n; n++) {
if (ms_fnmatch_lanman_core(p, n) == 0) goto match;
- if (*n == '.' && !strchr(n+1,'.')) {
+ if (*n == '.' && !strchr_m(n+1,'.')) {
n++;
break;
}
@@ -146,7 +146,7 @@ static char *reg_test(char *pattern, char *long_name, char *short_name)
static fstring ret;
fstrcpy(ret, "---");
- pattern = 1+strrchr(pattern,'\\');
+ pattern = 1+strrchr_m(pattern,'\\');
if (reg_match_one(pattern, ".")) ret[0] = '+';
if (reg_match_one(pattern, "..")) ret[1] = '+';
@@ -169,7 +169,7 @@ struct cli_state *connect_one(char *share)
extern struct in_addr ipzero;
server = share+2;
- share = strchr(server,'\\');
+ share = strchr_m(server,'\\');
if (!share) return NULL;
*share = 0;
share++;
@@ -289,7 +289,7 @@ static void get_real_name(struct cli_state *cli,
}
#if 0
- if (!strchr(short_name,'.')) {
+ if (!strchr_m(short_name,'.')) {
fstrcat(short_name,".");
}
#endif
@@ -468,7 +468,7 @@ static void usage(void)
break;
case 'U':
pstrcpy(username,optarg);
- p = strchr(username,'%');
+ p = strchr_m(username,'%');
if (p) {
*p = 0;
pstrcpy(password, p+1);
diff --git a/source3/torture/rpctorture.c b/source3/torture/rpctorture.c
index b42c315b1d..1708e9a860 100644
--- a/source3/torture/rpctorture.c
+++ b/source3/torture/rpctorture.c
@@ -394,12 +394,12 @@ enum client_action
{
char *lp;
pstrcpy(smb_cli->user_name,optarg);
- if ((lp=strchr(smb_cli->user_name,'%')))
+ if ((lp=strchr_m(smb_cli->user_name,'%')))
{
*lp = 0;
pstrcpy(password,lp+1);
got_pass = True;
- memset(strchr(optarg,'%')+1,'X',strlen(password));
+ memset(strchr_m(optarg,'%')+1,'X',strlen(password));
}
break;
}
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index a7c50fbfe0..fcf48e0560 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3233,7 +3233,7 @@ static void usage(void)
}
fstrcpy(host, &argv[1][2]);
- p = strchr(&host[2],'/');
+ p = strchr_m(&host[2],'/');
if (!p) {
usage();
}
@@ -3280,7 +3280,7 @@ static void usage(void)
break;
case 'U':
pstrcpy(username,optarg);
- p = strchr(username,'%');
+ p = strchr_m(username,'%');
if (p) {
*p = 0;
pstrcpy(password, p+1);