amavisd-release: missing X-Envelope-From or Return-Path

[Bernhard Schmidt]

Bernhard Schmidt <berni at birkenwald.de> wrote:

> The only thing I am not getting is that I should be hitting the codepath
> adding X-Envelope-From, because mailfrom_to_quarantine is nowhere in my
> configuration nor set in amavisd-new, so it should be undef... but it's
> not in the quarantine file.

Seems I misunderstood. _retained means the quarantine does contain the
envelope already, so X-Envelope-From is not necessary to be added. Which
IS true, since the information is in Return-Path.

I think the problem is just that msg_from_quarantine should also be
using Return-Path, so something like

      } elsif (!$bsmtp && /^Return-Path:[ \t]*(.*)$/si) {
        if (!defined $sender) {
          my(@addr_list) = parse_address_list($1);
          @addr_list >= 1  or die "Address missing in X-Envelope-From";
          @addr_list <= 1  or die "More than one address in
X-Envelope-From";
          $sender = unquote_rfc2821_local($addr_list[0]);
        }
      } elsif (!$bsmtp && /^Delivered-To:[ \t]*(.*)$/si) {
      } elsif (!$bsmtp && /^X-Envelope-From:[ \t]*(.*)$/si) {
        if (!defined $sender) {
          my(@addr_list) = parse_address_list($1);
          @addr_list >= 1  or die "Address missing in X-Envelope-From";
          @addr_list <= 1  or die "More than one address in
X-Envelope-From";
          $sender = unquote_rfc2821_local($addr_list[0]);
        }

Should be reordered/cleaned up, that code duplication is unnecessary,
but you get the idea.

Regards,
Bernhard