comparison src/mlmmj-unsub.c @ 741:b72bcb7e08a2

Arbitrary headers in listtexts, fix default Content-Transfer-Encoding: header, and document \uNNNN substitution Also, the interface to prepstdreply() has changed; there is no longer a customheaders argument, which was never used anyway, and is now essentially redundant due to this patch.
author Ben Schmidt
date Mon, 20 Sep 2010 01:44:58 +1000
parents e5286b45f9ca
children c3ee2bfaeb02
comparison
equal deleted inserted replaced
740:5db75af2d0db 741:b72bcb7e08a2
74 listtext = mystrdup("unsub-ok-nomail"); 74 listtext = mystrdup("unsub-ok-nomail");
75 break; 75 break;
76 } 76 }
77 77
78 queuefilename = prepstdreply(listdir, listtext, "$helpaddr$", 78 queuefilename = prepstdreply(listdir, listtext, "$helpaddr$",
79 subaddr, NULL, 0, NULL, NULL, NULL); 79 subaddr, NULL, 0, NULL, NULL);
80 MY_ASSERT(queuefilename); 80 MY_ASSERT(queuefilename);
81 myfree(listtext); 81 myfree(listtext);
82 82
83 execlp(mlmmjsend, mlmmjsend, 83 execlp(mlmmjsend, mlmmjsend,
84 "-l", "1", 84 "-l", "1",
122 listtext = mystrdup("notifyunsub-nomail"); 122 listtext = mystrdup("notifyunsub-nomail");
123 break; 123 break;
124 } 124 }
125 125
126 queuefilename = prepstdreply(listdir, listtext, "$listowner$", 126 queuefilename = prepstdreply(listdir, listtext, "$listowner$",
127 "$listowner$", NULL, 1, maildata, NULL, NULL); 127 "$listowner$", NULL, 1, maildata, NULL);
128 MY_ASSERT(queuefilename); 128 MY_ASSERT(queuefilename);
129 myfree(listtext); 129 myfree(listtext);
130 myfree(maildata[1]); 130 myfree(maildata[1]);
131 131
132 execlp(mlmmjsend, mlmmjsend, 132 execlp(mlmmjsend, mlmmjsend,
211 211
212 maildata[1] = mystrdup(subaddr); 212 maildata[1] = mystrdup(subaddr);
213 maildata[3] = mystrdup(confirmaddr); 213 maildata[3] = mystrdup(confirmaddr);
214 214
215 queuefilename = prepstdreply(listdir, listtext, "$helpaddr$", subaddr, 215 queuefilename = prepstdreply(listdir, listtext, "$helpaddr$", subaddr,
216 confirmaddr, 2, maildata, NULL, NULL); 216 confirmaddr, 2, maildata, NULL);
217 217
218 myfree(maildata[1]); 218 myfree(maildata[1]);
219 myfree(maildata[3]); 219 myfree(maildata[3]);
220 220
221 myfree(listname); 221 myfree(listname);
303 303
304 fromaddr = concatstr(4, listname, listdelim, "bounces-help@", listfqdn); 304 fromaddr = concatstr(4, listname, listdelim, "bounces-help@", listfqdn);
305 myfree(listdelim); 305 myfree(listdelim);
306 306
307 queuefilename = prepstdreply(listdir, "unsub-notsubscribed", 307 queuefilename = prepstdreply(listdir, "unsub-notsubscribed",
308 "$helpaddr$", subaddr, NULL, 0, NULL, NULL, NULL); 308 "$helpaddr$", subaddr, NULL, 0, NULL, NULL);
309 MY_ASSERT(queuefilename); 309 MY_ASSERT(queuefilename);
310 310
311 myfree(listaddr); 311 myfree(listaddr);
312 myfree(listname); 312 myfree(listname);
313 myfree(listfqdn); 313 myfree(listfqdn);