do not hide errors if cyrus user can't be added

This commit is contained in:
Michal Hlavinka 2011-10-11 15:11:05 +02:00
parent db5cac617d
commit f1a444adf7

View File

@ -1,6 +1,6 @@
Name: cyrus-imapd
Version: 2.4.12
Release: 1%{?dist}
Release: 2%{?dist}
%define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
@ -287,9 +287,9 @@ rm -rf %{buildroot}
%pre
# Create 'cyrus' user on target host
/usr/sbin/groupadd -g %{gid} -r saslauth 2> /dev/null || :
/usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_var}/lib/imap -g %{_cyrusgroup} \
-G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
getent group saslauth >/dev/null || /usr/sbin/groupadd -g %{gid} -r saslauth
getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_var}/lib/imap -g %{_cyrusgroup} \
-G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer}
%post
/bin/systemctl daemon-reload > /dev/null 2>&1 :
@ -477,6 +477,9 @@ fi
%{_mandir}/man1/*
%changelog
* Tue Oct 11 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-2
- do not hide errors if cyrus user can't be added
* Wed Oct 05 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-1
- cyrus-imapd updated to 2.4.12
- fixes incomplete authentication checks in nntpd (Secunia SA46093)