[exim-dev] [Bug 2388] New: Add a patch to exim-4.92

https://bugs.exim.org/show_bug.cgi?id=2388

            Bug ID: 2388
           Summary: Add a patch to exim-4.92
           Product: Exim
           Version: N/A
          Hardware: x86
                OS: Linux
            Status: NEW
          Severity: bug
          Priority: medium
         Component: Packaging
          Assignee: nigel@???
          Reporter: joseph.diffin@???
                CC: exim-dev@???

Created attachment 1184
--> https://bugs.exim.org/attachment.cgi?id=1184&action=edit
small patch to the standard Exim which adds extra descriptive text to “mail too
big” and “too many recipients” errors.

I am trying to prepare for an upgrade to our EXIM mail relays form 4.91 to 4.92
WE have been supplied a patch {fjgsieximpatch.pat} to the standard Exim which
adds extra descriptive text to “mail too big” and “too many recipients” errors.

When I execute the command
# patch -p0 < fjgsieximpatch.pat
I get this error :
kilimanjaro:/exim/exim-4.92 # patch -p0 < fjgsieximpatch.pat
patching file src/smtp_in.c
Hunk #1 FAILED at 4685.
Hunk #2 FAILED at 4957.
Hunk #3 FAILED at 5148.
3 out of 3 hunks FAILED -- saving rejects to file src/smtp_in.c.rej
kilimanjaro:/exim/exim-4.92 # cat src/smtp_in.c.rej
--- src/smtp_in.c       2018-02-08 13:22:40.000000000 +0000
+++ src/smtp_in_fj.c    2018-02-22 22:01:56.078088779 +0000
@@ -4685,7 +4685,8 @@

     if (thismessage_size_limit > 0 && message_size > thismessage_size_limit)
       {
-      smtp_printf("552 Message size exceeds maximum permitted\r\n", FALSE);
+      /* JC Message Size FJ */
+      smtp_printf("552 The size of the email you are attempting to send
exceeds 25Mb; this contravenes GSi email policy and your mail has not been
delivered. Please attempt to resend by reducing its size.\r\n", FALSE);
       log_write(L_size_reject,
           LOG_MAIN|LOG_REJECT, "rejected MAIL FROM:<%s> %s: "
           "message too big: size%s=%d max=%d",
@@ -4957,7 +4958,8 @@
       if (recipients_max_reject)
         {
         rcpt_fail_count++;
-        smtp_printf("552 too many recipients\r\n", FALSE);
+        /* JC recipients #1 FJ */
+        smtp_printf("552 The recipient list for the email you are attempting
to send exceeds %d mailboxes; this contravenes GSi email policy and your mail
has not been delivered. Please attempt to resend by reducing its recipient
list.\r\n", FALSE, recipients_max);
         if (!toomany)
           log_write(0, LOG_MAIN|LOG_REJECT, "too many recipients: message "
             "rejected: sender=<%s> %s", sender_address, host_and_ident(TRUE));
@@ -5148,7 +5150,8 @@
       {
       sender_address = NULL;  /* This will allow a new MAIL without RSET */
       sender_address_unrewritten = NULL;
-      smtp_printf("554 Too many recipients\r\n", FALSE);
+      /* JC recipients #2 FJ */
+      smtp_printf("554 The recipient list for the email you are attempting to
send exceeds %d mailboxes; this contravenes GSi email policy and your mail has
not been delivered. Please attempt to resend by reducing its recipient
list.\r\n", FALSE, recipients_max);
       break;
       }

--
You are receiving this mail because:
You are on the CC list for the bug.