]>
Commit | Line | Data |
---|---|---|
b40388bb MT |
1 | diff -Naur cyrus-imapd-2.2.12/doc/man/deliver.8.html cyrus-imapd-2.2.12.munge8bit/doc/man/deliver.8.html |
2 | --- cyrus-imapd-2.2.12/doc/man/deliver.8.html 2005-02-14 19:02:17.000000000 +0100 | |
3 | +++ cyrus-imapd-2.2.12.munge8bit/doc/man/deliver.8.html 2005-06-18 19:02:39.000000000 +0200 | |
4 | @@ -223,13 +223,15 @@ | |
5 | <td width="10%"></td> | |
6 | <td width="89%"> | |
7 | <p>Depending on the setting of <b>reject8bit</b> in | |
8 | -<b>imapd.conf(5)</b>, deliver either rejects messages with | |
9 | -8-bit-set characters in the headers or changes these | |
10 | -characters to ‘X’. This is because such | |
11 | -characters can’t be interpreted since the character | |
12 | -set is not known, although some communities not well-served | |
13 | -by US-ASCII assume that those characters can be used to | |
14 | -represent characters not present in US-ASCII.</p> | |
15 | +<b>imapd.conf(5)</b>, deliver either rejects/accepts | |
16 | +messages with 8-bit-set characters in the headers. If we | |
17 | +accept messages with 8-bit-set characters in the headers, | |
18 | +then depending on the setting of <b>munge8bit</b>, these | |
19 | +characters are either left un-touched or changed to ‘X’. This | |
20 | +is because such characters can’t be interpreted since | |
21 | +the character set is not known, although some communities | |
22 | +not well-served by US-ASCII assume that those characters can | |
23 | +be used to represent characters not present in US-ASCII.</p> | |
24 | <!-- INDENTATION --> | |
25 | <p>A method for encoding 8-bit-set characters is provided by | |
26 | RFC 2047.</p> | |
27 | diff -Naur cyrus-imapd-2.2.12/doc/man/imapd.conf.5.html cyrus-imapd-2.2.12.munge8bit/doc/man/imapd.conf.5.html | |
28 | --- cyrus-imapd-2.2.12/doc/man/imapd.conf.5.html 2005-02-14 19:02:18.000000000 +0100 | |
29 | +++ cyrus-imapd-2.2.12.munge8bit/doc/man/imapd.conf.5.html 2005-06-18 18:59:46.000000000 +0200 | |
30 | @@ -2562,7 +2562,7 @@ | |
31 | <td width="80%"> | |
32 | <p>If enabled, lmtpd rejects messages with 8-bit characters | |
33 | in the headers. Otherwise, 8-bit characters are changed to | |
34 | -‘X’. (A proper soultion to non-ASCII characters | |
35 | +‘X’. (A proper solution to non-ASCII characters | |
36 | in headers is offered by RFC 2047 and its predecessors.)</p> | |
37 | </td> | |
38 | </table> | |
39 | diff -Naur cyrus-imapd-2.2.12/imap/message.c cyrus-imapd-2.2.12.munge8bit/imap/message.c | |
40 | --- cyrus-imapd-2.2.12/imap/message.c 2004-09-16 19:58:54.000000000 +0200 | |
41 | +++ cyrus-imapd-2.2.12.munge8bit/imap/message.c 2005-06-18 18:58:33.000000000 +0200 | |
42 | @@ -227,6 +227,7 @@ | |
43 | int n; | |
44 | int sawcr = 0, sawnl; | |
45 | int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT); | |
46 | + int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT); | |
47 | int inheader = 1, blankline = 1; | |
48 | ||
49 | while (size) { | |
50 | @@ -262,7 +263,7 @@ | |
51 | /* We have been configured to reject all mail of this | |
52 | form. */ | |
53 | if (!r) r = IMAP_MESSAGE_CONTAINS8BIT; | |
54 | - } else { | |
55 | + } else if (munge8bit) { | |
56 | /* We have been configured to munge all mail of this | |
57 | form. */ | |
58 | *p = 'X'; | |
59 | diff -Naur cyrus-imapd-2.2.12/imap/spool.c cyrus-imapd-2.2.12.munge8bit/imap/spool.c | |
60 | --- cyrus-imapd-2.2.12/imap/spool.c 2004-10-27 22:40:50.000000000 +0200 | |
61 | +++ cyrus-imapd-2.2.12.munge8bit/imap/spool.c 2005-06-18 18:58:33.000000000 +0200 | |
62 | @@ -140,6 +140,7 @@ | |
63 | state s = NAME_START; | |
64 | int r = 0; | |
65 | int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT); | |
66 | + int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT); | |
67 | const char **skip = NULL; | |
68 | ||
69 | if (namelen == 0) { | |
70 | @@ -266,7 +267,7 @@ | |
71 | form. */ | |
72 | r = IMAP_MESSAGE_CONTAINS8BIT; | |
73 | goto ph_error; | |
74 | - } else { | |
75 | + } else if (munge8bit) { | |
76 | /* We have been configured to munge all mail of this | |
77 | form. */ | |
78 | c = 'X'; | |
79 | diff -Naur cyrus-imapd-2.2.12/lib/imapoptions cyrus-imapd-2.2.12.munge8bit/lib/imapoptions | |
80 | --- cyrus-imapd-2.2.12/lib/imapoptions 2004-07-21 21:07:45.000000000 +0200 | |
81 | +++ cyrus-imapd-2.2.12.munge8bit/lib/imapoptions 2005-06-18 18:58:33.000000000 +0200 | |
82 | @@ -458,6 +458,12 @@ | |
83 | { "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "skiplist")} | |
84 | /* The cyrusdb backend to use for the mailbox list. */ | |
85 | ||
86 | +{ "munge8bit", 1, SWITCH } | |
87 | +/* If enabled, lmtpd munges messages with 8-bit characters. These characters | |
88 | + are changed to `X'. If \fBreject8bit\fR is enabled, setting \fBmunge8bit\fR | |
89 | + has no effect. (A proper solution to non-ASCII characters in headers is | |
90 | + offered by RFC 2047 and its predecessors.) */ | |
91 | + | |
92 | # xxx badly worded | |
93 | { "mupdate_connections_max", 128, INT } | |
94 | /* The max number of connections that a mupdate process will allow, this | |
95 | @@ -670,9 +676,7 @@ | |
96 | ||
97 | { "reject8bit", 0, SWITCH } | |
98 | /* If enabled, lmtpd rejects messages with 8-bit characters in the | |
99 | - headers. Otherwise, 8-bit characters are changed to `X'. (A | |
100 | - proper soultion to non-ASCII characters in headers is offered by | |
101 | - RFC 2047 and its predecessors.) */ | |
102 | + headers. */ | |
103 | ||
104 | { "rfc2046_strict", 0, SWITCH } | |
105 | /* If enabled, imapd will be strict (per RFC 2046) when matching MIME | |
106 | diff -Naur cyrus-imapd-2.2.12/man/deliver.8 cyrus-imapd-2.2.12.munge8bit/man/deliver.8 | |
107 | --- cyrus-imapd-2.2.12/man/deliver.8 2004-06-21 20:40:10.000000000 +0200 | |
108 | +++ cyrus-imapd-2.2.12.munge8bit/man/deliver.8 2005-06-18 18:58:33.000000000 +0200 | |
109 | @@ -147,8 +147,10 @@ | |
110 | Accept messages using the LMTP protocol. | |
111 | .SH NOTES | |
112 | Depending on the setting of \fBreject8bit\fR in \fBimapd.conf(5)\fR, deliver | |
113 | -either rejects messages with 8-bit-set characters in the headers or | |
114 | -changes these characters to `X'. | |
115 | +either rejects/accepts messages with 8-bit-set characters in the headers. | |
116 | +If we accept messages with 8-bit-set characters in the headers, then depending | |
117 | +on the setting of \fBmunge8bit\fR, these characters are either left un-touched | |
118 | +or changed to . | |
119 | This is because such characters can't be interpreted since the | |
120 | character set is not known, although some communities not well-served by | |
121 | US-ASCII assume that those characters can be used to represent characters not | |
122 | diff -Naur cyrus-imapd-2.2.12/man/imapd.conf.5 cyrus-imapd-2.2.12.munge8bit/man/imapd.conf.5 | |
123 | --- cyrus-imapd-2.2.12/man/imapd.conf.5 2005-02-14 19:02:16.000000000 +0100 | |
124 | +++ cyrus-imapd-2.2.12.munge8bit/man/imapd.conf.5 2005-06-18 18:59:08.000000000 +0200 | |
125 | @@ -551,7 +551,7 @@ | |
126 | .IP "\fBreject8bit:\fR 0" 5 | |
127 | If enabled, lmtpd rejects messages with 8-bit characters in the | |
128 | headers. Otherwise, 8-bit characters are changed to `X'. (A | |
129 | -proper soultion to non-ASCII characters in headers is offered by | |
130 | +proper solution to non-ASCII characters in headers is offered by | |
131 | RFC 2047 and its predecessors.) | |
132 | .IP "\fBrfc2046_strict:\fR 0" 5 | |
133 | If enabled, imapd will be strict (per RFC 2046) when matching MIME |