Incorporated the cookie into the end-of-mail-marker used in the
ack-script, so that the whole mechanism doesn't break when somebody has the words '[end-of-mail-marker]' in the mail body itself.
This commit is contained in:
parent
c2fde848d9
commit
727cb694ec
@ -39,7 +39,7 @@ char* queue_command(const struct Mail* mail, const char* command)
|
||||
}
|
||||
fprintf(fh, "#! /bin/sh\n");
|
||||
fprintf(fh, "\n");
|
||||
fprintf(fh, "%s --mode=listserv --approved <<[end-of-mail-marker]\n", who_am_i);
|
||||
fprintf(fh, "%s --mode=listserv --approved <<[end-of-%s-marker]\n", who_am_i, cookie);
|
||||
fprintf(fh, "Sender: %s\n", mail->Envelope);
|
||||
fprintf(fh, "From: %s\n", mail->From);
|
||||
if (mail->Reply_To)
|
||||
@ -50,7 +50,7 @@ char* queue_command(const struct Mail* mail, const char* command)
|
||||
fprintf(fh, "Approve: %s\n", mail->Approve);
|
||||
fprintf(fh, "\n");
|
||||
fprintf(fh, "%s\n", command);
|
||||
fprintf(fh, "[end-of-mail-marker]\n");
|
||||
fprintf(fh, "[end-of-%s-marker]\n", cookie);
|
||||
fclose(fh);
|
||||
chmod(buffer, 0755);
|
||||
free(buffer);
|
||||
|
||||
@ -39,10 +39,10 @@ char* queue_posting(const struct Mail* mail, const char* listname)
|
||||
}
|
||||
fprintf(fh, "#! /bin/sh\n");
|
||||
fprintf(fh, "\n");
|
||||
fprintf(fh, "%s --mode=deliver --listname=%s --approved <<[end-of-mail-marker]\n", who_am_i, listname);
|
||||
fprintf(fh, "%s --mode=deliver --listname=%s --approved <<[end-of-%s-marker]\n", who_am_i, listname, cookie);
|
||||
fprintf(fh, "%s\n", mail->Header);
|
||||
fprintf(fh, "%s", mail->Body);
|
||||
fprintf(fh, "[end-of-mail-marker]\n");
|
||||
fprintf(fh, "[end-of-%s-marker]\n", cookie);
|
||||
fclose(fh);
|
||||
chmod(buffer, 0755);
|
||||
free(buffer);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user