the nss and pam modules in winbind don't have strchr_m() yet, so use

strchr() for the moment
(This used to be commit c2c1f2027e6e623bba59610e3aa41618773e6361)

diff --git a/source3/nsswitch/wb_client.c b/source3/nsswitch/wb_client.c
index 05c68d240c80dc13cc4f209322ca6903149e1c6c..2a29773b9ec497871974d7949f34bfbdfe2b06f4 100644 (file)
--- 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_m(domuser,*sep);
-        if (!p) p = strchr_m(domuser,'\\');
+        p = strchr(domuser,*sep);
+        if (!p) p = strchr(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_m(user, *sep)) {
+       if (!strchr(user, *sep)) {
                return initgroups(user, gid);
        }
 

diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index 5ffd58b183c70bb8572be8d83cf081ed137f9c6e..9d3568417f44e7c1c3e89ef6971083e0ff33d0ba 100644 (file)
--- 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_m(global_myname, '.');
+               p = strchr(global_myname, '.');
                if (p) {
                        *p = 0;
                }

diff --git a/source3/nsswitch/winbind_nss.c b/source3/nsswitch/winbind_nss.c
index cbbc30b75c10c3985c82beea4b3882ea235970c8..a2816bfdd3f59f04d5bd6fd0ae3667ab8f29b911 100644 (file)
--- 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_m(sep,*s)) s++;
+       while (*s && strchr(sep,*s)) s++;
        
        /* nothing left? */
        if (! *s) return(False);
        
        /* copy over the token */
-       for (quoted = False; len < bufsize && *s && (quoted || !strchr_m(sep,*s)); s++) {
+       for (quoted = False; len < bufsize && *s && (quoted || !strchr(sep,*s)); s++) {
                if (*s == '\"') {
                        quoted = !quoted;
                } else {

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index b81d60dc66c7d75faed9e5a0bc2be65bcee10c59..0824b77294ef563edd56d226f34f4b7a0f1335f2 100644 (file)
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -689,7 +689,7 @@ int main(int argc, char **argv)
                char *p;
 
                fstrcpy(global_myname, myhostname());
-               p = strchr_m(global_myname, '.');
+               p = strchr(global_myname, '.');
                if (p) {
                        *p = 0;
                }

diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index e69268fe2ab79a34ca14b18b5b84bcae69b5a8fb..0cbc3166c8c4d6c126885faefd21d1b38e241d8f 100644 (file)
--- 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_m(domuser,*sep);
-        if (!p) p = strchr_m(domuser,'\\');
+        p = strchr(domuser,*sep);
+        if (!p) p = strchr(domuser,'\\');
         if (!p) {
                 fstrcpy(domain,"");
                 fstrcpy(user, domuser);

diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 39a2f78d5c452b656a56523218573fc44e8e8d99..4c7071d06338b70e4921d5d0007a9315be59d04a 100644 (file)
--- 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_m(domuser,*sep);
-       if (!p) p = strchr_m(domuser,'\\');
+       p = strchr(domuser,*sep);
+       if (!p) p = strchr(domuser,'\\');
        if (!p) {
                fstrcpy(domain,"");
                fstrcpy(user, domuser);