strchr and strrchr are macros when compiling with optimisation in gcc, so we can't redefine them. damn.

(This used to be commit c41fc06376d1a2b83690612304e85010b5e5f3cf)

6 files changed, 11 insertions, 11 deletions

diff --git a/source3/nsswitch/wb_client.c b/source3/nsswitch/wb_client.c
index 2a29773b9e..05c68d240c 100644
--- a/source3/nsswitch/wb_client.c
+++ b/source3/nsswitch/wb_client.c
@@ -36,8 +36,8 @@ static void parse_domain_user(char *domuser, fstring domain, fstring user)
         char *p;
         char *sep = lp_winbind_separator();
         if (!sep) sep = "\\";
-        p = strchr(domuser,*sep);
-        if (!p) p = strchr(domuser,'\\');
+        p = strchr_m(domuser,*sep);
+        if (!p) p = strchr_m(domuser,'\\');
         if (!p) {
                 fstrcpy(domain,"");
                 fstrcpy(user, domuser);
@@ -286,7 +286,7 @@ int winbind_initgroups(char *user, gid_t gid)
 
 	sep = lp_winbind_separator();
 
-	if (!strchr(user, *sep)) {
+	if (!strchr_m(user, *sep)) {
 		return initgroups(user, gid);
 	}
 
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index 9d3568417f..5ffd58b183 100644
--- a/source3/nsswitch/wbinfo.c
+++ b/source3/nsswitch/wbinfo.c
@@ -349,7 +349,7 @@ int main(int argc, char **argv)
 		char *p;
 
 		fstrcpy(global_myname, myhostname());
-		p = strchr(global_myname, '.');
+		p = strchr_m(global_myname, '.');
 		if (p) {
 			*p = 0;
 		}
diff --git a/source3/nsswitch/winbind_nss.c b/source3/nsswitch/winbind_nss.c
index a2816bfdd3..cbbc30b75c 100644
--- a/source3/nsswitch/winbind_nss.c
+++ b/source3/nsswitch/winbind_nss.c
@@ -87,13 +87,13 @@ BOOL next_token(char **ptr,char *buff,char *sep, size_t bufsize)
 	if (!sep) sep = " \t\n\r";
 
 	/* find the first non sep char */
-	while (*s && strchr(sep,*s)) s++;
+	while (*s && strchr_m(sep,*s)) s++;
 	
 	/* nothing left? */
 	if (! *s) return(False);
 	
 	/* copy over the token */
-	for (quoted = False; len < bufsize && *s && (quoted || !strchr(sep,*s)); s++) {
+	for (quoted = False; len < bufsize && *s && (quoted || !strchr_m(sep,*s)); s++) {
 		if (*s == '\"') {
 			quoted = !quoted;
 		} else {
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 4177d0219a..9371078a79 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -693,7 +693,7 @@ int main(int argc, char **argv)
 		char *p;
 
 		fstrcpy(global_myname, myhostname());
-		p = strchr(global_myname, '.');
+		p = strchr_m(global_myname, '.');
 		if (p) {
 			*p = 0;
 		}
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index 0cbc3166c8..e69268fe2a 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -31,8 +31,8 @@ static void parse_domain_user(char *domuser, fstring domain, fstring user)
         char *p;
         char *sep = lp_winbind_separator();
         if (!sep) sep = "\\";
-        p = strchr(domuser,*sep);
-        if (!p) p = strchr(domuser,'\\');
+        p = strchr_m(domuser,*sep);
+        if (!p) p = strchr_m(domuser,'\\');
         if (!p) {
                 fstrcpy(domain,"");
                 fstrcpy(user, domuser);
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 4c7071d063..39a2f78d5c 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -909,8 +909,8 @@ void parse_domain_user(char *domuser, fstring domain, fstring user)
 	char *p;
 	char *sep = lp_winbind_separator();
 	if (!sep) sep = "\\";
-	p = strchr(domuser,*sep);
-	if (!p) p = strchr(domuser,'\\');
+	p = strchr_m(domuser,*sep);
+	if (!p) p = strchr_m(domuser,'\\');
 	if (!p) {
 		fstrcpy(domain,"");
 		fstrcpy(user, domuser);