Merge tag 'upstream/4.0.5+dfsg1' into samba_4.0_ivo

[abartlet/samba-debian.git] / source3 / lib / ms_fnmatch.c

diff --git a/source3/lib/ms_fnmatch.c b/source3/lib/ms_fnmatch.c
index bff7382940734f3b26adcaee6aeff21f6816fbd5..e32d094a6b22c8567bcd33f54652984d21fc6890 100644 (file)
--- a/source3/lib/ms_fnmatch.c
+++ b/source3/lib/ms_fnmatch.c
@@ -166,7 +166,7 @@ int ms_fnmatch(const char *pattern, const char *string, bool translate_pattern,
                if (is_case_sensitive) {
                        return strcmp(pattern, string);
                } else {
-                       return StrCaseCmp(pattern, string);
+                       return strcasecmp_m(pattern, string);
                }
        }
 
@@ -229,10 +229,3 @@ int ms_fnmatch(const char *pattern, const char *string, bool translate_pattern,
        TALLOC_FREE(s);
        return ret;
 }
-
-
-/* a generic fnmatch function - uses for non-CIFS pattern matching */
-int gen_fnmatch(const char *pattern, const char *string)
-{
-       return ms_fnmatch(pattern, string, true, False);
-}