From abd20973e820a457115fff9700f40458aeffc898b4d6bd7ab71d66c09fe3df41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 5 Apr 2015 10:34:03 +0000 Subject: [PATCH] - bnc#925963 stat is sometimes run on wrong path and results with ENOENT: * vsftpd-path-normalize.patch OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=80 --- vsftpd-path-normalize.patch | 15 +++++++-------- vsftpd.changes | 7 +++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/vsftpd-path-normalize.patch b/vsftpd-path-normalize.patch index 93363bf..12d8120 100644 --- a/vsftpd-path-normalize.patch +++ b/vsftpd-path-normalize.patch @@ -2,15 +2,14 @@ Index: vsftpd-3.0.2/ls.c =================================================================== --- vsftpd-3.0.2.orig/ls.c +++ vsftpd-3.0.2/ls.c -@@ -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); +@@ -249,6 +249,7 @@ vsf_filename_passes_filter(const struct + int matched = 0; - while (!str_isempty(&filter_remain_str) && *iters < VSFTP_MATCHITERS_MAX) - { + str_copy(&filter_remain_str, p_filter_str); ++ str_normalize_filepath(p_filter_str); + + if (!str_isempty (&filter_remain_str) && !str_isempty(p_filename_str)) { + if (str_get_char_at(p_filter_str, 0) == '/') { Index: vsftpd-3.0.2/str.c =================================================================== --- vsftpd-3.0.2.orig/str.c diff --git a/vsftpd.changes b/vsftpd.changes index 6c25055..9f58213 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Apr 5 10:25:50 UTC 2015 - tchvatal@suse.com + +- bnc#925963 stat is sometimes run on wrong path and results with + ENOENT: + * vsftpd-path-normalize.patch + ------------------------------------------------------------------- Wed Mar 25 10:08:03 UTC 2015 - tchvatal@suse.com