From 6c33e11d5fd46e21a2d48406d74d89068c15ed15 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Thu, 28 Jul 2022 14:18:12 +0200
Subject: [PATCH] evocheck: upstream release 22.07.1

---
 CHANGELOG.md               |  2 ++
 evocheck/files/evocheck.sh | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9761cf5e..502ee302 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 ### Changed
 
+* evocheck: upstream release 22.07.1
+
 ### Fixed
 
 ### Removed
diff --git a/evocheck/files/evocheck.sh b/evocheck/files/evocheck.sh
index 1bc54d79..8468c5cb 100644
--- a/evocheck/files/evocheck.sh
+++ b/evocheck/files/evocheck.sh
@@ -1226,18 +1226,18 @@ check_usrsharescripts() {
 check_sshpermitrootno() {
     sshd_args="-C addr=,user=,host=,laddr=,lport=0"
     if is_debian_jessie || is_debian_stretch; then
-	# Noop, we'll use the default $sshd_args
+	    # Noop, we'll use the default $sshd_args
         :
     elif is_debian_buster; then
-	sshd_args="${sshd_args},rdomain="
+	    sshd_args="${sshd_args},rdomain="
     else
-	# NOTE: From Debian Bullseye 11 onward, with OpenSSH 8.1, the argument
+	    # NOTE: From Debian Bullseye 11 onward, with OpenSSH 8.1, the argument
         # -T doesn't require the additional -C.
-	sshd_args=
+	    sshd_args=
     fi
     # shellcheck disable=SC2086
-    if ! (sshd -T ${sshd_args} | grep -q 'permitrootlogin no'); then
-       failed "IS_SSHPERMITROOTNO" "PermitRoot should be set to no"
+    if ! (sshd -T ${sshd_args} 2> /dev/null | grep -qi 'permitrootlogin no'); then
+        failed "IS_SSHPERMITROOTNO" "PermitRoot should be set to no"
     fi
 }
 check_evomaintenanceusers() {