From: mmj <none@none>
Date: Wed, 4 Jan 2006 19:39:02 +0000 (+1100)
Subject: Pass on listdir to mlmmjsend so we can get the smtpport and relayhost also
X-Git-Tag: RELEASE_1_2_12_RC1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65e8fbd6a4080525aa00a8d08691db3038a0035a;p=thirdparty%2Fmlmmj.git

Pass on listdir to mlmmjsend so we can get the smtpport and relayhost also
in the case of not listmail is being send.
---

diff --git a/ChangeLog b/ChangeLog
index af999586..2efd2b9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
diff --git a/src/mlmmj-maintd.c b/src/mlmmj-maintd.c
index 6418ba80..b6bd7d6d 100644
--- a/src/mlmmj-maintd.c
+++ b/src/mlmmj-maintd.c
@@ -335,6 +335,7 @@ int resend_queue(const char *listdir, const char *mlmmjsend)
 			if(repto) {
 				execlp(mlmmjsend, mlmmjsend,
 						"-l", "1",
+						"-L", listdir,
 						"-m", mailname,
 						"-F", from,
 						"-T", to,
@@ -343,6 +344,7 @@ int resend_queue(const char *listdir, const char *mlmmjsend)
 			} else {
 				execlp(mlmmjsend, mlmmjsend,
 						"-l", "1",
+						"-L", listdir,
 						"-m", mailname,
 						"-F", from,
 						"-T", to,
diff --git a/src/mlmmj-process.c b/src/mlmmj-process.c
index bc0a7c6a..07da2d31 100644
--- a/src/mlmmj-process.c
+++ b/src/mlmmj-process.c
@@ -562,6 +562,7 @@ int main(int argc, char **argv)
 					efromemails.emaillist[0]);
 			execlp(mlmmjsend, mlmmjsend,
 					"-l", "4",
+					"-L", listdir,
 					"-F", efromemails.emaillist[0],
 					"-s", owner,
 					"-a",
@@ -666,6 +667,7 @@ int main(int argc, char **argv)
 		myfree(donemailname);
 		execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", fromemails.emaillist[0],
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
@@ -755,6 +757,7 @@ int main(int argc, char **argv)
 			myfree(randomstr);
 			execlp(mlmmjsend, mlmmjsend,
 					"-l", "1",
+					"-L", listdir,
 					"-T", fromemails.emaillist[0],
 					"-F", fromaddr,
 					"-m", queuefilename, (char *)NULL);
diff --git a/src/mlmmj-sub.c b/src/mlmmj-sub.c
index 509ef85b..562fa420 100644
--- a/src/mlmmj-sub.c
+++ b/src/mlmmj-sub.c
@@ -81,6 +81,7 @@ void confirm_sub(const char *listdir, const char *listaddr,
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
@@ -127,6 +128,7 @@ void notify_sub(const char *listdir, const char *listaddr,
 	myfree(maildata[1]);
 	execlp(mlmmjsend, mlmmjsend,
 			"-l", "1",
+			"-L", listdir,
 			"-T", tostr,
 			"-F", fromaddr,
 			"-m", queuefilename, (char *)NULL);
@@ -217,6 +219,7 @@ void generate_subconfirm(const char *listdir, const char *listaddr,
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
@@ -266,6 +269,7 @@ void generate_subscribed(const char *listdir, const char *subaddr,
 	
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
diff --git a/src/mlmmj-unsub.c b/src/mlmmj-unsub.c
index d03121b1..a1e62b60 100644
--- a/src/mlmmj-unsub.c
+++ b/src/mlmmj-unsub.c
@@ -81,6 +81,7 @@ void confirm_unsub(const char *listdir, const char *listaddr,
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
@@ -129,6 +130,7 @@ void notify_unsub(const char *listdir, const char *listaddr,
 
 	execlp(mlmmjsend, mlmmjsend,
 			"-l", "1",
+			"-L", listdir,
 			"-T", tostr,
 			"-F", fromaddr,
 			"-m", queuefilename, (char *)NULL);
@@ -220,6 +222,7 @@ void generate_unsubconfirm(const char *listdir, const char *listaddr,
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
@@ -310,6 +313,7 @@ void generate_notsubscribed(const char *listdir, const char *subaddr,
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", subaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
diff --git a/src/send_help.c b/src/send_help.c
index 5876a5c6..d667afd0 100644
--- a/src/send_help.c
+++ b/src/send_help.c
@@ -69,6 +69,7 @@ void send_help(const char *listdir, const char *emailaddr,
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", emailaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);
diff --git a/src/send_list.c b/src/send_list.c
index 8565032f..1c2c1416 100644
--- a/src/send_list.c
+++ b/src/send_list.c
@@ -115,6 +115,7 @@ void send_list(const char *listdir, const char *emailaddr,
 
 	execlp(mlmmjsend, mlmmjsend,
 				"-l", "1",
+				"-L", listdir,
 				"-T", emailaddr,
 				"-F", fromaddr,
 				"-m", queuefilename, (char *)NULL);