Attachment #52298 for bug #18706

Lines 95-100 Link Here

(-)cyrus-imapd-2.2.12/lib/imapoptions (+4 lines)
95	{ "afspts_mycell", NULL, STRING }	95	{ "afspts_mycell", NULL, STRING }
96	/* Cell to use for AFS PTS lookups. Defaults to the local cell. */	96	/* Cell to use for AFS PTS lookups. Defaults to the local cell. */
97		97
		98	{ "allow8bitheaders", 0, SWITCH }
		99	/* Allow 8bit ASCII characters in headers of e-mail. Is only checked if
		100	reject8bit is off (see reject8bit below). Defaults to off. */
		101
98	{ "allowallsubscribe", 0, SWITCH }	102	{ "allowallsubscribe", 0, SWITCH }
99	/* Allow subscription to nonexistent mailboxes. This option is	103	/* Allow subscription to nonexistent mailboxes. This option is
100	typically used on backend servers in a Murder so that users can	104	typically used on backend servers in a Murder so that users can




    int n;
    int sawcr = 0, sawnl;
    int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
    int allow8bitheaders = config_getswitch(IMAPOPT_ALLOW8BITHEADERS);
    int inheader = 1, blankline = 1;

    while (size) {

		    } else {
			/* We have been configured to munge all mail of this
			   form. */
			if (allow8bitheaders) {
			/* We allow all mail with 8 bit headers 
			   and do not force our users to change
			   the way of the world because of one 
			   stupid rfc 2046 (or was it 2047?) */
			}
			else {
			  /* We replace each 8bit-Char with X */
			  *p = 'X';
			}
		    }
		}
	    }

Lines 19-24 Link Here

(-)cyrus-imapd-2.2.12/lib/imapopts.h (+1 lines)
19	IMAPOPT_ADMINS,	19	IMAPOPT_ADMINS,
20	IMAPOPT_AFSPTS_LOCALREALMS,	20	IMAPOPT_AFSPTS_LOCALREALMS,
21	IMAPOPT_AFSPTS_MYCELL,	21	IMAPOPT_AFSPTS_MYCELL,
		22	IMAPOPT_ALLOW8BITHEADERS,
22	IMAPOPT_ALLOWALLSUBSCRIBE,	23	IMAPOPT_ALLOWALLSUBSCRIBE,
23	IMAPOPT_ALLOWANONYMOUSLOGIN,	24	IMAPOPT_ALLOWANONYMOUSLOGIN,
24	IMAPOPT_ALLOWAPOP,	25	IMAPOPT_ALLOWAPOP,

Lines 35-40 Link Here

(-)cyrus-imapd-2.2.12/lib/imapopts.c (+1 lines)
35	{ IMAPOPT_AFSPTS_MYCELL, "afspts_mycell", 0, {(void *)(NULL)}, OPT_STRING, { { NULL, IMAP_ENUM_ZERO } } },	35	{ IMAPOPT_AFSPTS_MYCELL, "afspts_mycell", 0, {(void *)(NULL)}, OPT_STRING, { { NULL, IMAP_ENUM_ZERO } } },
36	{ IMAPOPT_ALLOWALLSUBSCRIBE, "allowallsubscribe", 0, {(void*)0}, OPT_SWITCH, { { NULL, IMAP_ENUM_ZERO } } },	36	{ IMAPOPT_ALLOWALLSUBSCRIBE, "allowallsubscribe", 0, {(void*)0}, OPT_SWITCH, { { NULL, IMAP_ENUM_ZERO } } },
37	{ IMAPOPT_ALLOWANONYMOUSLOGIN, "allowanonymouslogin", 0, {(void*)0}, OPT_SWITCH, { { NULL, IMAP_ENUM_ZERO } } },	37	{ IMAPOPT_ALLOWANONYMOUSLOGIN, "allowanonymouslogin", 0, {(void*)0}, OPT_SWITCH, { { NULL, IMAP_ENUM_ZERO } } },
		38	{ IMAPOPT_ALLOW8BITHEADERS, "allow8bitheaders", 0, {(void*)0}, OPT_SWITCH, { { NULL, IMAP_ENUM_ZERO } } },
38	{ IMAPOPT_ALLOWAPOP, "allowapop", 0, {(void*)1}, OPT_SWITCH, { { NULL, IMAP_ENUM_ZERO } } },	39	{ IMAPOPT_ALLOWAPOP, "allowapop", 0, {(void*)1}, OPT_SWITCH, { { NULL, IMAP_ENUM_ZERO } } },
39	{ IMAPOPT_ALLOWNEWNEWS, "allownewnews", 0, {(void*)0}, OPT_SWITCH, { { NULL, IMAP_ENUM_ZERO } } },	40	{ IMAPOPT_ALLOWNEWNEWS, "allownewnews", 0, {(void*)0}, OPT_SWITCH, { { NULL, IMAP_ENUM_ZERO } } },
40	{ IMAPOPT_ALLOWPLAINTEXT, "allowplaintext", 0, {(void*)1}, OPT_SWITCH, { { NULL, IMAP_ENUM_ZERO } } },	41	{ IMAPOPT_ALLOWPLAINTEXT, "allowplaintext", 0, {(void*)1}, OPT_SWITCH, { { NULL, IMAP_ENUM_ZERO } } },

Return to bug 18706

Lines 227-232 Link Here

(-)cyrus-imapd-2.2.12/imap/message.c (-1 / +11 lines)
227	int n;	227	int n;
228	int sawcr = 0, sawnl;	228	int sawcr = 0, sawnl;
229	int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);	229	int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
		230	int allow8bitheaders = config_getswitch(IMAPOPT_ALLOW8BITHEADERS);
230	int inheader = 1, blankline = 1;	231	int inheader = 1, blankline = 1;
231		232
232	while (size) {	233	while (size) {
Lines 265-271 Link Here
265	} else {	266	} else {
266	/* We have been configured to munge all mail of this	267	/* We have been configured to munge all mail of this
267	form. */	268	form. */
268	*p = 'X';	269	if (allow8bitheaders) {
		270	/* We allow all mail with 8 bit headers
		271	and do not force our users to change
		272	the way of the world because of one
		273	stupid rfc 2046 (or was it 2047?) */
		274	}
		275	else {
		276	/* We replace each 8bit-Char with X */
		277	*p = 'X';
		278	}
269	}	279	}
270	}	280	}
271	}	281	}