From 915fc9626d7855b7353d5da43d6770d086e19acbe8e51c73dab43f0fe69843e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 23 Mar 2015 20:59:56 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=77

---
 vsftpd-path-normalize.patch | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/vsftpd-path-normalize.patch b/vsftpd-path-normalize.patch
index 855d66c..776b400 100644
--- a/vsftpd-path-normalize.patch
+++ b/vsftpd-path-normalize.patch
@@ -2,18 +2,15 @@ Index: vsftpd-3.0.2/ls.c
 ===================================================================
 --- vsftpd-3.0.2.orig/ls.c
 +++ vsftpd-3.0.2/ls.c
-@@ -121,7 +121,10 @@ vsf_ls_populate_dir_list(struct mystr_li
-     if (!str_isempty(p_filter_str))
-     {
-       unsigned int iters = 0;
--      if (!vsf_filename_passes_filter(&s_next_filename_str, p_filter_str,
-+      struct mystr normalize_filename_str;
-+      str_copy(&normalize_filename_str, &s_next_filename_str);
-+      str_normalize_filepath(&normalize_filename_str);
-+      if (!vsf_filename_passes_filter(&normalize_filename_str, p_filter_str,
-                                       &iters))
-       {
-         continue;
+@@ -270,6 +270,8 @@ vsf_filename_passes_filter(const struct
+     }
+   } else
+     str_copy(&name_remain_str, p_filename_str);
++
++  str_normalize_filepath(&name_remain_str);
+   
+   while (!str_isempty(&filter_remain_str) && *iters < VSFTP_MATCHITERS_MAX)
+   {
 Index: vsftpd-3.0.2/str.c
 ===================================================================
 --- vsftpd-3.0.2.orig/str.c