From: mmj <none@none>
Date: Tue, 22 Jun 2004 06:22:02 +0000 (+1000)
Subject: Don't litter the queue directory when rejecting posts for one reason or the
X-Git-Tag: RELEASE_1_0_0~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=021dee39bc7fba77cecdb52b3084f3c40ccade5c;p=thirdparty%2Fmlmmj.git

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));
---

diff --git a/src/mlmmj-process.c b/src/mlmmj-process.c
index b611314d..a5c6032c 100644
--- a/src/mlmmj-process.c
+++ b/src/mlmmj-process.c
@@ -543,6 +543,8 @@ int main(int argc, char **argv)
 		myfree(listfqdn);
 		myfree(fromstr);
 		myfree(subject);
+		unlink(donemailname);
+		myfree(donemailname);
 		execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
 				"-T", fromemails.emaillist[0],
@@ -576,6 +578,8 @@ int main(int argc, char **argv)
 			myfree(listfqdn);
 			myfree(fromstr);
 			myfree(subject);
+			unlink(donemailname);
+			myfree(donemailname);
 			execlp(mlmmjsend, mlmmjsend,
 					"-l", "1",
 					"-T", fromemails.emaillist[0],
@@ -610,6 +614,8 @@ int main(int argc, char **argv)
 			myfree(listfqdn);
 			myfree(fromstr);
 			myfree(subject);
+			unlink(donemailname);
+			myfree(donemailname);
 			execlp(mlmmjsend, mlmmjsend,
 					"-l", "1",
 					"-T", fromemails.emaillist[0],
diff --git a/src/mlmmj-send.c b/src/mlmmj-send.c
index f0b628da..049e3d76 100644
--- a/src/mlmmj-send.c
+++ b/src/mlmmj-send.c
@@ -571,7 +571,7 @@ int main(int argc, char **argv)
 						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 @@ int main(int argc, char **argv)
 						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);