Fix error in Shadowing

Fixes #299: Error in Shadowing
bareos · May 23, 2014 · 8832077 · 8832077
1 parent 83821c3
commit 8832077
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/findlib/shadowing.c b/src/findlib/shadowing.c
@@ -76,7 +76,9 @@ static inline bool check_include_pattern_shadowing(JCR *jcr,
          /*
           * See if one pattern shadows the other.
           */
-         if (bstrncmp(pattern1, pattern2, MIN(len1, len2))) {
+         if (((len1 < len2 && pattern1[len1] == '\0' && IsPathSeparator(pattern2[len1])) ||
+              (len1 > len2 && IsPathSeparator(pattern1[len2]) && pattern1[len1] == '\0')) &&
+             bstrncmp(pattern1, pattern2, MIN(len1, len2))) {
             /*
              * If both directories have the same st_dev they shadow
              * each other e.g. are not on seperate filesystems.