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

(This used to be commit c41fc06376d1a2b83690612304e85010b5e5f3cf)

3 files changed, 7 insertions, 7 deletions

diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c
index f714106b43..34b0c74208 100644
--- a/source3/passdb/machine_sid.c
+++ b/source3/passdb/machine_sid.c
@@ -70,7 +70,7 @@ BOOL pdb_generate_sam_sid(void)
 	generate_wellknown_sids();
 
 	pstrcpy(sid_file, lp_smb_passwd_file());
-	p = strrchr(sid_file, '/');
+	p = strrchr_m(sid_file, '/');
 	if(p != NULL) {
 		*++p = '\0';
 	}
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 580cae0240..3bb49091e6 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -318,8 +318,8 @@ BOOL pdb_gethexpwd(char *p, unsigned char *pwd)
 		hinybble = toupper(p[i]);
 		lonybble = toupper(p[i + 1]);
 
-		p1 = strchr(hexchars, hinybble);
-		p2 = strchr(hexchars, lonybble);
+		p1 = strchr_m(hexchars, hinybble);
+		p2 = strchr_m(hexchars, lonybble);
 
 		if (!p1 || !p2)
 		{
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 3679bd1319..dbb0d050c9 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -343,7 +343,7 @@ static struct smb_passwd *getsmbfilepwent(void *vp)
       DEBUG(6, ("getsmbfilepwent: skipping comment or blank line\n"));
       continue;
     }
-    p = (unsigned char *) strchr(linebuf, ':');
+    p = (unsigned char *) strchr_m(linebuf, ':');
     if (p == NULL) {
       DEBUG(0, ("getsmbfilepwent: malformed password entry (no :)\n"));
       continue;
@@ -443,7 +443,7 @@ static struct smb_passwd *getsmbfilepwent(void *vp)
 
     if (*p == '[')
 	{
-      unsigned char *end_p = (unsigned char *)strchr((char *)p, ']');
+      unsigned char *end_p = (unsigned char *)strchr_m((char *)p, ']');
       pw_buf.acct_ctrl = pdb_decode_acct_ctrl((char*)p);
 
       /* Must have some account type set. */
@@ -768,7 +768,7 @@ static BOOL mod_smbfilepwd_entry(struct smb_passwd* pwd, BOOL override)
       continue;
     }
 
-    p = (unsigned char *) strchr(linebuf, ':');
+    p = (unsigned char *) strchr_m(linebuf, ':');
 
     if (p == NULL) {
       DEBUG(0, ("mod_smbfilepwd_entry: malformed password entry (no :)\n"));
@@ -1346,7 +1346,7 @@ BOOL pdb_getsampwnam(SAM_ACCOUNT *sam_acct, char *username)
 	/* break the username from the domain if we have 
 	   been given a string in the form 'DOMAIN\user' */
 	fstrcpy (name, username);
-	if ((user=strchr(name, '\\')) != NULL) {
+	if ((user=strchr_m(name, '\\')) != NULL) {
 		domain = name;
 		*user = '\0';
 		user++;