Re: [Exim] System filter freezing, reason not in freeze info…

On Fri, 1 Sep 2000, Philip Hazel wrote:

> On Thu, 31 Aug 2000, Peter Radcliffe wrote:
>
> > I recently upgraded to 3.16. I used to get the freeze text in the
> > inform message, but a message frozen today did not;
>
> > Any reason why I don't see it in the inform message anymore ?
>
> I'll look into this and get back to you. Not a deliberate change. I've
> probably broken something.

The patch below should fix this. It was indeed a stupid oversight on my
part when re-organizing the freezing stuff. Now in the tests, so it
shouldn't happen again.

-- 
Philip Hazel            University of Cambridge Computing Service,
ph10@???      Cambridge, England. Phone: +44 1223 334714.

*** exim-3.15/src/deliver.c Wed Jun 14 08:57:41 2000
--- deliver.c    Mon Sep  4 15:30:25 2000
***************
*** 5574,5581 ****
          }

        if (moan) moan_tell_someone(errors_address, addr_defer, "Message frozen",
!         "Message %s has been frozen. The sender is <%s>.\n", message_id,
!         sender_address);
        }

      /* Log freezing just before we update the -H file, to minimize the chance
--- 5683,5690 ----
          }

        if (moan) moan_tell_someone(errors_address, addr_defer, "Message frozen",
!         "Message %s has been frozen%s.\nThe sender is <%s>.\n", message_id,
!         frozen_info, sender_address);
        }

      /* Log freezing just before we update the -H file, to minimize the chance

*** exim-3.15/src/moan.c    Wed Jun 14 08:57:43 2000
--- moan.c    Mon Sep  4 15:24:27 2000
***************
*** 384,398 ****
    for (; addr != NULL; addr = addr->next)
      {
      char *parent = (addr->parent == NULL)? NULL : addr->parent->orig;
!     fprintf(f, "  %s%s%s%s: %s%s%s\n",
!       addr->orig,
!       (parent == NULL)? "" : " <",
!       (parent == NULL)? "" : parent,
!       (parent == NULL)? "" : ">",
!       (addr->basic_errno <= 0)? "" : strerror(addr->basic_errno),
!       (addr->basic_errno <= 0 || addr->message == NULL)? "" : ": ",
!       (addr->message != NULL)? addr->message :
!         (addr->basic_errno <= 0)? "unknown error" : "");
      }
    }

--- 384,394 ----
    for (; addr != NULL; addr = addr->next)
      {
      char *parent = (addr->parent == NULL)? NULL : addr->parent->orig;
!     fprintf(f, "  %s", addr->orig);
!     if (parent != NULL) fprintf(f, " <%s>", parent); 
!     if (addr->basic_errno > 0) fprintf(f, ": %s", strerror(addr->basic_errno));
!     if (addr->message != NULL) fprintf(f, ": %s", addr->message);
!     fprintf(f, "\n"); 
      }
    }