From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 16 Aug 2021 10:54:05 +0000 (+0100)
Subject: [Minor] Minor improvements
X-Git-Tag: 3.0~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3a05b7969106514ce2e8c46e419e023f4a28d4d;p=thirdparty%2Frspamd.git

[Minor] Minor improvements
---

diff --git a/lualib/rspamadm/dmarc_report.lua b/lualib/rspamadm/dmarc_report.lua
index b6811df986..0b1a1983fb 100644
--- a/lualib/rspamadm/dmarc_report.lua
+++ b/lualib/rspamadm/dmarc_report.lua
@@ -47,7 +47,7 @@ parser:flag "-n --no-opt"
 
 parser:argument "date"
        :description "Date to process (today by default)"
-       :argname "<DDMMYYYY>"
+       :argname "<YYYYMMDD>"
        :args "*"
 parser:option "-b --batch-size"
       :description "Send reports in batches up to <batch-size> messages"
diff --git a/lualib/rspamadm/mime.lua b/lualib/rspamadm/mime.lua
index 9c81832162..68dd9e7606 100644
--- a/lualib/rspamadm/mime.lua
+++ b/lualib/rspamadm/mime.lua
@@ -312,11 +312,12 @@ local function extract_handler(opts)
         local mtype,msubtype = part:get_type()
         local det_mtype,det_msubtype = part:get_detected_type()
         table.insert(out,
-            rspamd_logger.slog('Mime Part: %s: %s/%s (%s/%s detected), filename: %s, size: %s',
+            rspamd_logger.slog('Mime Part: %s: %s/%s (%s/%s detected), filename: %s (%s detected ext), size: %s',
                 part:get_digest():sub(1,8),
                 mtype, msubtype,
                 det_mtype, det_msubtype,
                 part:get_filename(),
+                part:get_detected_ext(),
                 part:get_length()))
       end
     end