summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-03-26 20:40:30 +0000
committerJeremy Allison <jra@samba.org>2004-03-26 20:40:30 +0000
commit1a50cf19d065bd3edf97ea975a7db6087e6139a5 (patch)
treec47d2ec9c5619ce9946414c34e792b39ea23cfa0
parent950f0f84a505aff201060d0c98c3b951e2ab22d3 (diff)
downloadsamba-1a50cf19d065bd3edf97ea975a7db6087e6139a5.tar.gz
samba-1a50cf19d065bd3edf97ea975a7db6087e6139a5.tar.bz2
samba-1a50cf19d065bd3edf97ea975a7db6087e6139a5.zip
Always use strchr_m, not strchr on unix character sets.
Jeremy. (This used to be commit 8431b985d66e76ab187efb617639e767142b0bb5)
-rw-r--r--source3/msdfs/msdfs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/msdfs/msdfs.c b/source3/msdfs/msdfs.c
index 65622b268c..340e5c6750 100644
--- a/source3/msdfs/msdfs.c
+++ b/source3/msdfs/msdfs.c
@@ -189,7 +189,7 @@ static BOOL read_target_host(const char *mapfile, pstring targethost)
DEBUG(10, ("Scanning mapfile [%s]\n", mapfile));
while ((s=fgets_slash(buf, sizeof(buf), f)) != NULL) {
- space = strchr(buf, ' ');
+ space = strchr_m(buf, ' ');
if (space == NULL) {
DEBUG(0, ("Ignoring invalid line %s\n", buf));
@@ -234,7 +234,7 @@ static BOOL read_target_host(const char *mapfile, pstring targethost)
static BOOL expand_msdfs_target(connection_struct* conn, pstring target)
{
pstring mapfilename;
- char *filename_start = strchr(target, '@');
+ char *filename_start = strchr_m(target, '@');
char *filename_end;
int filename_len;
pstring targethost;
@@ -245,7 +245,7 @@ static BOOL expand_msdfs_target(connection_struct* conn, pstring target)
return False;
}
- filename_end = strchr(filename_start+1, '@');
+ filename_end = strchr_m(filename_start+1, '@');
if (filename_end == NULL) {
DEBUG(10, ("No filename end in %s\n", target));
@@ -322,7 +322,7 @@ static BOOL parse_symlink(connection_struct* conn, char* buf,
pstrcpy(target, alt_path[i]);
- if (strchr(target, '@') != NULL) {
+ if (strchr_m(target, '@') != NULL) {
if (!expand_msdfs_target(conn, target))
return False;
}