1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
diff -Naur cyrus-imapd-2.3.7.orig/doc/man/cyradm.1.html cyrus-imapd-2.3.7/doc/man/cyradm.1.html
--- cyrus-imapd-2.3.7.orig/doc/man/cyradm.1.html 2006-10-03 17:46:02.000000000 +0200
+++ cyrus-imapd-2.3.7/doc/man/cyradm.1.html 2006-10-03 17:52:36.000000000 +0200
@@ -257,6 +257,13 @@
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>
<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>
diff -Naur cyrus-imapd-2.3.7.orig/perl/imap/cyradm.sh cyrus-imapd-2.3.7/perl/imap/cyradm.sh
--- cyrus-imapd-2.3.7.orig/perl/imap/cyradm.sh 2006-10-03 17:46:04.000000000 +0200
+++ cyrus-imapd-2.3.7/perl/imap/cyradm.sh 2006-10-03 17:46:31.000000000 +0200
@@ -235,6 +235,10 @@
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 -Naur cyrus-imapd-2.3.7.orig/perl/imap/IMAP/Admin.pm cyrus-imapd-2.3.7/perl/imap/IMAP/Admin.pm
--- cyrus-imapd-2.3.7.orig/perl/imap/IMAP/Admin.pm 2006-10-03 17:46:04.000000000 +0200
+++ cyrus-imapd-2.3.7/perl/imap/IMAP/Admin.pm 2006-10-03 17:46:31.000000000 +0200
@@ -795,12 +795,12 @@
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 -Naur cyrus-imapd-2.3.7.orig/perl/imap/IMAP/Shell.pm cyrus-imapd-2.3.7/perl/imap/IMAP/Shell.pm
--- cyrus-imapd-2.3.7.orig/perl/imap/IMAP/Shell.pm 2006-10-03 17:46:04.000000000 +0200
+++ cyrus-imapd-2.3.7/perl/imap/IMAP/Shell.pm 2006-10-03 17:53:26.000000000 +0200
@@ -126,7 +126,7 @@
[\&_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 @@
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 @@
}
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";
|
GitWeb