diff options
| author | Jeremy Allison <jra@samba.org> | 2004-03-09 00:17:14 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-03-09 00:17:14 +0000 |
| commit | c9b7cbbfa572512cd0348817965b99fd1df01285 (patch) | |
| tree | 9705a925b947e8a354250b8538c6a1be440aa5bf /source3/smbd | |
| parent | 3f14e8eb9dd9893ed195853dd7cf46ee5c2d5133 (diff) | |
| download | samba-c9b7cbbfa572512cd0348817965b99fd1df01285.tar.gz samba-c9b7cbbfa572512cd0348817965b99fd1df01285.tar.bz2 samba-c9b7cbbfa572512cd0348817965b99fd1df01285.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 94a272b9a881ec0004c5da2a7242b0a818da5630)
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 e3df8a11d0..d928445d94 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 a53b9267b7..08b6648249 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 |