changeset 262:846d91ae6ebe

Don't litter the queue directory when rejecting posts for one reason or the other. Also make sure we write correct data when saving for resend: - writen(tmpfd, bounceaddr, strlen(to_addr)); + writen(tmpfd, bounceaddr, strlen(bounceaddr));
author mmj
date Tue, 22 Jun 2004 16:22:02 +1000
parents 2effd474394e
children 5c8d908481bd
files src/mlmmj-process.c src/mlmmj-send.c
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/mlmmj-process.c	Mon Jun 21 21:28:25 2004 +1000
+++ b/src/mlmmj-process.c	Tue Jun 22 16:22:02 2004 +1000
@@ -543,6 +543,8 @@
 		myfree(listfqdn);
 		myfree(fromstr);
 		myfree(subject);
+		unlink(donemailname);
+		myfree(donemailname);
 		execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
 				"-T", fromemails.emaillist[0],
@@ -576,6 +578,8 @@
 			myfree(listfqdn);
 			myfree(fromstr);
 			myfree(subject);
+			unlink(donemailname);
+			myfree(donemailname);
 			execlp(mlmmjsend, mlmmjsend,
 					"-l", "1",
 					"-T", fromemails.emaillist[0],
@@ -610,6 +614,8 @@
 			myfree(listfqdn);
 			myfree(fromstr);
 			myfree(subject);
+			unlink(donemailname);
+			myfree(donemailname);
 			execlp(mlmmjsend, mlmmjsend,
 					"-l", "1",
 					"-T", fromemails.emaillist[0],
--- a/src/mlmmj-send.c	Mon Jun 21 21:28:25 2004 +1000
+++ b/src/mlmmj-send.c	Tue Jun 22 16:22:02 2004 +1000
@@ -571,7 +571,7 @@
 						S_IRUSR|S_IWUSR);
 			myfree(tmpstr);
 			if(tmpfd >= 0) {
-				writen(tmpfd, bounceaddr, strlen(to_addr));
+				writen(tmpfd, bounceaddr, strlen(bounceaddr));
 				fsync(tmpfd);
 			}
 			close(tmpfd);
@@ -580,7 +580,7 @@
 						S_IRUSR|S_IWUSR);
 			myfree(tmpstr);
 			if(tmpfd >= 0) {
-				writen(tmpfd, to_addr, strlen(bounceaddr));
+				writen(tmpfd, to_addr, strlen(to_addr));
 				fsync(tmpfd);
 			}
 			close(tmpfd);