From 0be0e43d475ab9cec83b747134023279d1c95eb3 Mon Sep 17 00:00:00 2001
From: sebres <serg.brester@sebres.de>
Date: Tue, 30 Jan 2018 12:52:26 +0100
Subject: [PATCH] amend to 03b577d7b92a120e325abe20a99b6956a7e0657c: add
 new-line after matches via tag `<br>` without usage of interim variable

---
 config/action.d/blocklist_de.conf        | 2 +-
 fail2ban/tests/fail2banclienttestcase.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/action.d/blocklist_de.conf b/config/action.d/blocklist_de.conf
index 246f90f7..b9cd0584 100644
--- a/config/action.d/blocklist_de.conf
+++ b/config/action.d/blocklist_de.conf
@@ -54,7 +54,7 @@ actioncheck =
 # Tags:    See jail.conf(5) man page
 # Values:  CMD
 #
-actionban = lgm=$(printf 'logs=%%s\n...' "<matches>"); curl --fail --data-urlencode "server=<email>" --data "apikey=<apikey>" --data "service=<service>" --data "ip=<ip>" --data-urlencode "$lgm" --data 'format=text' --user-agent "<agent>" "https://www.blocklist.de/en/httpreports.html"
+actionban = curl --fail --data-urlencode "server=<email>" --data "apikey=<apikey>" --data "service=<service>" --data "ip=<ip>" --data-urlencode "logs=<matches><br>" --data 'format=text' --user-agent "<agent>" "https://www.blocklist.de/en/httpreports.html"
 
 # Option:  actionunban
 # Notes.:  command executed when unbanning an IP. Take care that the
diff --git a/fail2ban/tests/fail2banclienttestcase.py b/fail2ban/tests/fail2banclienttestcase.py
index 92fdfa5c..e346f09d 100644
--- a/fail2ban/tests/fail2banclienttestcase.py
+++ b/fail2ban/tests/fail2banclienttestcase.py
@@ -1223,11 +1223,11 @@ class Fail2banServerTest(Fail2banClientServerBase):
 		self.assertIn('\\125-000-004 1;\n', mp)
 		self.assertIn('\\125-000-005 1;\n', mp)
 
-		# check blocklist_de substitution:
+		# check blocklist_de substitution (e. g. new-line after <matches>):
 		self.assertLogged(
 			"stdout: '*** curl --fail --data-urlencode server=Fail2Ban <fail2ban@localhost>"
-				" --data apikey=TEST-API-KEY --data service=nginx-blck-lst ",
-			"stdout: '... --data format=text --user-agent fail2ban-test-agent",
+			                 " --data apikey=TEST-API-KEY --data service=nginx-blck-lst ",
+			"stdout: ' --data format=text --user-agent fail2ban-test-agent",
 			all=True, wait=MID_WAITTIME
 		)