6 files changed, 12 insertions, 12 deletions
diff --git a/source4/ntvfs/posix/pvfs_dirlist.c b/source4/ntvfs/posix/pvfs_dirlist.c
index a055773b51..9838072080 100644
--- a/source4/ntvfs/posix/pvfs_dirlist.c
+++ b/source4/ntvfs/posix/pvfs_dirlist.c
@@ -283,14 +283,14 @@ NTSTATUS pvfs_list_seek(struct pvfs_dir *dir, const char *name, uint_t *ofs)
 
 	for (i=dir->name_cache_index;i>=0;i--) {
 		struct name_cache_entry *e = &dir->name_cache[i];
-		if (e->name && StrCaseCmp(name, e->name) == 0) {
+		if (e->name && strcasecmp_m(name, e->name) == 0) {
 			*ofs = e->offset;
 			return NT_STATUS_OK;
 		}
 	}
 	for (i=NAME_CACHE_SIZE-1;i>dir->name_cache_index;i--) {
 		struct name_cache_entry *e = &dir->name_cache[i];
-		if (e->name && StrCaseCmp(name, e->name) == 0) {
+		if (e->name && strcasecmp_m(name, e->name) == 0) {
 			*ofs = e->offset;
 			return NT_STATUS_OK;
 		}
@@ -299,7 +299,7 @@ NTSTATUS pvfs_list_seek(struct pvfs_dir *dir, const char *name, uint_t *ofs)
 	rewinddir(dir->dir);
 
 	while ((de = readdir(dir->dir))) {
-		if (StrCaseCmp(name, de->d_name) == 0) {
+		if (strcasecmp_m(name, de->d_name) == 0) {
 			dir->offset = telldir(dir->dir) + DIR_OFFSET_BASE;
 			*ofs = dir->offset;
 			return NT_STATUS_OK;
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index 94749600e1..0e2a85bab1 100644
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -734,7 +734,7 @@ static NTSTATUS pvfs_open_deny_dos(struct ntvfs_module_context *ntvfs,
 		     (NTCREATEX_OPTIONS_PRIVATE_DENY_DOS |
 		      NTCREATEX_OPTIONS_PRIVATE_DENY_FCB)) &&
 		    (f2->access_mask & SEC_FILE_WRITE_DATA) &&
-		    StrCaseCmp(f2->handle->name->original_name, 
+		    strcasecmp_m(f2->handle->name->original_name, 
 			       io->generic.in.fname)==0) {
 			break;
 		}
diff --git a/source4/ntvfs/posix/pvfs_qfileinfo.c b/source4/ntvfs/posix/pvfs_qfileinfo.c
index 4b6afac00a..1f2f86e953 100644
--- a/source4/ntvfs/posix/pvfs_qfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_qfileinfo.c
@@ -82,7 +82,7 @@ NTSTATUS pvfs_query_ea_list(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx,
 		eas->eas[i].name.s = names[i].name.s;
 		eas->eas[i].value = data_blob(NULL, 0);
 		for (j=0;j<ealist->num_eas;j++) {
-			if (StrCaseCmp(eas->eas[i].name.s, 
+			if (strcasecmp_m(eas->eas[i].name.s, 
 				       ealist->eas[j].name) == 0) {
 				eas->eas[i].value = ealist->eas[j].value;
 				break;
diff --git a/source4/ntvfs/posix/pvfs_resolve.c b/source4/ntvfs/posix/pvfs_resolve.c
index 355e82c301..b8e55c85bf 100644
--- a/source4/ntvfs/posix/pvfs_resolve.c
+++ b/source4/ntvfs/posix/pvfs_resolve.c
@@ -38,12 +38,12 @@ static int component_compare(struct pvfs_state *pvfs, const char *comp, const ch
 {
 	int ret;
 
-	ret = StrCaseCmp(comp, name);
+	ret = strcasecmp_m(comp, name);
 
 	if (ret != 0) {
 		char *shortname = pvfs_short_name_component(pvfs, name);
 		if (shortname) {
-			ret = StrCaseCmp(comp, shortname);
+			ret = strcasecmp_m(comp, shortname);
 			talloc_free(shortname);
 		}
 	}
@@ -197,7 +197,7 @@ static NTSTATUS parse_stream_name(struct pvfs_filename *name, const char *s)
 						 strlen(name->stream_name));
 		return NT_STATUS_OK;
 	}
-	if (StrCaseCmp(p, ":$DATA") != 0) {
+	if (strcasecmp_m(p, ":$DATA") != 0) {
 		return NT_STATUS_OBJECT_NAME_INVALID;
 	}
 	*p = 0;
diff --git a/source4/ntvfs/posix/pvfs_setfileinfo.c b/source4/ntvfs/posix/pvfs_setfileinfo.c
index 31a60fac18..0753ccb40b 100644
--- a/source4/ntvfs/posix/pvfs_setfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_setfileinfo.c
@@ -186,7 +186,7 @@ NTSTATUS pvfs_setfileinfo_ea_set(struct pvfs_state *pvfs,
 		struct ea_struct *ea = &eas[j];
 		/* see if its already there */
 		for (i=0;i<ealist->num_eas;i++) {
-			if (StrCaseCmp(ealist->eas[i].name, ea->name.s) == 0) {
+			if (strcasecmp_m(ealist->eas[i].name, ea->name.s) == 0) {
 				ealist->eas[i].value = ea->value;
 				break;
 			}
diff --git a/source4/ntvfs/posix/pvfs_streams.c b/source4/ntvfs/posix/pvfs_streams.c
index 2ee5034736..3910baadd0 100644
--- a/source4/ntvfs/posix/pvfs_streams.c
+++ b/source4/ntvfs/posix/pvfs_streams.c
@@ -97,7 +97,7 @@ NTSTATUS pvfs_stream_info(struct pvfs_state *pvfs, struct pvfs_filename *name, i
 
 	for (i=0;i<streams->num_streams;i++) {
 		struct xattr_DosStream *s = &streams->streams[i];
-		if (StrCaseCmp(s->name, name->stream_name) == 0) {
+		if (strcasecmp_m(s->name, name->stream_name) == 0) {
 			name->dos.alloc_size = pvfs_round_alloc_size(pvfs, s->alloc_size);
 			name->st.st_size     = s->size;
 			name->stream_exists = True;
@@ -138,7 +138,7 @@ static NTSTATUS pvfs_stream_update_size(struct pvfs_state *pvfs, struct pvfs_fil
 
 	for (i=0;i<streams->num_streams;i++) {
 		struct xattr_DosStream *s = &streams->streams[i];
-		if (StrCaseCmp(s->name, name->stream_name) == 0) {
+		if (strcasecmp_m(s->name, name->stream_name) == 0) {
 			s->size       = size;
 			s->alloc_size = pvfs_round_alloc_size(pvfs, size);
 			break;
@@ -216,7 +216,7 @@ NTSTATUS pvfs_stream_delete(struct pvfs_state *pvfs,
 
 	for (i=0;i<streams->num_streams;i++) {
 		struct xattr_DosStream *s = &streams->streams[i];
-		if (StrCaseCmp(s->name, name->stream_name) == 0) {
+		if (strcasecmp_m(s->name, name->stream_name) == 0) {
 			memmove(s, s+1, (streams->num_streams - (i+1)) * sizeof(*s));
 			streams->num_streams--;
 			break;