steffen: server/imapd cyradm.annotate.patch,NONE,1.2.2.1

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv9453

Added Files:
      Tag: kolab_2_0_branch
	cyradm.annotate.patch 
Log Message:
cyradm mbxcfg /annotation blah

--- NEW FILE: cyradm.annotate.patch ---
diff -upr ../cyrus-imapd-2.2.12.orig/doc/man/cyradm.1.html ./doc/man/cyradm.1.html
--- ../cyrus-imapd-2.2.12.orig/doc/man/cyradm.1.html	2005-02-14 19:02:26.000000000 +0100
+++ ./doc/man/cyradm.1.html	2005-08-29 04:35:21.000000000 +0200
@@ -191,6 +191,10 @@ Indicates that the mailbox should have a
 <DD>
 Sets an email address to which messages injected into the server via NNTP 
 will be sent.
+<P></P>
+<DT><STRONG><A NAME="item__2fexplicit_2fannotation"><CODE>/explicit/annotation</CODE></A></STRONG><BR>
+<DD>
+Sets the annotation <EM>/explicit/annotation</EM> on <EM>mailbox</EM> to <EM>value</EM>.
 <P></P></DL>
 <DT><STRONG><A NAME="item_renamemailbox_%5B%2D%2Dpartition_partition%5D_oldn"><CODE>renamemailbox</CODE> [<CODE>--partition</CODE> <EM>partition</EM>] <EM>oldname</EM> <EM>newname</EM></A></STRONG><BR>
 <DD>
diff -upr ../cyrus-imapd-2.2.12.orig/perl/imap/cyradm.sh ./perl/imap/cyradm.sh
--- ../cyrus-imapd-2.2.12.orig/perl/imap/cyradm.sh	2004-01-15 15:35:34.000000000 +0100
+++ ./perl/imap/cyradm.sh	2005-08-29 04:28:51.000000000 +0200
@@ -225,6 +225,10 @@ Indicates that the mailbox should have a
 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>
diff -upr ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Admin.pm ./perl/imap/IMAP/Admin.pm
--- ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Admin.pm	2004-02-19 23:50:12.000000000 +0100
+++ ./perl/imap/IMAP/Admin.pm	2005-08-29 04:02:38.000000000 +0200
@@ -789,12 +789,12 @@ sub mboxconfig {
     return undef;
   }
 
-  if(!exists($values{$entry})) {
-    $self->{error} = "Unknown parameter $entry";
+  if(exists($values{$entry})) {
+    $entry = $values{$entry};    
+  } else {
+    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
   }
 
-  $entry = $values{$entry};
-
   my ($rc, $msg);
 
   $value = undef if($value eq "none");
diff -upr ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Shell.pm ./perl/imap/IMAP/Shell.pm
--- ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Shell.pm	2004-01-15 15:35:35.000000000 +0100
+++ ./perl/imap/IMAP/Shell.pm	2005-08-29 04:02:38.000000000 +0200
@@ -126,7 +126,7 @@ my %builtins = (exit =>
 		  [\&_sc_info, '[mailbox]',
 		   'display mailbox/server metadata'],
 		mboxcfg =>
-		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat] value',
+		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value',
 		   'configure mailbox'],
 		mboxconfig => 'mboxcfg',
 		reconstruct =>
@@ -1339,7 +1339,7 @@ sub _sc_mboxcfg {
   while (defined ($opt = shift(@argv))) {
     last if $opt eq '--';
     if ($opt =~ /^-/) {
-      die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
+      die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
     }
     else {
       push(@nargv, $opt);
@@ -1348,7 +1348,7 @@ sub _sc_mboxcfg {
   }
   push(@nargv, @argv);
   if (@nargv < 2) {
-    die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
+    die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
   }
   if (!$cyrref || !$$cyrref) {
     die "mboxconfig: no connection to server\n";