diff --git a/cyrus-imapd.init b/cyrus-imapd.init index fcad53e..214e435 100644 --- a/cyrus-imapd.init +++ b/cyrus-imapd.init @@ -20,8 +20,8 @@ lockfile=/var/lock/subsys/cyrus-imapd pidfile=/var/run/cyrus-master.pid prog="cyrus-imapd" -if [ -f /etc/sysconfig/dovecot ]; then - . /etc/sysconfig/dovecot +if [ -f /etc/sysconfig/$prog ]; then + . /etc/sysconfig/$prog fi # check if the config files are present diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index ffaf39a..b24587f 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -1,6 +1,6 @@ Name: cyrus-imapd Version: 2.3.15 -Release: 4%{?dist} +Release: 5%{?dist} # ********************** BUILD TIME OPTIONS START ********************** @@ -736,6 +736,9 @@ fi %{_mandir}/man1/* %changelog +* Fri Nov 06 2009 Michal Hlavinka - 2.3.15-5 +- fix sourcing of /etc/sysconfig/cyrus-imapd (#533320) + * Thu Nov 05 2009 Michal Hlavinka - 2.3.15-4 - do not fill logs with mail (de)compression messages (#528093) @@ -748,7 +751,7 @@ fi * Fri Sep 18 2009 Michal Hlavinka - 2.3.15-1 - fix buffer overflow in cyrus sieve (CVE-2009-3235) --* Wed Sep 16 2009 Tomas Mraz - 2.3.14-6 +* Wed Sep 16 2009 Tomas Mraz - 2.3.14-6 - use password-auth common PAM configuration instead of system-auth * Mon Sep 07 2009 Michal Hlavinka - 2.3.14-5