packages/vsftpd/adjust-usr-share-empty-to-var-empty.patch
2024-03-03 09:58:06 +01:00

60 lines
2.1 KiB
Diff

From fa4bb925ab76b629952db58557a12008de59ca25 Mon Sep 17 00:00:00 2001
From: Levente Polyak <levente@leventepolyak.net>
Date: Sat, 27 Jan 2024 20:15:33 +0100
Subject: [PATCH] adjust /usr/share/empty to /var/empty
---
INSTALL | 6 +++---
tunables.c | 2 +-
vsftpd.conf.5 | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/INSTALL b/INSTALL
index 4f811aa..d76d79a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,11 +27,11 @@ user in case it does not already exist. e.g.:
[root@localhost root]# useradd nobody
useradd: user nobody exists
-2b) vsftpd needs the (empty) directory /usr/share/empty in the default
+2b) vsftpd needs the (empty) directory /var/empty in the default
configuration. Add this directory in case it does not already exist. e.g.:
-[root@localhost root]# mkdir /usr/share/empty/
-mkdir: cannot create directory `/usr/share/empty': File exists
+[root@localhost root]# mkdir /var/empty/
+mkdir: cannot create directory `/var/empty': File exists
2c) For anonymous FTP, you will need the user "ftp" to exist, and have a
valid home directory (which is NOT owned or writable by the user "ftp").
diff --git a/tunables.c b/tunables.c
index 069160a..59ae493 100644
--- a/tunables.c
+++ b/tunables.c
@@ -261,7 +261,7 @@ tunables_load_defaults()
/* -rw------- */
tunable_chown_upload_mode = 0600;
- install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
+ install_str_setting("/var/empty", &tunable_secure_chroot_dir);
install_str_setting("ftp", &tunable_ftp_username);
install_str_setting("root", &tunable_chown_username);
install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
diff --git a/vsftpd.conf.5 b/vsftpd.conf.5
index 9e85785..8d469e9 100644
--- a/vsftpd.conf.5
+++ b/vsftpd.conf.5
@@ -993,7 +993,7 @@ This option should be the name of a directory which is empty. Also, the
directory should not be writable by the ftp user. This directory is used
as a secure chroot() jail at times vsftpd does not require filesystem access.
-Default: /usr/share/empty
+Default: /var/empty
.TP
.B ssl_ciphers
This option can be used to select which SSL ciphers vsftpd will allow for
--
2.43.0