[SVN] r580 - in /trunk/cyrus-imapd-2.2.13/debian: logcheck.ignore
logcheck.violations.ignore patches/77-change-missing-sieve-notice.dpatch
debian at incase.de
debian at incase.de
Mon Aug 21 21:33:35 UTC 2006
Author: sven
Date: Mon Aug 21 23:33:31 2006
New Revision: 580
URL: https://mail.incase.de/viewcvs?rev=580&root=cyrus22&view=rev
Log:
Ooops, changed wrong file in previous patch. Also, this fix looks better to me
Modified:
trunk/cyrus-imapd-2.2.13/debian/logcheck.ignore
trunk/cyrus-imapd-2.2.13/debian/logcheck.violations.ignore
trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch
Modified: trunk/cyrus-imapd-2.2.13/debian/logcheck.ignore
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/logcheck.ignore?rev=580&root=cyrus22&r1=579&r2=580&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/logcheck.ignore (original)
+++ trunk/cyrus-imapd-2.2.13/debian/logcheck.ignore Mon Aug 21 23:33:31 2006
@@ -51,5 +51,6 @@
cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +unready for connections
cyrus/squatter\[[0-9]+\]: +(done )?(indexing|skipping) mailbox
cyrus/notifyd\[[0-9]+\]: do_notify using method
-cyrus/lmtpunix\[[0-9]+\]: +WARNING: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+cyrus/lmtpunix\[[0-9]+\]: +IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+cyrus/lmtpunix\[[0-9]+\]: +WARNING: sieve script [/a-zA-Z^]+/defaultbc doesn't exist: No such file or directory
cyrus/lmtpunix\[[0-9]+\]: +Delivered: <[^>]*> to mailbox: .*
Modified: trunk/cyrus-imapd-2.2.13/debian/logcheck.violations.ignore
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/logcheck.violations.ignore?rev=580&root=cyrus22&r1=579&r2=580&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/logcheck.violations.ignore (original)
+++ trunk/cyrus-imapd-2.2.13/debian/logcheck.violations.ignore Mon Aug 21 23:33:31 2006
@@ -1,4 +1,5 @@
-cyrus/lmtpunix\[[0-9]+\]: +WARNING: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+cyrus/lmtpunix\[[0-9]+\]: +IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+cyrus/lmtpunix\[[0-9]+\]: +WARNING: sieve script [/a-zA-Z^]+/defaultbc doesn't exist: No such file or directory
cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(\[[a-z0-9]+\] )?STARTTLS( negotiation)? failed:
cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +pop3s failed:
cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT failed
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch?rev=580&root=cyrus22&r1=579&r2=580&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch Mon Aug 21 23:33:31 2006
@@ -6,15 +6,19 @@
## DP: script is missing
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/sieve/sieved.c /tmp/dpep.N8OTr9/cyrus-imapd-2.2.13/sieve/sieved.c
---- cyrus-imapd-2.2.13/sieve/sieved.c 2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.N8OTr9/cyrus-imapd-2.2.13/sieve/sieved.c 2006-08-21 23:17:30.638015906 +0200
-@@ -63,7 +63,7 @@
- unsigned long len=0;
+diff -urNad cyrus-imapd-2.2.13/sieve/script.c /tmp/dpep.ggizfh/cyrus-imapd-2.2.13/sieve/script.c
+--- cyrus-imapd-2.2.13/sieve/script.c 2005-03-12 23:09:22.000000000 +0100
++++ /tmp/dpep.ggizfh/cyrus-imapd-2.2.13/sieve/script.c 2006-08-21 23:31:25.979899091 +0200
+@@ -418,7 +418,11 @@
+ if (!fname || !ret) return SIEVE_FAIL;
- if (fstat(fd, &sbuf) == -1) {
-- printf("IOERROR: fstating sieve script: %m");
-+ printf("WARNING: IOERROR: fstating sieve script: %m");
+ if (stat(fname, &sbuf) == -1) {
+- syslog(LOG_DEBUG, "IOERROR: fstating sieve script %s: %m", fname);
++ if (errno == ENOENT) {
++ syslog(LOG_DEBUG, "WARNING: sieve script %s doesn't exist: %m", fname);
++ } else {
++ syslog(LOG_DEBUG, "IOERROR: fstating sieve script %s: %m", fname);
++ }
return SIEVE_FAIL;
}
-
+
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list