head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.2
	OPENPKG_E1_FP:1.2
	OPENPKG_2_STABLE_20061018:1.2
	OPENPKG_2_STABLE:1.2.0.14
	OPENPKG_2_STABLE_BP:1.2
	OPENPKG_2_5_SOLID:1.2.0.12
	OPENPKG_2_5_SOLID_BP:1.2
	OPENPKG_2_4_RELEASE:1.2
	OPENPKG_2_4_SOLID:1.2.0.10
	OPENPKG_2_4_SOLID_BP:1.2
	OPENPKG_2_3_RELEASE:1.2
	OPENPKG_2_3_SOLID:1.2.0.8
	OPENPKG_2_3_SOLID_BP:1.2
	OPENPKG_2_2_RELEASE:1.2
	OPENPKG_2_2_SOLID:1.2.0.6
	OPENPKG_2_2_SOLID_BP:1.2
	OPENPKG_2_1_RELEASE:1.2
	OPENPKG_2_1_SOLID:1.2.0.4
	OPENPKG_2_1_SOLID_BP:1.2
	OPENPKG_2_0_RELEASE:1.2
	OPENPKG_2_0_SOLID:1.2.0.2
	OPENPKG_2_0_SOLID_BP:1.2
	OPENPKG_1_3_RELEASE:1.1.2.1
	OPENPKG_1_3_SOLID:1.1.2.1.0.2
	OPENPKG_1_3_SOLID_BP:1.1.2.1
	OPENPKG_1_STABLE:1.1.0.2
	OPENPKG_1_STABLE_MP:1.1;
locks; strict;
comment	@# @;


1.2
date	2004.01.29.15.09.57;	author ms;	state dead;
branches;
next	1.1;

1.1
date	2003.07.22.14.10.09;	author rse;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2003.07.24.20.49.47;	author rse;	state Exp;
branches;
next	;


desc
@@


1.2
log
@upgrading package: imapd 2.1.16 -> 2.2.3
@
text
@This little patch allows the Cyrus IMAP LMTP daemon to accept
"<user>@@<domain>" as the username instead of just "<user>" in order
to allow one to have distinct mailboxes for "foo@@domain1" and
"foo@@domain2". This is especially useful with MTAs like Postfix which
nicely allow delivery to same usernames of different domains.

--- imap/lmtpengine.c	Wed Jun 25 05:34:01 2003
+++ imap/lmtpengine.c	Fri Jul  4 11:42:39 2003
@@@@ -536,7 +536,7 @@@@
 	if (!*p++) return 0;
     }
     else {
-	while (*p && *p != '@@' && *p != '>') {
+	while (*p && /* *p != '@@' && */ *p != '>') {
 	    if (*p == '\\') {
 		if (!*++p) return 0;
 	    }
@@@@ -557,7 +557,7 @@@@
 	    if (*p++ != ']') return 0;
 	}
 	else {
-	    while (isalnum((int) *p) || *p == '.' || *p == '-') p++;
+	    while (isalnum((int) *p) || *p == '.' || *p == '-' || *p == '_') p++;
 	}
     }
     
@@@@ -1160,7 +1160,7 @@@@
 	}
 
 	/* Now finish the remainder of the localpart */
-	while (*addr != '@@' && *addr != '>') {
+	while (/* *addr != '@@' && */ *addr != '>') {
 	    if (*addr == '\\') addr++;
 	    *dest++ = *addr++;
 	}
@


1.1
log
@cleanup packaging
@
text
@@


1.1.2.1
log
@mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only]
@
text
@@