Mercurial > hg > mlmmj
changeset 553:edb57c97a7a3
Add a customheaders argument to prepstdreply
author | xi |
---|---|
date | Sun, 06 Aug 2006 18:36:48 +1000 |
parents | fee753d23b25 |
children | 6c4034f79857 |
files | include/prepstdreply.h src/mlmmj-bounce.c src/mlmmj-process.c src/mlmmj-sub.c src/mlmmj-unsub.c src/prepstdreply.c src/send_help.c src/send_list.c |
diffstat | 8 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/include/prepstdreply.h Fri Jul 14 18:04:56 2006 +1000 +++ b/include/prepstdreply.h Sun Aug 06 18:36:48 2006 +1000 @@ -30,6 +30,6 @@ const char *listdelim, size_t datacount, char **data); char *prepstdreply(const char *listdir, const char *filename, const char *from, const char *to, const char *replyto, size_t tokencount, - char **data); + char **data, char *customheaders); #endif /* PREPSTDREPLY_H */
--- a/src/mlmmj-bounce.c Fri Jul 14 18:04:56 2006 +1000 +++ b/src/mlmmj-bounce.c Sun Aug 06 18:36:48 2006 +1000 @@ -139,7 +139,7 @@ maildata[1] = indexstr; queuefilename = prepstdreply(listdir, "bounce-probe", "$listowner$", - myaddr, NULL, 1, maildata); + myaddr, NULL, 1, maildata, NULL); MY_ASSERT(queuefilename); myfree(indexstr);
--- a/src/mlmmj-process.c Fri Jul 14 18:04:56 2006 +1000 +++ b/src/mlmmj-process.c Sun Aug 06 18:36:48 2006 +1000 @@ -122,7 +122,7 @@ myfree(listfqdn); queuefilename = prepstdreply(listdir, "moderation", "$listowner$", - to, replyto, 2, maildata); + to, replyto, 2, maildata, NULL); if((queuefd = open(queuefilename, O_WRONLY|O_APPEND)) < 0) { log_error(LOG_ARGS, "Could not open '%s'", queuefilename); @@ -676,7 +676,7 @@ listfqdn); queuefilename = prepstdreply(listdir, "notintocc", "$listowner$", fromemails.emaillist[0], - NULL, 0, NULL); + NULL, 0, NULL, NULL); MY_ASSERT(queuefilename) myfree(listdelim); myfree(listname); @@ -729,7 +729,7 @@ "bounces-help@", listfqdn); queuefilename = prepstdreply(listdir, "subonlypost", "$listowner$", fromemails.emaillist[0], - NULL, 1, maildata); + NULL, 1, maildata, NULL); MY_ASSERT(queuefilename) myfree(listaddr); myfree(listdelim); @@ -778,7 +778,7 @@ queuefilename = prepstdreply(listdir, "access", "$listowner$", fromemails.emaillist[0], - NULL, 0, NULL); + NULL, 0, NULL, NULL); MY_ASSERT(queuefilename) myfree(listaddr); myfree(listdelim);
--- a/src/mlmmj-sub.c Fri Jul 14 18:04:56 2006 +1000 +++ b/src/mlmmj-sub.c Sun Aug 06 18:36:48 2006 +1000 @@ -146,7 +146,7 @@ maildata[5] = moderators; queuefilename = prepstdreply(listdir, "submod-moderator", - "$listowner$", to, replyto, 3, maildata); + "$listowner$", to, replyto, 3, maildata, NULL); myfree(maildata[1]); @@ -181,7 +181,7 @@ from = concatstr(4, listname, listdelim, "bounces-help@", listfqdn); queuefilename = prepstdreply(listdir, "submod-requester", "$listowner$", - subaddr, NULL, 0, NULL); + subaddr, NULL, 0, NULL, NULL); myfree(listname); myfree(listfqdn); @@ -225,7 +225,7 @@ } queuefilename = prepstdreply(listdir, listtext, "$helpaddr$", - subaddr, NULL, 0, NULL); + subaddr, NULL, 0, NULL, NULL); MY_ASSERT(queuefilename); myfree(listtext); @@ -272,7 +272,7 @@ } queuefilename = prepstdreply(listdir, listtext, "$listowner$", - "$listowner$", NULL, 1, maildata); + "$listowner$", NULL, 1, maildata, NULL); MY_ASSERT(queuefilename) myfree(listtext); myfree(maildata[1]); @@ -359,7 +359,7 @@ maildata[3] = mystrdup(confirmaddr); queuefilename = prepstdreply(listdir, listtext, "$helpaddr$", subaddr, - confirmaddr, 2, maildata); + confirmaddr, 2, maildata, NULL); myfree(maildata[1]); myfree(maildata[3]); @@ -410,7 +410,7 @@ myfree(listdelim); queuefilename = prepstdreply(listdir, "sub-subscribed", "$helpaddr$", - subaddr, NULL, 0, NULL); + subaddr, NULL, 0, NULL, NULL); MY_ASSERT(queuefilename); myfree(listaddr);
--- a/src/mlmmj-unsub.c Fri Jul 14 18:04:56 2006 +1000 +++ b/src/mlmmj-unsub.c Sun Aug 06 18:36:48 2006 +1000 @@ -76,7 +76,7 @@ } queuefilename = prepstdreply(listdir, listtext, "$helpaddr$", - subaddr, NULL, 0, NULL); + subaddr, NULL, 0, NULL, NULL); MY_ASSERT(queuefilename); myfree(listtext); @@ -124,7 +124,7 @@ } queuefilename = prepstdreply(listdir, listtext, "$listowner$", - "$listowner$", NULL, 1, maildata); + "$listowner$", NULL, 1, maildata, NULL); MY_ASSERT(queuefilename); myfree(listtext); myfree(maildata[1]); @@ -213,7 +213,7 @@ maildata[3] = mystrdup(confirmaddr); queuefilename = prepstdreply(listdir, listtext, "$helpaddr$", subaddr, - confirmaddr, 2, maildata); + confirmaddr, 2, maildata, NULL); myfree(maildata[1]); myfree(maildata[3]); @@ -305,7 +305,7 @@ myfree(listdelim); queuefilename = prepstdreply(listdir, "unsub-notsubscribed", - "$helpaddr$", subaddr, NULL, 0, NULL); + "$helpaddr$", subaddr, NULL, 0, NULL, NULL); MY_ASSERT(queuefilename); myfree(listaddr);
--- a/src/prepstdreply.c Fri Jul 14 18:04:56 2006 +1000 +++ b/src/prepstdreply.c Sun Aug 06 18:36:48 2006 +1000 @@ -153,7 +153,7 @@ char *prepstdreply(const char *listdir, const char *filename, const char *from, const char *to, const char *replyto, size_t tokencount, - char **data) + char **data, char *customheaders) { int infd, outfd; char *listaddr, *listdelim, *myfrom, *tmp, *subject, *retstr = NULL; @@ -212,8 +212,8 @@ return NULL; } - str = concatstr(9, "From: ", myfrom, "\nTo: ", myto, "\n", myreplyto, - mymsgid, mydate, subject); + str = concatstr(10, "From: ", myfrom, "\nTo: ", myto, "\n", myreplyto, + mymsgid, mydate, subject, customheaders); if(writen(outfd, str, strlen(str)) < 0) { log_error(LOG_ARGS, "Could not write std mail");
--- a/src/send_help.c Fri Jul 14 18:04:56 2006 +1000 +++ b/src/send_help.c Sun Aug 06 18:36:48 2006 +1000 @@ -57,7 +57,7 @@ myfree(listdelim); queuefilename = prepstdreply(listdir, "listhelp", "$listowner$", - emailaddr, NULL, 0, NULL); + emailaddr, NULL, 0, NULL, NULL); if(queuefilename == NULL) { log_error(LOG_ARGS, "Could not prepare help mail"); exit(EXIT_FAILURE);
--- a/src/send_list.c Fri Jul 14 18:04:56 2006 +1000 +++ b/src/send_list.c Sun Aug 06 18:36:48 2006 +1000 @@ -61,7 +61,7 @@ myfree(listdelim); queuefilename = prepstdreply(listdir, "listsubs", "$listowner$", - emailaddr, NULL, 0, NULL); + emailaddr, NULL, 0, NULL, NULL); if(queuefilename == NULL) { log_error(LOG_ARGS, "Could not prepare sub list mail"); exit(EXIT_FAILURE);