Author: steffen
Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv17293
Modified Files:
imapd.morelogging.patch
Log Message:
Change the location of the syslog calls in BHs patch (Issue928)
Index: imapd.morelogging.patch
===================================================================
RCS file: /kolabrepository/server/imapd/imapd.morelogging.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imapd.morelogging.patch 17 Sep 2005 12:21:58 -0000 1.1
+++ imapd.morelogging.patch 17 Sep 2005 22:02:52 -0000 1.2
@@ -1,31 +1,33 @@
diff -upr cyrus-imapd-2.2.12.orig/imap/append.c cyrus-imapd-2.2.12/imap/append.c
--- cyrus-imapd-2.2.12.orig/imap/append.c 2004-05-22 05:45:48.000000000 +0200
-+++ cyrus-imapd-2.2.12/imap/append.c 2005-09-17 13:32:48.000000000 +0200
-@@ -549,6 +549,8 @@ int append_fromstage(struct appendstate
- lseek(mailbox->cache_fd, 0L, SEEK_END);
++++ cyrus-imapd-2.2.12/imap/append.c 2005-09-17 19:45:53.000000000 +0200
+@@ -636,6 +636,9 @@ int append_fromstage(struct appendstate
+ /* ok, we've successfully added a message */
+ as->quota_used += message_index.size;
- /* Create message file */
-+ syslog(LOG_DEBUG, "append_fromstage: create message %s:%d",
-+ as->m.name, message_index.uid);
- as->nummsg++;
- strlcpy(fname, mailbox->path, sizeof(fname));
- strlcat(fname, "/", sizeof(fname));
++ syslog(LOG_DEBUG, "append_fromstage: message %d added to %s",
++ message_index.uid, mailbox->name );
++
+ return 0;
+ }
+
+Only in cyrus-imapd-2.2.12/imap: append.c~
diff -upr cyrus-imapd-2.2.12.orig/imap/imapd.c cyrus-imapd-2.2.12/imap/imapd.c
--- cyrus-imapd-2.2.12.orig/imap/imapd.c 2005-02-14 07:39:55.000000000 +0100
-+++ cyrus-imapd-2.2.12/imap/imapd.c 2005-09-17 13:32:48.000000000 +0200
-@@ -3635,6 +3635,9 @@ char *sequence;
- {
- int r;
++++ cyrus-imapd-2.2.12/imap/imapd.c 2005-09-17 23:29:45.000000000 +0200
+@@ -3652,6 +3652,8 @@ char *sequence;
+ else {
+ prot_printf(imapd_out, "%s OK %s\r\n", tag,
+ error_message(IMAP_OK_COMPLETED));
++ syslog(LOG_DEBUG, "cmd_expunge: user %s, mailbox %s, sequence %s",
++ imapd_userid, imapd_mailbox->name, sequence ? sequence : "''");
+ }
+ }
-+ syslog(LOG_DEBUG, "cmd_expunge: user %s, mailbox %s, sequence %s",
-+ imapd_userid, imapd_mailbox->name, sequence ? sequence : "''");
-+
- if (!(imapd_mailbox->myrights & ACL_DELETE)) r = IMAP_PERMISSION_DENIED;
- else if (sequence) {
- r = mailbox_expunge(imapd_mailbox, 1, index_expungeuidlist, sequence);
+Only in cyrus-imapd-2.2.12/imap: imapd.c~
diff -upr cyrus-imapd-2.2.12.orig/imap/lmtpd.c cyrus-imapd-2.2.12/imap/lmtpd.c
--- cyrus-imapd-2.2.12.orig/imap/lmtpd.c 2004-12-17 17:32:15.000000000 +0100
-+++ cyrus-imapd-2.2.12/imap/lmtpd.c 2005-09-17 13:29:16.000000000 +0200
++++ cyrus-imapd-2.2.12/imap/lmtpd.c 2005-09-17 19:41:05.000000000 +0200
@@ -299,7 +299,10 @@ int deliver_mailbox(struct protstream *m
prot_rewind(msg);
r = append_fromstage(&as, stage, now,
@@ -40,7 +42,7 @@
diff -upr cyrus-imapd-2.2.12.orig/imap/lmtpproxyd.c cyrus-imapd-2.2.12/imap/lmtpproxyd.c
--- cyrus-imapd-2.2.12.orig/imap/lmtpproxyd.c 2004-12-17 17:32:16.000000000 +0100
-+++ cyrus-imapd-2.2.12/imap/lmtpproxyd.c 2005-09-17 13:29:41.000000000 +0200
++++ cyrus-imapd-2.2.12/imap/lmtpproxyd.c 2005-09-17 19:41:05.000000000 +0200
@@ -471,6 +471,11 @@ static void runme(struct mydata *mydata,
/* this is the only delivery we're attempting for this rcpt */
msg_setrcpt_status(msgdata, j, lt->rcpt[i].r);
@@ -55,7 +57,7 @@
case s_done:
diff -upr cyrus-imapd-2.2.12.orig/imap/lmtp_sieve.c cyrus-imapd-2.2.12/imap/lmtp_sieve.c
--- cyrus-imapd-2.2.12.orig/imap/lmtp_sieve.c 2004-06-01 15:47:16.000000000 +0200
-+++ cyrus-imapd-2.2.12/imap/lmtp_sieve.c 2005-09-17 12:07:52.000000000 +0200
++++ cyrus-imapd-2.2.12/imap/lmtp_sieve.c 2005-09-17 19:41:05.000000000 +0200
@@ -339,6 +339,7 @@ static int sieve_redirect(void *ac,
if (sievedb) duplicate_mark(buf, strlen(buf),
sievedb, strlen(sievedb), time(NULL), 0);
@@ -74,7 +76,7 @@
if (res == -1) {
diff -upr cyrus-imapd-2.2.12.orig/imap/mailbox.c cyrus-imapd-2.2.12/imap/mailbox.c
--- cyrus-imapd-2.2.12.orig/imap/mailbox.c 2005-02-14 07:39:57.000000000 +0100
-+++ cyrus-imapd-2.2.12/imap/mailbox.c 2005-09-17 13:32:48.000000000 +0200
++++ cyrus-imapd-2.2.12/imap/mailbox.c 2005-09-17 19:41:05.000000000 +0200
@@ -1911,6 +1911,8 @@ mailbox_expunge(struct mailbox *mailbox,
/* Delete message files */
*fnametail++ = '/';