43 lines
2.3 KiB
Text
43 lines
2.3 KiB
Text
$NetBSD: patch-ad,v 1.7 2020/02/09 20:56:47 rillig Exp $
|
|
|
|
Use PKG_SYSCONFDIR and VARBASE instead of hardcoding the paths.
|
|
|
|
--- tunables.c.orig 2015-07-23 04:13:07.000000000 +0000
|
|
+++ tunables.c
|
|
@@ -254,19 +254,19 @@ tunables_load_defaults()
|
|
/* -rw------- */
|
|
tunable_chown_upload_mode = 0600;
|
|
|
|
- install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
|
|
+ install_str_setting(VARBASE"/chroot/vsftpd", &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);
|
|
install_str_setting("/var/log/vsftpd.log", &tunable_vsftpd_log_file);
|
|
install_str_setting(".message", &tunable_message_file);
|
|
- install_str_setting("nobody", &tunable_nopriv_user);
|
|
+ install_str_setting("vsftpd", &tunable_nopriv_user);
|
|
install_str_setting(0, &tunable_ftpd_banner);
|
|
- install_str_setting("/etc/vsftpd.banned_emails", &tunable_banned_email_file);
|
|
- install_str_setting("/etc/vsftpd.chroot_list", &tunable_chroot_list_file);
|
|
+ install_str_setting(PKG_SYSCONFDIR"/vsftpd.banned_emails", &tunable_banned_email_file);
|
|
+ install_str_setting(PKG_SYSCONFDIR"/vsftpd.chroot_list", &tunable_chroot_list_file);
|
|
install_str_setting("ftp", &tunable_pam_service_name);
|
|
install_str_setting("ftp", &tunable_guest_username);
|
|
- install_str_setting("/etc/vsftpd.user_list", &tunable_userlist_file);
|
|
+ install_str_setting(PKG_SYSCONFDIR"/vsftpd.user_list", &tunable_userlist_file);
|
|
install_str_setting(0, &tunable_anon_root);
|
|
install_str_setting(0, &tunable_local_root);
|
|
install_str_setting(0, &tunable_banner_file);
|
|
@@ -279,9 +279,9 @@ tunables_load_defaults()
|
|
install_str_setting(0, &tunable_hide_file);
|
|
install_str_setting(0, &tunable_deny_file);
|
|
install_str_setting(0, &tunable_user_sub_token);
|
|
- install_str_setting("/etc/vsftpd.email_passwords",
|
|
+ install_str_setting(PKG_SYSCONFDIR"/vsftpd.email_passwords",
|
|
&tunable_email_password_file);
|
|
- install_str_setting("/usr/share/ssl/certs/vsftpd.pem",
|
|
+ install_str_setting(PKG_SYSCONFDIR"/vsftpd.pem",
|
|
&tunable_rsa_cert_file);
|
|
install_str_setting(0, &tunable_dsa_cert_file);
|
|
install_str_setting("ECDHE-RSA-AES256-GCM-SHA384", &tunable_ssl_ciphers);
|