[pmg-devel] [PATCH pmg-api v2 3/3] utils: drop unneeded PMX_header_ct

[Stoiko Ivanov]

The variable was introduced in a early version of
c320d56 ("utils: content-type: don't fallback to header information for magic"
without realizing that the PMX_magic|glob_ct variables are only set
for MIME-Parts with bodyhandle - and expecting to replace the
header-lookup in multiple places. As the header is also present and
needed for MIME-Parts without bodyhandle (parts that have subparts
have no bodyhandle) - drop the variable, in order to cause less
confusion.

Also drop '$magic' as part of the nested if-condition, as it is
already checked in the if one line above.

Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 src/PMG/Utils.pm        | 2 --
 src/bin/pmg-smtp-filter | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm
index b2a75fb..b225a9e 100644
--- a/src/PMG/Utils.pm
+++ b/src/PMG/Utils.pm
@@ -620,8 +620,6 @@ sub add_ct_marks {
 
     if (my $path = $entity->{PMX_decoded_path}) {
 
-	$entity->{PMX_header_ct} = $entity->head->mime_attr('content-type');
-
 	$entity->{PMX_magic_ct} = magic_mime_type_for_file($path);
 
 	my $filename = $entity->head->recommended_filename;
diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter
index 60737ea..760a2ef 100755
--- a/src/bin/pmg-smtp-filter
+++ b/src/bin/pmg-smtp-filter
@@ -561,12 +561,14 @@ sub run_dequeue {
 sub unpack_entity {
     my ($self, $unpack, $entity, $msginfo, $queue) = @_;
 
-    my ($magic, $headerct, $path) = $entity->@{'PMX_magic_ct', 'PMX_header_ct', 'PMX_decoded_path'};
+    my ($magic, $path) = $entity->@{'PMX_magic_ct', 'PMX_decoded_path'};
 
     if ($magic && $path) {
 	# in order to not miss information from a misdetected archive use information provided in the
 	# header here as well
-	if ($headerct && ($magic && $magic eq 'application/octet-stream')) {
+
+	my $headerct = $entity->head->mime_attr('content-type');
+	if ($headerct && $magic eq 'application/octet-stream') {
 	    $magic = $headerct;
 	}
 
-- 
2.39.5