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

(This used to be commit c41fc06376d1a2b83690612304e85010b5e5f3cf)

4 files changed, 11 insertions, 11 deletions

diff --git a/source3/rpc_server/srv_dfs_nt.c b/source3/rpc_server/srv_dfs_nt.c
index 54c3fbf324..a84f2ceb48 100644
--- a/source3/rpc_server/srv_dfs_nt.c
+++ b/source3/rpc_server/srv_dfs_nt.c
@@ -253,7 +253,7 @@ static BOOL init_reply_dfs_info_3(TALLOC_CTX *ctx, struct junction_map* j, DFS_I
 	  
 	  pstrcpy(path, ref->alternate_path);
 	  trim_string(path,"\\","");
-	  p = strrchr(path,'\\');
+	  p = strrchr_m(path,'\\');
 	  if(p==NULL)
 	    {
 	      DEBUG(4,("init_reply_dfs_info_3: invalid path: no \\ found in %s\n",path));
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index d783de3b4b..a73dcb30d2 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -256,7 +256,7 @@ static char *unmap_unixname(char *unix_user_name, int name_idx)
 
 	for (i=0; lines[i]; i++) {
 		char *unixname = lines[i];
-		char *dosname = strchr(unixname,'=');
+		char *dosname = strchr_m(unixname,'=');
 
 		if (!dosname)
 			continue;
@@ -271,7 +271,7 @@ static char *unmap_unixname(char *unix_user_name, int name_idx)
 				unixname++;
 		}
     
-		if (!*unixname || strchr("#;",*unixname))
+		if (!*unixname || strchr_m("#;",*unixname))
 			continue;
 
 		if (strncmp(unixname, unix_user_name, strlen(unix_user_name)))
@@ -280,7 +280,7 @@ static char *unmap_unixname(char *unix_user_name, int name_idx)
 		/* We have matched the UNIX user name */
 
 		while(next_token(&dosname, tok, LIST_SEP, sizeof(tok))) {
-			if (!strchr("@&+", *tok)) {
+			if (!strchr_m("@&+", *tok)) {
 				name_idx--;
 				if (name_idx < 0 ) {
 					break;
@@ -406,7 +406,7 @@ static BOOL get_passwd_entries(SAM_USER_INFO_21 *pw_buf,
 
 			/* Don't enumerate winbind users as they are not local */
 
-			if (strchr(pwd->pw_name, *sep) != NULL) {
+			if (strchr_m(pwd->pw_name, *sep) != NULL) {
 				continue;
 			}
 
@@ -834,7 +834,7 @@ static BOOL get_group_alias_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DOM_SID
 			sid_split_rid(&smap.sid, &trid);
 
 			/* Don't return winbind groups as they are not local! */
-			if (strchr(smap.nt_name, *sep) != NULL) {
+			if (strchr_m(smap.nt_name, *sep) != NULL) {
 				DEBUG(10,("get_group_alias_entries: not returing %s, not local.\n", smap.nt_name ));
 				continue;
 			}
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 7002241a00..79c788e67b 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -377,7 +377,7 @@ static BOOL set_printer_hnd_printertype(Printer_entry *Printer, char *handlename
 	}
 
 	/* it's a print server */
-	if (*handlename=='\\' && *(handlename+1)=='\\' && !strchr(handlename+2, '\\')) {
+	if (*handlename=='\\' && *(handlename+1)=='\\' && !strchr_m(handlename+2, '\\')) {
 		DEBUGADD(4,("Printer is a print server\n"));
 		Printer->printer_type = PRINTER_HANDLE_IS_PRINTSERVER;		
 	}
@@ -414,7 +414,7 @@ static BOOL set_printer_hnd_name(Printer_entry *Printer, char *handlename)
 		return False;
 	
 	if (*handlename=='\\') {
-		aprinter=strchr(handlename+2, '\\');
+		aprinter=strchr_m(handlename+2, '\\');
 		aprinter++;
 	}
 	else {
@@ -442,7 +442,7 @@ static BOOL set_printer_hnd_name(Printer_entry *Printer, char *handlename)
 		if (get_a_printer(&printer, 2, lp_servicename(snum))!=0)
 			continue;
 
-		printername=strchr(printer->info_2->printername+2, '\\');
+		printername=strchr_m(printer->info_2->printername+2, '\\');
 		printername++;
 
 		DEBUG(10,("set_printer_hnd_name: name [%s], aprinter [%s]\n",
@@ -1461,7 +1461,7 @@ static void spoolss_notify_printer_name(int snum,
 	uint32 len;
 		
 	/* the notify name should not contain the \\server\ part */
-	char *p = strrchr(printer->info_2->printername, '\\');
+	char *p = strrchr_m(printer->info_2->printername, '\\');
 
 	if (!p) {
 		p = printer->info_2->printername;
diff --git a/source3/rpc_server/srv_util.c b/source3/rpc_server/srv_util.c
index deaa6008b9..f9e02b9bca 100644
--- a/source3/rpc_server/srv_util.c
+++ b/source3/rpc_server/srv_util.c
@@ -114,7 +114,7 @@ int make_dom_gids(TALLOC_CTX *ctx, char *gids_str, DOM_GID **ppgids)
     uint32 rid = 0;
     int i;
 
-    attr = strchr(s2,'/');
+    attr = strchr_m(s2,'/');
     if (attr)
       *attr++ = 0;