[dovecot-cvs] dovecot/src/deliver deliver.c,1.67,1.68

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/deliver
In directory talvi:/tmp/cvs-serv7911

Modified Files:
	deliver.c 
Log Message:
If Return-Path doesn't contain user and domain, treat it as missing
Return-Path.



Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/deliver/deliver.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- deliver.c	13 May 2007 17:33:01 -0000	1.67
+++ deliver.c	15 May 2007 17:27:30 -0000	1.68
@@ -167,7 +167,8 @@
 		message_address_parse(pool_datastack_create(),
 				      (const unsigned char *)str,
 				      strlen(str), 1, FALSE);
-	return addr == NULL || addr->mailbox == NULL || addr->domain == NULL ?
+	return addr == NULL || addr->mailbox == NULL || addr->domain == NULL ||
+		*addr->mailbox == '\0' || *addr->domain == '\0' ?
 		NULL : t_strconcat(addr->mailbox, "@", addr->domain, NULL);
 }