- faillog in /var/state/imap/faillog

- chattr +S for hashed dirs

Changed files:
    cyrus-imapd-pop.pamd -> 1.2
    cyrus-imapd.pamd -> 1.2
    cyrus-imapd.spec -> 1.4

diff --git a/cyrus-imapd-pop.pamd b/cyrus-imapd-pop.pamd
index 03b87e1bed4735590204a53df8d8891167430e5a..ff87c539e02a56be5e88ff4100f40085bf13a97b 100644 (file)
--- a/cyrus-imapd-pop.pamd
+++ b/cyrus-imapd-pop.pamd
@@ -1,9 +1,9 @@
 #%PAM-1.0
 auth           required        /lib/security/pam_listfile.so item=user sense=deny file=/etc/security/blacklist onerr=succeed
-auth           required        /lib/security/pam_listfile.so item=user sense=deny file=/etc/security/blacklist.imap onerr=succeed
+auth           required        /lib/security/pam_listfile.so item=user sense=deny file=/etc/security/blacklist.pop onerr=succeed
 auth           required        /lib/security/pam_unix.so
-auth           required        /lib/security/pam_tally.so file=/var/log/faillog onerr=succeed no_magic_root
+auth           required        /lib/security/pam_tally.so file=/var/state/imap/faillog onerr=succeed no_magic_root
 auth           required        /lib/security/pam_nologin.so
-account                required        /lib/security/pam_tally.so deny=0 file=/var/log/faillog onerr=succeed no_magic_root
+account                required        /lib/security/pam_tally.so deny=0 file=/var/state/imap/faillog onerr=succeed no_magic_root
 #account               required        /lib/security/pam_access.so
 account                required        /lib/security/pam_unix.so

diff --git a/cyrus-imapd.pamd b/cyrus-imapd.pamd
index 03b87e1bed4735590204a53df8d8891167430e5a..a46c03fcdc38faf55f0eddfe4b97fca59625c357 100644 (file)
--- a/cyrus-imapd.pamd
+++ b/cyrus-imapd.pamd
@@ -2,8 +2,8 @@
 auth           required        /lib/security/pam_listfile.so item=user sense=deny file=/etc/security/blacklist onerr=succeed
 auth           required        /lib/security/pam_listfile.so item=user sense=deny file=/etc/security/blacklist.imap onerr=succeed
 auth           required        /lib/security/pam_unix.so
-auth           required        /lib/security/pam_tally.so file=/var/log/faillog onerr=succeed no_magic_root
+auth           required        /lib/security/pam_tally.so file=/var/state/imap/faillog onerr=succeed no_magic_root
 auth           required        /lib/security/pam_nologin.so
-account                required        /lib/security/pam_tally.so deny=0 file=/var/log/faillog onerr=succeed no_magic_root
+account                required        /lib/security/pam_tally.so deny=0 file=/var/state/imap/faillog onerr=succeed no_magic_root
 #account               required        /lib/security/pam_access.so
 account                required        /lib/security/pam_unix.so

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index cb0fccc8ccf6091d4cf4bea50a870fb98411dba1..06acd5c5a676d2a4d683addf6ebb61a3bd098c45 100644 (file)
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -82,7 +82,10 @@ install -d \
        $RPM_BUILD_ROOT/var/spool/imap/stage. \
        $RPM_BUILD_ROOT/var/state/imap/{user,quota,proc,log,msg,deliverdb,sieve} \
        $RPM_BUILD_ROOT%{_libdir}/sendmail-cf/cf 
-touch $RPM_BUILD_ROOT/var/state/imap/mailboxes
+touch $RPM_BUILD_ROOT/var/state/imap/mailboxes \
+       $RPM_BUILD_ROOT/var/state/imap/faillog \
+       $RPM_BUILD_ROOT/etc/security/blacklist.imap \
+       $RPM_BUILD_ROOT/etc/security/blacklist.pop
 
 
 make install DESTDIR=$RPM_BUILD_ROOT CYRUS_USER="`id -u`" CYRUS_GROUP="`id -g`"
@@ -130,6 +133,9 @@ if [ -z "`id -u cyrus 2>/dev/null`" ]; then
 fi
 
 %post
+touch /var/state/imap/faillog
+chown cyrus.mail /var/state/imap/faillog
+chmod 640 /var/state/imap/faillog
 if [ -f /var/lock/subsys/rc-inetd ]; then
        /etc/rc.d/init.d/rc-inetd reload 1>&2
 else
@@ -139,8 +145,8 @@ fi
 
 # force synchronous updates
 cd /var/state/imap
-chattr +S . user quota 2>/dev/null
-chattr +S /var/spool/imap 2>/dev/null
+chattr +S . user quota user/* quota/* 2>/dev/null
+chattr +S /var/spool/imap /var/spool/imap/* 2>/dev/null
 
 %postun
 if [ -f /var/lock/subsys/rc-inetd ]; then
@@ -167,6 +173,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not size md5 mtime) /etc/logrotate.d/cyrus-imapd
 %attr( 640, root,root) %config(noreplace) %verify(not size md5 mtime) /etc/sysconfig/rc-inetd/*
 %attr( 440, cyrus,root) %config(noreplace) %verify(not size md5 mtime) /etc/pam.d/*
+%attr( 640, cyrus,mail) %ghost /var/state/imap/faillog
 %attr( 755, root,root) /etc/cron.daily/cyrus-imapd
 %attr( 755, root,root) %{_bindir}/*
 %attr(4750,cyrus,mail) %{_libexecdir}/deliver