From 359fccbcd1391a44e5a12d6f11a909c988c16994c2fd93c6f12137b5dd3cca1b Mon Sep 17 00:00:00 2001
From: Peter Simons <peter.simons@suse.com>
Date: Wed, 4 Oct 2023 08:21:31 +0000
Subject: [PATCH] Accepting request 1115425 from home:kukuk:branches:network

- Add vsftpd.ftpusers, the netcfg one is not maintained, outdated
  and will be removed.
- vsftpd.pam: use own copy of ftpusers.

OBS-URL: https://build.opensuse.org/request/show/1115425
OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=181
---
 vsftpd.changes  |  7 +++++++
 vsftpd.ftpusers | 16 ++++++++++++++++
 vsftpd.pam      |  2 +-
 vsftpd.spec     |  4 ++++
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 vsftpd.ftpusers

diff --git a/vsftpd.changes b/vsftpd.changes
index 681548a..b1ce42d 100644
--- a/vsftpd.changes
+++ b/vsftpd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct  4 08:00:40 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>
+
+- Add vsftpd.ftpusers, the netcfg one is not maintained, outdated
+  and will be removed.
+- vsftpd.pam: use own copy of ftpusers.
+
 -------------------------------------------------------------------
 Tue Sep 26 09:20:33 UTC 2023 - Pedro Monreal <pmonreal@suse.com>
 
diff --git a/vsftpd.ftpusers b/vsftpd.ftpusers
new file mode 100644
index 0000000..2883e75
--- /dev/null
+++ b/vsftpd.ftpusers
@@ -0,0 +1,16 @@
+#
+# ftpusers      This file describes the names of the users that may
+#               _*NOT*_ log into the system via the FTP server.
+#               This usually includes "root", "uucp", "news" and the
+#               like, because those users have too much power to be
+#               allowed to do "just" FTP...
+#
+adm
+bin
+daemon
+games
+mail
+news
+nobody
+root
+uucp
diff --git a/vsftpd.pam b/vsftpd.pam
index 4c569d5..1fab4fe 100644
--- a/vsftpd.pam
+++ b/vsftpd.pam
@@ -3,7 +3,7 @@
 # Uncomment this to achieve what used to be ftpd -A.
 # auth       required     pam_listfile.so item=user sense=allow file=/etc/ftpchroot onerr=fail
 
-auth     required       pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
+auth     required       pam_listfile.so item=user sense=deny file=/etc/vftpd/ftpusers onerr=succeed
 # Uncomment the following line for anonymous ftp.
 #auth	 sufficient     pam_ftp.so
 auth     required       pam_shells.so
diff --git a/vsftpd.spec b/vsftpd.spec
index 8f5db05..208c7b9 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -38,6 +38,7 @@ Source1:        %{name}.pam
 Source2:        %{name}.logrotate
 Source3:        %{name}.init
 Source4:        README.SUSE
+Source5:        %{name}.ftpusers
 Source6:        %{name}.firewall
 Source7:        vsftpd.service
 Source8:        vsftpd@.service
@@ -204,6 +205,7 @@ install -D -m 600 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
 install -D -m 600 xinetd.d/%{name} %{buildroot}%{_sysconfdir}/xinetd.d/%{name}
 %endif
 install -D -m 644 $RPM_SOURCE_DIR/%{name}.pam %{buildroot}%{_pam_vendordir}/%{name}
+install -D -m 600 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd/ftpusers
 %if 0%{?suse_version} > 1500
 mkdir -p %{buildroot}%{_distconfdir}/logrotate.d
 install -D -m 644 $RPM_SOURCE_DIR/%{name}.logrotate %{buildroot}%{_distconfdir}/logrotate.d/%{name}
@@ -300,6 +302,8 @@ done
 %config %{_pam_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %endif
+%dir %{_sysconfdir}/vsftpd
+%config %{_sysconfdir}/vsftpd/ftpusers
 %{_mandir}/man5/%{name}.conf.*
 %{_mandir}/man8/%{name}.*
 %license LICENSE