gunnar: server/patches/cyrus-imapd KOLAB_cyrus-cyradm_2.3.9_Annotations.patch, NONE, 1.1 README_Annotations.patch, NONE, 1.1

[cvs at kolab.org]

Author: gunnar

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

Added Files:
	KOLAB_cyrus-cyradm_2.3.9_Annotations.patch 
	README_Annotations.patch 
Log Message:
Added the cyradm patch.

--- NEW FILE: KOLAB_cyrus-cyradm_2.3.9_Annotations.patch ---
Allows to use arbitrary annotations with the cyradm tool.

diff -r 124e8301a15d doc/man/cyradm.1.html
--- a/doc/man/cyradm.1.html	Mon Oct 01 11:18:56 2007 +0200
+++ b/doc/man/cyradm.1.html	Thu Oct 11 08:14:56 2007 +0200
@@ -255,6 +255,13 @@ mailboxes).</p>
 <dd>
 <p>Sets an email address to which messages injected into the server via NNTP 
 will be sent.</p>
+</dd>
+</li>
+<dt><strong><a NAME="item__2fexplicit_2fannotation"><code>/explicit/annotation</code></a></strong>
+
+<dd>
+<p>Sets the annotation <em>/explicit/annotation</em>
+on <em>mailbox</em> to <em>value</em>.</p>
 </dd>
 </li>
 </dl>
diff -r 124e8301a15d perl/imap/IMAP/Admin.pm
--- a/perl/imap/IMAP/Admin.pm	Mon Oct 01 11:18:56 2007 +0200
+++ b/perl/imap/IMAP/Admin.pm	Thu Oct 11 08:14:56 2007 +0200
@@ -795,11 +795,11 @@ sub mboxconfig {
     return undef;
   }
 
-  if(!exists($values{$entry})) {
-    $self->{error} = "Unknown parameter $entry";
-  }
-
-  $entry = $values{$entry};
+  if(exists($values{$entry})) {
+    $entry = $values{$entry};    
+  } else {
+    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
+  }
 
   my ($rc, $msg);
 
diff -r 124e8301a15d perl/imap/IMAP/Shell.pm
--- a/perl/imap/IMAP/Shell.pm	Mon Oct 01 11:18:56 2007 +0200
+++ b/perl/imap/IMAP/Shell.pm	Thu Oct 11 08:14:56 2007 +0200
@@ -126,7 +126,7 @@ my %builtins = (exit =>
 		  [\&_sc_info, '[mailbox]',
 		   'display mailbox/server metadata'],
 		mboxcfg =>
-		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat] value',
+		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/<explicit annotation>] value',
 		   'configure mailbox'],
 		mboxconfig => 'mboxcfg',
 		reconstruct =>
@@ -1424,7 +1424,7 @@ sub _sc_mboxcfg {
   while (defined ($opt = shift(@argv))) {
     last if $opt eq '--';
     if ($opt =~ /^-/) {
-      die "usage: mboxconfig mailbox [comment|condstore|news2mail|expire|sieve|squat] value\n";
+      die "usage: mboxconfig mailbox [comment|condstore|news2mail|expire|sieve|squat|/<explicit annotation>] value\n";
     }
     else {
       push(@nargv, $opt);
@@ -1433,7 +1433,7 @@ sub _sc_mboxcfg {
   }
   push(@nargv, @argv);
   if (@nargv < 2) {
-    die "usage: mboxconfig mailbox [comment|condstore|news2mail|expire|sieve|squat] value\n";
+    die "usage: mboxconfig mailbox [comment|condstore|news2mail|expire|sieve|squat|/<explicit annotation>] value\n";
   }
   if (!$cyrref || !$$cyrref) {
     die "mboxconfig: no connection to server\n";
diff -r 124e8301a15d perl/imap/cyradm.sh
--- a/perl/imap/cyradm.sh	Mon Oct 01 11:18:56 2007 +0200
+++ b/perl/imap/cyradm.sh	Thu Oct 11 08:14:56 2007 +0200
@@ -235,6 +235,10 @@ Sets an email address to which messages 
 Sets an email address to which messages injected into the server via NNTP 
 will be sent.
 
+=item C</explicit/annotation>
+
+Sets the annotation I</explicit/annotation> on I<mailbox> to I<value>. 
+
 =back 
 
 =item C<renamemailbox> [C<--partition> I<partition>] I<oldname> I<newname>

--- NEW FILE: README_Annotations.patch ---
DESCRIPTION:

Adds annotation support to the cyradm tool.

IMPACT:

Without this you will not be able to get/set custom annotations.

REFERENCES:

Wiki page:

http://wiki.kolab.org/index.php/Template:Patches_cyrus

Mercurial patch repository:

http://hg.pardus.de/cgi-bin/hg.cgi/kolab/patches/cyrus-imapd/summary

HISTORY

I currently don't know if this has been submitted alongside with
the main annotation patch.