4 files changed, 3 insertions, 8 deletions
diff --git a/source3/include/charset.h b/source3/include/charset.h
index 7c6fbe5509..117de75c00 100644
--- a/source3/include/charset.h
+++ b/source3/include/charset.h
@@ -63,7 +63,7 @@ extern void charset_initialise(void);
 
 /* this is used to determine if a character is safe to use in
    something that may be put on a command line */
-#define issafe(c) (isalnum((c&0xff)) || strchr("-._",c))
+#define issafe(c) (isalnum((c&0xff)) || strchr_m("-._",c))
 #endif
 
 /* Dynamic codepage files defines. */
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 9ed7401df3..7c1a4a8607 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -611,11 +611,6 @@ extern char *sys_errlist[];
 #define strerror(i) sys_errlist[i]
 #endif
 
-#ifndef HAVE_STRCHR
-# define strchr                 index
-# define strrchr                rindex
-#endif
-
 #ifndef HAVE_ERRNO_DECL
 extern int errno;
 #endif
diff --git a/source3/lib/cmd_interp.c b/source3/lib/cmd_interp.c
index 292f0e9e9e..52f025636a 100644
--- a/source3/lib/cmd_interp.c
+++ b/source3/lib/cmd_interp.c
@@ -895,7 +895,7 @@ static void read_authfile (char *filename, char* username, char* password)
 		/* break up the line into parameter & value.
 		   will need to eat a little whitespace possibly */
 		param = buf;
-		if (!(ptr = strchr (buf, '=')))
+		if (!(ptr = strchr_m(buf, '=')))
 			continue;
 		val = ptr+1;
 		*ptr = '\0';
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 6e4d60d208..e66b15bb11 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -132,7 +132,7 @@ static void read_authfile (
 		/* break up the line into parameter & value.
 		   will need to eat a little whitespace possibly */
 		param = buf;
-		if (!(ptr = strchr (buf, '=')))
+		if (!(ptr = strchr_m(buf, '=')))
 			continue;
 		val = ptr+1;
 		*ptr = '\0';