diff options
| author | Jeremy Allison <jra@samba.org> | 2004-03-09 00:17:16 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-03-09 00:17:16 +0000 |
| commit | fe5801d065a140dc79bec3ff4c41024470ab5cfd (patch) | |
| tree | c263796ab285d7122bbea5f9ad66bea02ef8fd66 /source3/smbd | |
| parent | 2337d3e1a543724083d11897de296b91200906ab (diff) | |
| download | samba-fe5801d065a140dc79bec3ff4c41024470ab5cfd.tar.gz samba-fe5801d065a140dc79bec3ff4c41024470ab5cfd.tar.bz2 samba-fe5801d065a140dc79bec3ff4c41024470ab5cfd.zip | |
Added strstr_m() function. Use in all places where we might run into mb
(should fix the mb service name problem, can't remember the bugid).
Jeremy.
(This used to be commit 93c2d50f1adbf257c0c0185b420a1d73d56be2f9)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/chgpasswd.c | 2 | ||||
| -rw-r--r-- | source3/smbd/service.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c index 8e4df1a464..4192cc3a23 100644 --- a/source3/smbd/chgpasswd.c +++ b/source3/smbd/chgpasswd.c @@ -542,7 +542,7 @@ BOOL chgpasswd(const char *name, const struct passwd *pass, if (as_root) { /* The password program *must* contain the user name to work. Fail if not. */ - if (strstr(passwordprogram, "%u") == NULL) { + if (strstr_m(passwordprogram, "%u") == NULL) { DEBUG(0,("chgpasswd: Running as root the 'passwd program' parameter *MUST* contain \ the string %%u, and the given string %s does not.\n", passwordprogram )); return False; diff --git a/source3/smbd/service.c b/source3/smbd/service.c index f39f5bfd59..adbed67b33 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -174,7 +174,7 @@ int find_service(fstring service) /* just possibly it's a default service? */ if (iService < 0) { char *pdefservice = lp_defaultservice(); - if (pdefservice && *pdefservice && !strequal(pdefservice,service) && !strstr(service,"..")) { + if (pdefservice && *pdefservice && !strequal(pdefservice,service) && !strstr_m(service,"..")) { /* * We need to do a local copy here as lp_defaultservice() * returns one of the rotating lp_string buffers that |