[PATCH] badrcptto support

qmail-gentoo-1.03-r16-badrcptto-morebadrcptto-accdias

1 files changed, 22 insertions, 0 deletions

diff --git a/qmail-showctl.c b/qmail-showctl.c
index bbaa2bc..9d4e1bc 100644
--- a/qmail-showctl.c
+++ b/qmail-showctl.c
@@ -219,6 +219,25 @@ void main()
   do_lst("badmailfromnorelay","Any MAIL FROM is allowed.",""," MAIL FROM denied if it matches this pattern and RELAYCLIENT is not set.");
   do_lst("badmailto","No RCPT TO are specifically denied.",""," RCPT TO denied if it matches this pattern.");
   do_lst("badmailtonorelay","No RCPT TO are specifically denied.",""," RCPT TO denied if it matches this pattern and RELAYCLIENT is not set.");
+  if (do_lst("badrcptto","Any RCPT TO is allowed."," not accepted in RCPT TO ","."))
+    do_lst("morebadrcptto","No effect."," no accepted in RCPT TO ",".");
+  else
+    do_lst("morebadrcptto","No badrcptto; morebadrcpto is irrelevant.","No badrcptto; doesn't matter that morebadrcptto has ",".");
+  /* XXX: check badrcptto.cdb contents */
+  substdio_puts(subfdout,"\nmorebadrcptto.cdb: ");
+  if (stat("morebadrcptto",&stmrh) == -1)
+    if (stat("morebadrcptto.cdb",&stmrhcdb) == -1)
+      substdio_puts(subfdout,"(Default.) No effect.\n");
+    else
+      substdio_puts(subfdout,"Oops! morebadrcptto.cdb exists but morebadrcptto doesn't.\n");
+  else
+    if (stat("morebadrcptto.cdb",&stmrhcdb) == -1)
+      substdio_puts(subfdout,"Oops! morebadrcptto exists but morebadrcptto.cdb doesn't.\n");
+    else
+      if (stmrh.st_mtime > stmrhcdb.st_mtime)
+        substdio_puts(subfdout,"Oops! morebadrcptto.cdb is older than morebadrcptto.\n");
+      else
+        substdio_puts(subfdout,"Modified recently enough; hopefully up to date.\n");
   do_str("bouncefrom",0,"MAILER-DAEMON","Bounce user name is ");
   do_str("bouncehost",1,"bouncehost","Bounce host name is ");
   do_int("concurrencylocal","10","Local concurrency is ","");
@@ -276,6 +295,7 @@ void main()
     if (str_equal(d->d_name,"badmailfromnorelay")) continue;
     if (str_equal(d->d_name,"badmailto")) continue;
     if (str_equal(d->d_name,"badmailtonorelay")) continue;
+        if (str_equal(d->d_name,"badrcptto")) continue;
     if (str_equal(d->d_name,"bouncefrom")) continue;
     if (str_equal(d->d_name,"bouncehost")) continue;
     if (str_equal(d->d_name,"concurrencylocal")) continue;
@@ -291,6 +311,8 @@ void main()
     if (str_equal(d->d_name,"localiphost")) continue;
     if (str_equal(d->d_name,"locals")) continue;
     if (str_equal(d->d_name,"me")) continue;
+    if (str_equal(d->d_name,"morebadrcptto")) continue;
+    if (str_equal(d->d_name,"morebadrcptto.cdb")) continue;
     if (str_equal(d->d_name,"morercpthosts")) continue;
     if (str_equal(d->d_name,"morercpthosts.cdb")) continue;
     if (str_equal(d->d_name,"percenthack")) continue;