changeset 529:d65b467b647d

Pass on listdir to mlmmjsend so we can get the smtpport and relayhost also in the case of not listmail is being send.
author mmj
date Thu, 05 Jan 2006 06:39:02 +1100
parents 97fc5e75e1ff
children 5139cbd9f59c
files ChangeLog src/mlmmj-maintd.c src/mlmmj-process.c src/mlmmj-sub.c src/mlmmj-unsub.c src/send_help.c src/send_list.c
diffstat 7 files changed, 17 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 05 06:10:36 2006 +1100
+++ b/ChangeLog	Thu Jan 05 06:39:02 2006 +1100
@@ -1,3 +1,5 @@
+ o Make non list emails (subconf, moderation etc.) also honor relayhost
+   and smtpport
  o Add tunable to be able to close for subscription only (closedlistsub)
 1.2.9
  o Make find_email_adr() more robust (BSD, Neale Pickett)
--- a/src/mlmmj-maintd.c	Thu Jan 05 06:10:36 2006 +1100
+++ b/src/mlmmj-maintd.c	Thu Jan 05 06:39:02 2006 +1100
@@ -335,6 +335,7 @@
 			if(repto) {
 				execlp(mlmmjsend, mlmmjsend,
 						"-l", "1",
+						"-L", listdir,
 						"-m", mailname,
 						"-F", from,
 						"-T", to,
@@ -343,6 +344,7 @@
 			} else {
 				execlp(mlmmjsend, mlmmjsend,
 						"-l", "1",
+						"-L", listdir,
 						"-m", mailname,
 						"-F", from,
 						"-T", to,
--- a/src/mlmmj-process.c	Thu Jan 05 06:10:36 2006 +1100
+++ b/src/mlmmj-process.c	Thu Jan 05 06:39:02 2006 +1100
@@ -562,6 +562,7 @@
 					efromemails.emaillist[0]);
 			execlp(mlmmjsend, mlmmjsend,
 					"-l", "4",
+					"-L", listdir,
 					"-F", efromemails.emaillist[0],
 					"-s", owner,
 					"-a",
@@ -666,6 +667,7 @@
 		myfree(donemailname);
 		execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", fromemails.emaillist[0],
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
@@ -755,6 +757,7 @@
 			myfree(randomstr);
 			execlp(mlmmjsend, mlmmjsend,
 					"-l", "1",
+					"-L", listdir,
 					"-T", fromemails.emaillist[0],
 					"-F", fromaddr,
 					"-m", queuefilename, (char *)NULL);
--- a/src/mlmmj-sub.c	Thu Jan 05 06:10:36 2006 +1100
+++ b/src/mlmmj-sub.c	Thu Jan 05 06:39:02 2006 +1100
@@ -81,6 +81,7 @@
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
@@ -127,6 +128,7 @@
 	myfree(maildata[1]);
 	execlp(mlmmjsend, mlmmjsend,
 			"-l", "1",
+			"-L", listdir,
 			"-T", tostr,
 			"-F", fromaddr,
 			"-m", queuefilename, (char *)NULL);
@@ -217,6 +219,7 @@
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
@@ -266,6 +269,7 @@
 	
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
--- a/src/mlmmj-unsub.c	Thu Jan 05 06:10:36 2006 +1100
+++ b/src/mlmmj-unsub.c	Thu Jan 05 06:39:02 2006 +1100
@@ -81,6 +81,7 @@
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
@@ -129,6 +130,7 @@
 
 	execlp(mlmmjsend, mlmmjsend,
 			"-l", "1",
+			"-L", listdir,
 			"-T", tostr,
 			"-F", fromaddr,
 			"-m", queuefilename, (char *)NULL);
@@ -220,6 +222,7 @@
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
@@ -310,6 +313,7 @@
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
--- a/src/send_help.c	Thu Jan 05 06:10:36 2006 +1100
+++ b/src/send_help.c	Thu Jan 05 06:39:02 2006 +1100
@@ -69,6 +69,7 @@
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", emailaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
--- a/src/send_list.c	Thu Jan 05 06:10:36 2006 +1100
+++ b/src/send_list.c	Thu Jan 05 06:39:02 2006 +1100
@@ -115,6 +115,7 @@
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", emailaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);