Improve documentation of ASCII mode in the man page

Resolves: rhbz#1139409
This commit is contained in:
Ondřej Lysoněk 2017-11-24 11:34:23 +01:00
parent e38d5f28a1
commit f200da9342
2 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From 7d4b76abb437184fa692533cb5537318026a30e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
Date: Fri, 24 Nov 2017 11:26:37 +0100
Subject: [PATCH 39/39] Improve documentation of ASCII mode in the man page
---
vsftpd.conf.5 | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/vsftpd.conf.5 b/vsftpd.conf.5
index d1f0db5..3ca55e4 100644
--- a/vsftpd.conf.5
+++ b/vsftpd.conf.5
@@ -113,11 +113,17 @@ Default: YES
.TP
.B ascii_download_enable
When enabled, ASCII mode data transfers will be honoured on downloads.
+When disabled, the server will pretend to allow ASCII mode but in fact
+ignore the request. Turn this option on to have the server actually do
+ASCII mangling on files when in ASCII mode.
Default: NO
.TP
.B ascii_upload_enable
When enabled, ASCII mode data transfers will be honoured on uploads.
+See also
+.BR ascii_download_enable
+for more details.
Default: NO
.TP
--
2.14.3

View File

@ -2,7 +2,7 @@
Name: vsftpd Name: vsftpd
Version: 3.0.3 Version: 3.0.3
Release: 10%{?dist} Release: 11%{?dist}
Summary: Very Secure Ftp Daemon Summary: Very Secure Ftp Daemon
Group: System Environment/Daemons Group: System Environment/Daemons
@ -67,6 +67,7 @@ Patch35: 0035-Modify-DH-enablement-patch-to-build-with-OpenSSL-1.1.patch
Patch36: 0036-Redefine-VSFTP_COMMAND_FD-to-1.patch Patch36: 0036-Redefine-VSFTP_COMMAND_FD-to-1.patch
Patch37: 0037-Document-the-relationship-of-text_userdb_names-and-c.patch Patch37: 0037-Document-the-relationship-of-text_userdb_names-and-c.patch
Patch38: 0038-Document-allow_writeable_chroot-in-the-man-page.patch Patch38: 0038-Document-allow_writeable_chroot-in-the-man-page.patch
Patch39: 0039-Improve-documentation-of-ASCII-mode-in-the-man-page.patch
%description %description
vsftpd is a Very Secure FTP daemon. It was written completely from vsftpd is a Very Secure FTP daemon. It was written completely from
@ -136,6 +137,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
%{_var}/ftp %{_var}/ftp
%changelog %changelog
* Fri Nov 24 2017 Ondřej Lysoněk <olysonek@redhat.com> - 3.0.3-11
- Improve documentation of ASCII mode in the man page
- Resolves: rhbz#1139409
* Tue Oct 31 2017 Ondřej Lysoněk <olysonek@redhat.com> - 3.0.3-10 * Tue Oct 31 2017 Ondřej Lysoněk <olysonek@redhat.com> - 3.0.3-10
- Document allow_writeable_chroot in the man page - Document allow_writeable_chroot in the man page
- Resolves: rhbz#1507143 - Resolves: rhbz#1507143