spawn-filter: display filter used for mail rejected message

indimail · Jan 9, 2024 · e65138d · e65138d
1 parent 3766dd8
commit e65138d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/indimail-mta-x/doc/ChangeLog b/indimail-mta-x/doc/ChangeLog
@@ -160,20 +160,18 @@ Release 3.0.6-1.1 Start 25/10/2023 End 01/01/2024
 89. create_services: renamed cronlist.q, cronlist.i to indimail-mta.cron,
     indimail.cron
 - 05/01/2024
-90. dk-filter.sh: fix BOUNCEDOMAIN getting unset
-91. dk-filter.sh: use dkim -d bouncedomain for bounces
-92. getDomainToken.c: return correct domain when local or remote delivery is
+90. getDomainToken.c: return correct domain when local or remote delivery is
     not set
 - 06/01/2024
-93. svctool.in, qlocal_upgrade.in: add supplementary group qcerts for qmails
+91. svctool.in, qlocal_upgrade.in: add supplementary group qcerts for qmails
     user
-94. dk-filter.sh: use _SENDER for d= tag if USE_SENDER is set
-95. qmail-dkim.c: use new error code DKIM_BAD_IDENTITY for invalid identity
+92. qmail-dkim.c: use new error code DKIM_BAD_IDENTITY for invalid identity
     domain (i= tag)
 - 07/01/2024
-96. qmail-spamfilter.c: bypass antispam filter when RELAYCLIENT and
+93. qmail-spamfilter.c: bypass antispam filter when RELAYCLIENT and
     RELAYCLIENT_NOSPAMFILTER is set
-97. svctool: updated bogofilter.cf header_format, log_update_format
+94. svctool: updated bogofilter.cf header_format, log_update_format
+95. spawn-filter.c: display filter used for mail rejected message
 
 * Tue Oct 17 2023 18:34:04 +0000 Manvendra Bhangui <indimail-mta@indimail.org> 3.0.5-1.1%{?dist}
 Release 3.0.5-1.1 Start 11/09/2023 End 17/10/2023

diff --git a/indimail-mta-x/spawn-filter.c b/indimail-mta-x/spawn-filter.c
@@ -1,5 +1,5 @@
 /*
- * $Id: spawn-filter.c,v 1.85 2023-12-05 23:19:48+05:30 Cprogrammer Exp mbhangui $
+ * $Id: spawn-filter.c,v 1.86 2024-01-09 12:38:29+05:30 Cprogrammer Exp mbhangui $
  */
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -229,7 +229,7 @@ run_mailfilter(char *domain, char *ext, char *qqeh, char *mailprog, char **argv)
 	case 2:
 		report(0, "blackholed", filterargs, 0, 0, 0, 0); /*- Blackhole */
 	case 100:
-		report(100, "Mail Rejected (#5.7.1)", 0, 0, 0, 0, 0);
+		report(100, "Mail Rejected by ", filterargs, " (#5.7.1)", 0, 0, 0);
 	default:
 		e = errno;
 		substdio_fdbuf(&errbuf, read, pipefe[0], inbuf, sizeof(inbuf));
@@ -674,7 +674,7 @@ main(int argc, char **argv)
 void
 getversion_qmail_spawn_filter_c()
 {
-	static char    *x = "$Id: spawn-filter.c,v 1.85 2023-12-05 23:19:48+05:30 Cprogrammer Exp mbhangui $";
+	static char    *x = "$Id: spawn-filter.c,v 1.86 2024-01-09 12:38:29+05:30 Cprogrammer Exp mbhangui $";
 
 	x = sccsidreporth;
 	x = sccsidgetdomainth;
@@ -685,6 +685,9 @@ getversion_qmail_spawn_filter_c()
 
 /*
  * $Log: spawn-filter.c,v $
+ * Revision 1.86  2024-01-09 12:38:29+05:30  Cprogrammer
+ * display filter used for mail rejected message
+ *
  * Revision 1.85  2023-12-05 23:19:48+05:30  Cprogrammer
  * setup qmail-local, qmail-remote arguments after envrules
  *