rpms/cyrus-imapd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix cyrus user shell for db import (#528126)

Browse Source
This commit is contained in:
Michal Hlavinka 2009-10-09 12:15:05 +00:00
parent 634b995505
commit 04b690052b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cyrus-imapd.init
View File

@ -60,7 +60,7 @@ start() {
if [ $QUICK -eq 0 ]; then if [ $QUICK -eq 0 ]; then
echo -n $"Importing $prog databases: " echo -n $"Importing $prog databases: "
cd $CONFIGDIRECTORY 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=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
success $"$prog importing databases" success $"$prog importing databases"
@ -92,7 +92,7 @@ stop() {
echo echo
echo -n $"Exporting $prog databases: " echo -n $"Exporting $prog databases: "
cd $CONFIGDIRECTORY 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=$? RETVAL2=$?
if [ $RETVAL2 -eq 0 ]; then if [ $RETVAL2 -eq 0 ]; then
success $"$prog exporting databases" success $"$prog exporting databases"

9
cyrus-imapd.spec
View File

@ -1,6 +1,6 @@
Name: cyrus-imapd Name: cyrus-imapd
Version: 2.3.15 Version: 2.3.15
Release: 2%{?dist} Release: 3%{?dist}
# ********************** BUILD TIME OPTIONS START ********************** # ********************** BUILD TIME OPTIONS START **********************
@ -529,10 +529,10 @@ fi
%if %{SASLGROUP} %if %{SASLGROUP}
/usr/sbin/groupadd -g %{gid} -r %{_saslgroup} 2> /dev/null || : /usr/sbin/groupadd -g %{gid} -r %{_saslgroup} 2> /dev/null || :
/usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \ /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 %else
/usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \ /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 %endif
%post utils %post utils
@ -731,6 +731,9 @@ fi
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Fri Oct 09 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-3
- fix cyrus user shell for db import (#528126)
* Fri Sep 18 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-2 * Fri Sep 18 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-2
- make init script LSB-compliant (#523227) - make init script LSB-compliant (#523227)