changed send_help() to accept the name and textfile as arguments (Henne Vogelsang)

diff --git a/include/send_help.h b/include/send_help.h
index b49f4d8ec9a0fe5796e45c5ee26fc2f3255db8be..1cfd15b31543f122e541b361b8d7077487344b0e 100644 (file)
--- a/include/send_help.h
+++ b/include/send_help.h
@@ -25,6 +25,6 @@
 #define SEND_HELP_H
 
 void send_help(const char *listdir, const char *emailaddr,
-              const char *mlmmjsend);
+              const char *mlmmjsend, const char *name, const char *textfile);
 
 #endif

diff --git a/src/listcontrol.c b/src/listcontrol.c
index dce0c25ca7cfc38d7e8e35688ffc2be320394977..3fe1184d5347c0071c2259a07471ffb94f55200b 100644 (file)
--- a/src/listcontrol.c
+++ b/src/listcontrol.c
@@ -625,7 +625,7 @@ int listcontrol(struct email_container *fromemails, const char *listdir,
                }
                log_oper(listdir, OPLOGFNAME, "%s requested help",
                                fromemails->emaillist[0]);
-               send_help(listdir, fromemails->emaillist[0], mlmmjsend);
+               send_help(listdir, fromemails->emaillist[0], mlmmjsend, "help", "listhelp");
                break;
 
        /* listname+get-INDEX@domain.tld */

diff --git a/src/send_help.c b/src/send_help.c
index aa7218176a0da300f6990279a1ef05adbced775d..05af1edba835df9e5cea5bad54a9aff2a4f84d47 100644 (file)
--- a/src/send_help.c
+++ b/src/send_help.c
@@ -43,7 +43,7 @@
 #include "memory.h"
 
 void send_help(const char *listdir, const char *emailaddr,
-              const char *mlmmjsend)
+              const char *mlmmjsend, const char *name, const char *textfile)
 {
        char *queuefilename, *listaddr, *listdelim, *listname, *listfqdn;
        char *fromaddr;
@@ -56,10 +56,10 @@ void send_help(const char *listdir, const char *emailaddr,
        fromaddr = concatstr(4, listname, listdelim, "bounces-help@", listfqdn);
        myfree(listdelim);
 
-       queuefilename = prepstdreply(listdir, "listhelp", "$listowner$",
+       queuefilename = prepstdreply(listdir, textfile, "$listowner$",
                                        emailaddr, NULL, 0, NULL, NULL);
        if(queuefilename == NULL) {
-               log_error(LOG_ARGS, "Could not prepare help mail");
+               log_error(LOG_ARGS, "Could not prepare %s mail", name);
                exit(EXIT_FAILURE);
        }