Allows to use arbitrary annotations with the cyradm tool. diff -r a07884e259c3 doc/man/cyradm.1.html --- a/doc/man/cyradm.1.html Thu Oct 25 08:24:39 2007 +0200 +++ b/doc/man/cyradm.1.html Thu Oct 25 08:29:40 2007 +0200 @@ -241,6 +241,13 @@ The currently supported attributes are:<
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 a07884e259c3 perl/imap/IMAP/Admin.pm
--- a/perl/imap/IMAP/Admin.pm Thu Oct 25 08:24:39 2007 +0200
+++ b/perl/imap/IMAP/Admin.pm Thu Oct 25 08:29:40 2007 +0200
@@ -796,11 +796,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 a07884e259c3 perl/imap/IMAP/Shell.pm
--- a/perl/imap/IMAP/Shell.pm Thu Oct 25 08:24:39 2007 +0200
+++ b/perl/imap/IMAP/Shell.pm Thu Oct 25 08:29:40 2007 +0200
@@ -126,7 +126,7 @@ my %builtins = (exit =>
[\&_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|/