gunnar: server/patches/cyrus-imapd KOLAB_cyrus-imapd_2.3.9_Logging.patch, 1.1, 1.2

cvs at kolab.org cvs at kolab.org
Mon Oct 1 12:09:38 CEST 2007


Author: gunnar

Update of /kolabrepository/server/patches/cyrus-imapd
In directory doto:/tmp/cvs-serv13709

Modified Files:
	KOLAB_cyrus-imapd_2.3.9_Logging.patch 
Log Message:
Update logging patch to the version provided by Alain Spineux.

Index: KOLAB_cyrus-imapd_2.3.9_Logging.patch
===================================================================
RCS file: /kolabrepository/server/patches/cyrus-imapd/KOLAB_cyrus-imapd_2.3.9_Logging.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- KOLAB_cyrus-imapd_2.3.9_Logging.patch	29 Sep 2007 12:13:54 -0000	1.1
+++ KOLAB_cyrus-imapd_2.3.9_Logging.patch	1 Oct 2007 10:09:36 -0000	1.2
@@ -1,8 +1,8 @@
 Provides improved logging for the cyrus imapd server [Version: 2.3.9]
 
-diff -r 2b4b67cfafb7 imap/append.c
---- a/imap/append.c	Sat Sep 29 13:40:19 2007 +0200
-+++ b/imap/append.c	Sat Sep 29 13:40:37 2007 +0200
+diff -r 5e673d53c57c imap/append.c
+--- a/imap/append.c	Sat Sep 29 13:56:24 2007 +0200
++++ b/imap/append.c	Mon Oct 01 11:17:30 2007 +0200
 @@ -653,6 +653,9 @@ int append_fromstage(struct appendstate 
  
      /* ok, we've successfully added a message */
@@ -13,21 +13,40 @@
  
      return 0;
  }
-diff -r 2b4b67cfafb7 imap/imapd.c
---- a/imap/imapd.c	Sat Sep 29 13:40:19 2007 +0200
-+++ b/imap/imapd.c	Sat Sep 29 13:40:37 2007 +0200
-@@ -3514,6 +3514,8 @@ void cmd_close(char *tag)
-     else {
- 	prot_printf(imapd_out, "%s OK %s\r\n", tag,
- 		    error_message(IMAP_OK_COMPLETED));
+diff -r 5e673d53c57c imap/imapd.c
+--- a/imap/imapd.c	Sat Sep 29 13:56:24 2007 +0200
++++ b/imap/imapd.c	Mon Oct 01 11:17:30 2007 +0200
+@@ -3504,17 +3504,19 @@ void cmd_close(char *tag)
+ 	if (!r) sync_log_mailbox(imapd_mailbox->name);
+     }
+ 
++    if (r) {
++	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
++    }
++    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, "''");
-     }
++    }
++
+     index_closemailbox(imapd_mailbox);
+     mailbox_close(imapd_mailbox);
+     imapd_mailbox = 0;
+-
+-    if (r) {
+-	prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+-    }
+-    else {
+-	prot_printf(imapd_out, "%s OK %s\r\n", tag,
+-		    error_message(IMAP_OK_COMPLETED));
+-    }
  }    
  
-diff -r 2b4b67cfafb7 imap/mailbox.c
---- a/imap/mailbox.c	Sat Sep 29 13:40:19 2007 +0200
-+++ b/imap/mailbox.c	Sat Sep 29 13:40:37 2007 +0200
+ /*
+diff -r 5e673d53c57c imap/mailbox.c
+--- a/imap/mailbox.c	Sat Sep 29 13:56:24 2007 +0200
++++ b/imap/mailbox.c	Mon Oct 01 11:17:30 2007 +0200
 @@ -2457,6 +2457,8 @@ int mailbox_expunge(struct mailbox *mail
  	*(fname->tail)++ = '/';
  	fname->len++;





More information about the commits mailing list