|
 |
d83721 |
From a423831f25396c54f92cdfc6f92a104ed77c2ee6 Mon Sep 17 00:00:00 2001
|
|
|
d83721 |
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
|
|
|
d83721 |
Date: Fri, 24 Nov 2017 11:26:37 +0100
|
|
|
d83721 |
Subject: [PATCH] Improve documentation of ascii_* options
|
|
|
d83721 |
|
|
|
d83721 |
Resolves: rhbz#1517227
|
|
|
d83721 |
---
|
|
|
d83721 |
vsftpd.conf | 3 ++-
|
|
|
d83721 |
vsftpd.conf.5 | 20 ++++++++++++++++++++
|
|
|
d83721 |
2 files changed, 22 insertions(+), 1 deletion(-)
|
|
|
d83721 |
|
|
|
d83721 |
diff --git a/vsftpd.conf b/vsftpd.conf
|
|
|
d83721 |
index 39d1955..acbc1e9 100644
|
|
|
d83721 |
--- a/vsftpd.conf
|
|
|
d83721 |
+++ b/vsftpd.conf
|
|
|
d83721 |
@@ -73,7 +73,8 @@ xferlog_std_format=YES
|
|
|
d83721 |
#
|
|
|
d83721 |
# By default the server will pretend to allow ASCII mode but in fact ignore
|
|
|
d83721 |
# the request. Turn on the below options to have the server actually do ASCII
|
|
|
d83721 |
-# mangling on files when in ASCII mode.
|
|
|
d83721 |
+# mangling on files when in ASCII mode. The vsftpd.conf(5) man page explains
|
|
|
d83721 |
+# the behaviour when these options are disabled.
|
|
|
d83721 |
# Beware that on some FTP servers, ASCII support allows a denial of service
|
|
|
d83721 |
# attack (DoS) via the command "SIZE /big/file" in ASCII mode. vsftpd
|
|
|
d83721 |
# predicted this attack and has always been safe, reporting the size of the
|
|
|
d83721 |
diff --git a/vsftpd.conf.5 b/vsftpd.conf.5
|
|
|
d83721 |
index d1f0db5..b6ddf05 100644
|
|
|
d83721 |
--- a/vsftpd.conf.5
|
|
|
d83721 |
+++ b/vsftpd.conf.5
|
|
|
d83721 |
@@ -113,11 +113,31 @@ Default: YES
|
|
|
d83721 |
.TP
|
|
|
d83721 |
.B ascii_download_enable
|
|
|
d83721 |
When enabled, ASCII mode data transfers will be honoured on downloads.
|
|
|
d83721 |
+When disabled, the server will pretend to allow ASCII mode but in fact
|
|
|
d83721 |
+ignore requests to activate it. So the client will think the ASCII mode
|
|
|
d83721 |
+is active and therefore may still translate any
|
|
|
d83721 |
+.BR <CRLF>
|
|
|
d83721 |
+character sequences in the received file. See the following article for
|
|
|
d83721 |
+a detailed explanation of the behaviour:
|
|
|
d83721 |
+https://access.redhat.com/articles/3250241.
|
|
|
d83721 |
+
|
|
|
d83721 |
+Turn this option on to have the server actually do
|
|
|
d83721 |
+ASCII mangling on files when in ASCII mode.
|
|
|
d83721 |
|
|
|
d83721 |
Default: NO
|
|
|
d83721 |
.TP
|
|
|
d83721 |
.B ascii_upload_enable
|
|
|
d83721 |
When enabled, ASCII mode data transfers will be honoured on uploads.
|
|
|
d83721 |
+When disabled, the server will pretend to allow ASCII mode but in fact
|
|
|
d83721 |
+ignore requests to activate it. So the client will think the ASCII mode
|
|
|
d83721 |
+is active and will translate native line terminators to the standard
|
|
|
d83721 |
+.BR <CRLF>
|
|
|
d83721 |
+line terminators for transmission, but the server will not do
|
|
|
d83721 |
+any translation. See the following article for a detailed explanation
|
|
|
d83721 |
+of the behaviour: https://access.redhat.com/articles/3250241.
|
|
|
d83721 |
+
|
|
|
d83721 |
+Turn this option on to have the server actually do
|
|
|
d83721 |
+ASCII mangling on files when in ASCII mode.
|
|
|
d83721 |
|
|
|
d83721 |
Default: NO
|
|
|
d83721 |
.TP
|
|
|
d83721 |
--
|
|
|
d83721 |
2.14.3
|
|
|
d83721 |
|