rpms/cyrus-imapd/devel cyrus-imapd.init, 1.3, 1.4 cyrus-imapd.spec, 1.61, 1.62

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13536

Modified Files:
	cyrus-imapd.init cyrus-imapd.spec 
Log Message:
* Fri Oct 09 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-3
- fix cyrus user shell for db import (#528126)



Index: cyrus-imapd.init
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cyrus-imapd.init	18 Sep 2009 16:12:36 -0000	1.3
+++ cyrus-imapd.init	9 Oct 2009 12:15:05 -0000	1.4
@@ -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"


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- cyrus-imapd.spec	18 Sep 2009 16:12:36 -0000	1.61
+++ cyrus-imapd.spec	9 Oct 2009 12:15:05 -0000	1.62
@@ -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 <mhlavink at redhat.com> - 2.3.15-3
+- fix cyrus user shell for db import (#528126)
+
 * Fri Sep 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.15-2
 - make init script LSB-compliant (#523227)