diff --git a/cyrus-imapd.init b/cyrus-imapd.init index 3ea6127..fcad53e 100644 --- a/cyrus-imapd.init +++ b/cyrus-imapd.init @@ -60,7 +60,7 @@ start() { if [ $QUICK -eq 0 ]; then echo -n $"Importing $prog databases: " cd $CONFIGDIRECTORY - runuser - cyrus -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all > ${CONFIGDIRECTORY}/rpm/db_import.log 2>&1" < /dev/null + runuser - cyrus -s /bin/sh -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all > ${CONFIGDIRECTORY}/rpm/db_import.log 2>&1" < /dev/null RETVAL=$? if [ $RETVAL -eq 0 ]; then success $"$prog importing databases" @@ -92,7 +92,7 @@ stop() { echo echo -n $"Exporting $prog databases: " cd $CONFIGDIRECTORY - runuser - cyrus -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all export > ${CONFIGDIRECTORY}/rpm/db_export.log 2>&1" < /dev/null + runuser - cyrus -s /bin/sh -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all export > ${CONFIGDIRECTORY}/rpm/db_export.log 2>&1" < /dev/null RETVAL2=$? if [ $RETVAL2 -eq 0 ]; then success $"$prog exporting databases" diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index b7a7222..ebe9e46 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -1,6 +1,6 @@ Name: cyrus-imapd Version: 2.3.15 -Release: 2%{?dist} +Release: 3%{?dist} # ********************** BUILD TIME OPTIONS START ********************** @@ -529,10 +529,10 @@ fi %if %{SASLGROUP} /usr/sbin/groupadd -g %{gid} -r %{_saslgroup} 2> /dev/null || : /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \ - -G %{_saslgroup} -s /bin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || : + -G %{_saslgroup} -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || : %else /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \ - -s /bin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || : + -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || : %endif %post utils @@ -731,6 +731,9 @@ fi %{_mandir}/man1/* %changelog +* Fri Oct 09 2009 Michal Hlavinka - 2.3.15-3 +- fix cyrus user shell for db import (#528126) + * Fri Sep 18 2009 Michal Hlavinka - 2.3.15-2 - make init script LSB-compliant (#523227)