From 6365546c0d33c0842b4afd341314a5bfde173bff Mon Sep 17 00:00:00 2001 Message-Id: <6365546c0d33c0842b4afd341314a5bfde173bff.1715807761.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 31 May 2010 18:00:28 +0100 Subject: [PATCH] qmail-checkspam.c: Don't do anything if RELAYCLIENT is set. Organization: Straylight/Edgeware From: Mark Wooding This is an unpleasant hack to accept potentially malformed mail from clients who have authenticated to the SMTP server. I don't think it's actually needed any more, because the specific client in question has since been re-educated about how to construct mail properly. --- qmail-checkspam.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qmail-checkspam.c b/qmail-checkspam.c index 0d98fcb..7847769 100644 --- a/qmail-checkspam.c +++ b/qmail-checkspam.c @@ -110,6 +110,7 @@ int main(int argc, char *argv[]) const char *qmq; int rc; + if (getenv("RELAYCLIENT")) goto exec; m.max_len = intenv("QMAIL_CHECKSPAM_MAXLEN", 2 * 1024 * 1024); m.timeout = intenv("QMAIL_CHECKSPAM_TIMEOUT", 300); rc = message_read(0, 0, &m); @@ -149,6 +150,7 @@ int main(int argc, char *argv[]) close(fd_e[0]); close(fd_m[1]); close(fd_e[1]); +exec: qmq = strenv("QMAIL_CHECKSPAM_QUEUE", "/var/qmail/bin/qmail-queue"); execlp(qmq, qmq, (char *)0); fprintf(stderr, "failed to exec: %s\n", strerror(errno)); -- [mdw]