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 af999586b03662d1c96f336fbabe11779a229db7..2efd2b9d1e542e4b4b26799fba6d38fcc5910b7b 100644 (file)
--- 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 6418ba80a6e13dbb4e48a7d7e5f8cb23d7894205..b6bd7d6d1f662652f6f6175e582747d2d456268f 100644 (file)
--- 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 bc0a7c6add009af1c34018acfd6ac2bbe59f6515..07da2d316da166901c12b18e19ed3946015e9232 100644 (file)
--- 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 509ef85b411cfaaaba2c5186073922ec5d29a77b..562fa4209f50c118db26eeed4b799c91b3def105 100644 (file)
--- 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 d03121b1a35615446ff8a35abe3afc5530f33d78..a1e62b6063e5bab956f2d893dfb4d3306166177b 100644 (file)
--- 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 5876a5c6fbea75b7dd9b7fb84a0178cf7777a08d..d667afd0014fdff362e8ed2211bb167d009db4e8 100644 (file)
--- 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 8565032f08981adc9ed01fcd427a8cd998a52618..1c2c141698c4a91932b384829acaa0bbb7a76775 100644 (file)
--- 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);