From 527e824293ee934ca5da0ef5424efe5ab7757248 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 4 Jul 2001 07:36:09 +0000
Subject: strchr and strrchr are macros when compiling with optimisation in
 gcc, so we can't redefine them. damn. (This used to be commit
 c41fc06376d1a2b83690612304e85010b5e5f3cf)

---
 source3/rpcclient/rpcclient.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/rpcclient')

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 0d1b84f849..6e4d60d208 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -163,7 +163,7 @@ static char* next_command (char** cmdstr)
 	if (!cmdstr || !(*cmdstr))
 		return NULL;
 	
-	p = strchr(*cmdstr, ';');
+	p = strchr_m(*cmdstr, ';');
 	if (p)
 		*p = '\0';
 	pstrcpy(command, *cmdstr);
@@ -588,11 +588,11 @@ static void usage(char *pname)
 		case 'U': {
 			char *lp;
 			pstrcpy(username,optarg);
-			if ((lp=strchr(username,'%'))) {
+			if ((lp=strchr_m(username,'%'))) {
 				*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;
 		}
-- 
cgit