rpm/vsftpd
SHA256
1
0
Fork 0
forked from pool/vsftpd
Code Pull Requests Activity

- Require shadow and do not output the error out of useradd

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=99
This commit is contained in:
Tomáš Chvátal 2016-03-23 10:08:13 +00:00 committed by Git OBS Bridge
parent 5378e1f66e
commit 88812d6821
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vsftpd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 23 10:07:55 UTC 2016 - tchvatal@suse.com
- Require shadow and do not output the error out of useradd
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 22 14:27:27 UTC 2016 - tchvatal@suse.com Tue Mar 22 14:27:27 UTC 2016 - tchvatal@suse.com

4
vsftpd.spec
View File

@ -74,7 +74,7 @@ BuildRequires: libcap-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pam-devel BuildRequires: pam-devel
Requires: logrotate Requires: logrotate
Requires(pre): %{_sbindir}/useradd Requires(pre): shadow
Provides: ftp-server Provides: ftp-server
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with_systemd} %if %{with_systemd}
@ -151,7 +151,7 @@ install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
%pre %pre
getent passwd ftpsecure >/dev/null || useradd -r -g nogroup -s /bin/false -c "Secure FTP User" -d %{_localstatedir}/lib/empty ftpsecure 2> /dev/null getent passwd ftpsecure >/dev/null || useradd -r -g nogroup -s /bin/false -c "Secure FTP User" -d %{_localstatedir}/lib/empty
%if %{with_systemd} %if %{with_systemd}
%service_add_pre %{name}.service %{name}@.service %{name}.socket %service_add_pre %{name}.service %{name}@.service %{name}.socket
%endif %endif