[Minor] confighelp: Lua compatibility, remove bogus elements

diff --git a/lualib/rspamadm/confighelp.lua b/lualib/rspamadm/confighelp.lua
index dedc844ca96e85e5f7d9efe0d19473fbf9096252..0d01030bee30b5f163aea44dd75073c0e95b46c5 100644 (file)
--- a/lualib/rspamadm/confighelp.lua
+++ b/lualib/rspamadm/confighelp.lua
@@ -25,7 +25,7 @@ parser:flag "--no-examples"
 
 local function maybe_print_color(key)
   if not opts['no-color'] then
-    return ansicolors.white .. key .. ansicolors.reset
+    return string.format('%s%s%s', ansicolors.white, key, ansicolors.reset)
   else
     return key
   end

diff --git a/src/plugins/lua/antivirus.lua b/src/plugins/lua/antivirus.lua
index 1d4b8349359c591fa9f921ad155ace0a3e1243f3..a846f077d58d0557b58f60c08c9ebc844037767d 100644 (file)
--- a/src/plugins/lua/antivirus.lua
+++ b/src/plugins/lua/antivirus.lua
@@ -59,7 +59,6 @@ if confighelp then
       # if `patterns` is specified virus name will be matched against provided regexes and the related
       # symbol will be yielded if a match is found. If no match is found, default symbol is yielded.
       patterns {
-        # symbol_name = "pattern";
         JUST_EICAR = "^Eicar-Test-Signature$";
       }
       # `whitelist` points to a map of IP addresses. Mail from these addresses is not scanned.

diff --git a/src/plugins/lua/external_services.lua b/src/plugins/lua/external_services.lua
index 489b0af7d62bb909a08fc88a340664c3f0429da8..b43fefba266b30d2ebb08830ce44fa667576766a 100644 (file)
--- a/src/plugins/lua/external_services.lua
+++ b/src/plugins/lua/external_services.lua
@@ -46,12 +46,11 @@ if confighelp then
       # if `patterns` is specified virus name will be matched against provided regexes and the related
       # symbol will be yielded if a match is found. If no match is found, default symbol is yielded.
       patterns {
-        # symbol_name = "pattern";
         JUST_EICAR = "^Eicar-Test-Signature$";
       }
       # mime-part regex matching in content-type or filename
       mime_parts_filter_regex {
-        #GEN1 = "application\/octet-stream";
+        GEN1 = "application\/octet-stream";
         DOC2 = "application\/msword";
         DOC3 = "application\/vnd\.ms-word.*";
         XLS = "application\/vnd\.ms-excel.*";

diff --git a/src/plugins/lua/p0f.lua b/src/plugins/lua/p0f.lua
index 727e6d1bb42d6eaa944ee2a4fe1a92c2325a6f75..8c681fa4e399b6aa9068ec6a739791e12a4da1a2 100644 (file)
--- a/src/plugins/lua/p0f.lua
+++ b/src/plugins/lua/p0f.lua
@@ -45,8 +45,8 @@ if confighelp then
     # Symbol will be yielded on OS string, link type or distance matches
     patterns = {
       WINDOWS = '^Windows.*';
-      #DSL = '^DSL$';
-      #DISTANCE10 = '^distance:10$';
+      DSL = '^DSL$';
+      DISTANCE10 = '^distance:10$';
     }
 
     # Cache lifetime in seconds (default - 2 hours)