amavisd-new-unify-log-format.patch

   1 --- amavisd-new-2.2.1/amavisd.orig      2004-12-23 02:38:39.000000000 +0100
   2 +++ amavisd-new-2.2.1/amavisd   2005-09-09 13:43:08.822055536 +0200
   3 @@ -7326,8 +7326,8 @@
   4            $reason = substr($reason,0,100)."..."  if length($reason) > 100+3;
   5            $r->recip_smtp_response( ($final_destiny == D_DISCARD
   6                                      ? "250 2.7.1 Ok, discarded"
   7 -                                    : "550 5.7.1 Message content rejected") .
   8 -                                   ", id=$am_id - $reason");
   9 +                                    : "550 5.7.1 Message content rejected, $reason"
  10 +                                 ) . ", id=$am_id");
  11            $r->recip_done(1);
  12            # note that 5xx status rejects may later be converted to bounces or
  13            # discards, according to $*_destiny setting
  14 @@ -7414,8 +7414,8 @@
  15            my($reason) = (split(/\n/, $bad_headers[0]))[0];
  16            $r->recip_smtp_response(($final_destiny == D_DISCARD
  17                        ? "250 2.6.0 Ok, message with invalid header discarded"
  18 -                      : "554 5.6.0 Message with invalid header rejected"
  19 -                    ) . ", id=$am_id - $reason");
  20 +                      : "554 5.6.0 Message with invalid header rejected, $reason"
  21 +                    ) . ", id=$am_id");
  22            $r->recip_done(1);
  23            $any_badh++;
  24          }