Allows to use arbitrary annotations with the cyradm tool. diff -r 639190be2385 doc/man/cyradm.1.html --- a/doc/man/cyradm.1.html Mon Oct 27 18:48:18 2008 +0100 +++ b/doc/man/cyradm.1.html Mon Oct 27 18:48:25 2008 +0100 @@ -245,6 +245,13 @@

Sets an email address to which messages injected into the server via NNTP will be sent.

+
+ +
/explicit/annotation + +
+

Sets the annotation /explicit/annotation +on mailbox to value.

sharedseen diff -r 639190be2385 perl/imap/IMAP/Admin.pm --- a/perl/imap/IMAP/Admin.pm Mon Oct 27 18:48:18 2008 +0100 +++ b/perl/imap/IMAP/Admin.pm Mon Oct 27 18:48:26 2008 +0100 @@ -797,11 +797,11 @@ 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); diff -r 639190be2385 perl/imap/IMAP/Shell.pm --- a/perl/imap/IMAP/Shell.pm Mon Oct 27 18:48:18 2008 +0100 +++ b/perl/imap/IMAP/Shell.pm Mon Oct 27 18:48:26 2008 +0100 @@ -127,7 +127,7 @@ [\&_sc_info, '[mailbox]', 'display mailbox/server metadata'], mboxcfg => - [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value', + [\&_sc_mboxcfg, 'mailbox [comment|condstore|news2mail|expire|sieve|squat|/] value', 'configure mailbox'], mboxconfig => 'mboxcfg', reconstruct => @@ -1437,7 +1437,7 @@ while (defined ($opt = shift(@argv))) { last if $opt eq '--'; if ($opt =~ /^-/) { - die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n"; + die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/] value\n"; } else { push(@nargv, $opt); @@ -1446,7 +1446,7 @@ } push(@nargv, @argv); if (@nargv < 2) { - die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n"; + die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/] value\n"; } if (!$cyrref || !$$cyrref) { die "mboxconfig: no connection to server\n"; diff -r 639190be2385 perl/imap/cyradm.sh --- a/perl/imap/cyradm.sh Mon Oct 27 18:48:18 2008 +0100 +++ b/perl/imap/cyradm.sh Mon Oct 27 18:48:26 2008 +0100 @@ -241,6 +241,10 @@ Indicates that the mailbox should have a squat index created for it. +=item C + +Sets the annotation I on I to I. + =back =item C [C<--partition> I] I I