From 53b29a9cc1b7bbd895cf868575eeb393174d763f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 01 2017 03:27:56 +0000
Subject: import vsftpd-3.0.2-22.el7


---

diff --git a/SOURCES/vsftpd-3.0.2-defaulttls.patch b/SOURCES/vsftpd-3.0.2-defaulttls.patch
new file mode 100644
index 0000000..c7850fa
--- /dev/null
+++ b/SOURCES/vsftpd-3.0.2-defaulttls.patch
@@ -0,0 +1,12 @@
+diff -up vsftpd-3.0.2/features.c.defaulttls vsftpd-3.0.2/features.c
+--- vsftpd-3.0.2/features.c.defaulttls	2017-03-23 13:52:03.775952599 +0100
++++ vsftpd-3.0.2/features.c	2017-03-23 13:55:37.919726920 +0100
+@@ -22,7 +22,7 @@ handle_feat(struct vsf_session* p_sess)
+     {
+       vsf_cmdio_write_raw(p_sess, " AUTH SSL\r\n");
+     }
+-    if (tunable_tlsv1)
++    if (tunable_tlsv1 || tunable_tlsv1_1 || tunable_tlsv1_2)
+     {
+       vsf_cmdio_write_raw(p_sess, " AUTH TLS\r\n");
+     }
diff --git a/SPECS/vsftpd.spec b/SPECS/vsftpd.spec
index a37f1a9..5b0bdfe 100644
--- a/SPECS/vsftpd.spec
+++ b/SPECS/vsftpd.spec
@@ -3,7 +3,7 @@
 
 Name: vsftpd
 Version: 3.0.2
-Release: 21%{?dist}
+Release: 22%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -75,6 +75,7 @@ Patch37: vsftpd-2.2.2-blank-chars-overflow.patch
 Patch38: vsftpd-2.2.2-syslog.patch
 Patch39: vsftpd-3.0.2-docupd.patch
 Patch40: vsftpd-2.2.2-tlsv1_2.patch
+Patch41: vsftpd-3.0.2-defaulttls.patch
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
@@ -130,6 +131,7 @@ cp %{SOURCE1} .
 %patch38 -p1 -b .syslog
 %patch39 -p1 -b .docup
 %patch40 -p1 -b .tls_version
+%patch41 -p1 -b .defaulttls
 
 %build
 %ifarch s390x sparcv9 sparc64
@@ -200,6 +202,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rc.d/init.d/vsftpd
 
 %changelog
+* Thu Mar 23 2017 Zdenek Dohnal <zdohnal@redhat.com> - 3.0.2-22
+- Resolves: #1432054 - secure ftp stopped working with default TLS settings in the new vsftpd package
+
 * Thu Jun 02 2016 Martin Sehnoutka <msehnout@redhat.com> - 3.0.2-21
 - Resolves: #1318947 vsftpd should permit specified TLS versions only