[dovecot-cvs] dovecot/src/deliver deliver.c,1.20.2.39,1.20.2.40

[tss at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	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.20.2.39
retrieving revision 1.20.2.40
diff -u -d -r1.20.2.39 -r1.20.2.40
--- deliver.c	13 May 2007 14:06:19 -0000	1.20.2.39
+++ deliver.c	15 May 2007 17:27:28 -0000	1.20.2.40
@@ -158,7 +158,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);
 }