qmail: Indirect via QMAILQUEUE environment variable to find qmail-queue.

This lets us insert a filter program, say a spam checker, between
qmail-smtpd and the mail queue, with the right to refuse a message
before it's accepted by the SMTP server.

diff --git a/Makefile b/Makefile
index 923088771f208557e8545d6a0870130ff96c6cfc..6bf4a6c589054868df0a524a862fa4d884606e78 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1483,12 +1483,12 @@ load qmail-send.o qsutil.o control.o constmap.o newfield.o prioq.o \
 trigger.o fmtqfn.o quote.o now.o readsubdir.o qmail.o date822fmt.o \
 datetime.a case.a ndelay.a getln.a wait.a seek.a fd.a sig.a open.a \
 lock.a stralloc.a alloc.a substdio.a error.a str.a fs.a auto_qmail.o \
 trigger.o fmtqfn.o quote.o now.o readsubdir.o qmail.o date822fmt.o \
 datetime.a case.a ndelay.a getln.a wait.a seek.a fd.a sig.a open.a \
 lock.a stralloc.a alloc.a substdio.a error.a str.a fs.a auto_qmail.o \

-auto_split.o
+auto_split.o env.a

        ./load qmail-send qsutil.o control.o constmap.o newfield.o \
        prioq.o trigger.o fmtqfn.o quote.o now.o readsubdir.o \
        qmail.o date822fmt.o datetime.a case.a ndelay.a getln.a \
        wait.a seek.a fd.a sig.a open.a lock.a stralloc.a alloc.a \
        ./load qmail-send qsutil.o control.o constmap.o newfield.o \
        prioq.o trigger.o fmtqfn.o quote.o now.o readsubdir.o \
        qmail.o date822fmt.o datetime.a case.a ndelay.a getln.a \
        wait.a seek.a fd.a sig.a open.a lock.a stralloc.a alloc.a \

-       substdio.a error.a str.a fs.a auto_qmail.o auto_split.o 
+       substdio.a error.a str.a fs.a auto_qmail.o auto_split.o env.a

 
 qmail-send.0: \
 qmail-send.8
 
 qmail-send.0: \
 qmail-send.8

diff --git a/debian/changelog b/debian/changelog
index 721be9ba265880b0ae65591f84ff608b61ee9c03..91b7e0db1d1e8dba8a569e35f7d626532ec63567 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qmail (1.03-4) non-free; urgency=low
 
   * twiddle build system for missed Debians. 
 qmail (1.03-4) non-free; urgency=low
 
   * twiddle build system for missed Debians. 

+  * indirect qmail-queue via QMAILQUEUE environment variable

 
  -- Mark Wooding <mdw@nsict.org>  Wed, 1 Oct 2003 01:16:00 +0100
 
 
  -- Mark Wooding <mdw@nsict.org>  Wed, 1 Oct 2003 01:16:00 +0100
 

diff --git a/qmail.c b/qmail.c
index 4b7f3ef33cec1a862178a23a444854f1f7402233..9432b4baec124f65b3ce2d228708687adc7f0b99 100644 (file)
--- a/qmail.c
+++ b/qmail.c
@@ -6,8 +6,17 @@
 #include "fd.h"
 #include "qmail.h"
 #include "auto_qmail.h"
 #include "fd.h"
 #include "qmail.h"
 #include "auto_qmail.h"

+#include "env.h"

 
 

-static char *binqqargs[2] = { "/usr/sbin/qmail-queue", 0 } ;
+static char *binqqargs[2] = { 0, 0 } ;
+
+static void setup_qqargs()
+{
+  if(!binqqargs[0])
+    binqqargs[0] = env_get("QMAILQUEUE");
+  if(!binqqargs[0])
+    binqqargs[0] = "/usr/sbin/qmail-queue";
+}

 
 int qmail_open(qq)
 struct qmail *qq;
 
 int qmail_open(qq)
 struct qmail *qq;


@@ -15,6 +24,8 @@ struct qmail *qq;
   int pim[2];
   int pie[2];
 
   int pim[2];
   int pie[2];
 

+  setup_qqargs();
+

   if (pipe(pim) == -1) return -1;
   if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; }
  
   if (pipe(pim) == -1) return -1;
   if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; }