summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-07-18 21:50:20 +0000
committerAndrew Tridgell <tridge@samba.org>2001-07-18 21:50:20 +0000
commite8c2eeb0d88795f7357a2646d98557cf445546a3 (patch)
treebbf30be511a97c27af4c86584bc9f1fd6cf847f7 /source3
parent45635a4a799f9f6efbcb8d021bec60a2eb479808 (diff)
downloadsamba-e8c2eeb0d88795f7357a2646d98557cf445546a3.tar.gz
samba-e8c2eeb0d88795f7357a2646d98557cf445546a3.tar.bz2
samba-e8c2eeb0d88795f7357a2646d98557cf445546a3.zip
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)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/wb_client.c6
-rw-r--r--source3/nsswitch/wbinfo.c2
-rw-r--r--source3/nsswitch/winbind_nss.c4
-rw-r--r--source3/nsswitch/winbindd.c2
-rw-r--r--source3/nsswitch/winbindd_pam.c4
-rw-r--r--source3/nsswitch/winbindd_util.c4
6 files changed, 11 insertions, 11 deletions
diff --git a/source3/nsswitch/wb_client.c b/source3/nsswitch/wb_client.c
index 05c68d240c..2a29773b9e 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_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 5ffd58b183..9d3568417f 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_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 cbbc30b75c..a2816bfdd3 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_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 b81d60dc66..0824b77294 100644
--- 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 e69268fe2a..0cbc3166c8 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_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 39a2f78d5c..4c7071d063 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_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);