From 41fb615f3de34c3b3a344e74fd9cc24936cd58a6 Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Fri, 14 Apr 2023 15:01:48 +0000
Subject: CI: Adding Codespell (and Super Linter)

---
 .github/workflows/test.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to '.github')

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 80d49f7e..e825eb34 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,9 +7,40 @@ on:
   pull_request:
 
 jobs:
+  codespell:
+    name: codespell
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Codespell
+        uses: codespell-project/actions-codespell@master
+        with:
+          skip: "./.git,./.gitignore,./ABOUT-NLS,*.po,./gl,./po,./tools/squid.conf,./build-aux/ltmain.sh"
+          ignore_words_list: allright,gord,didi,hda,nd,alis,clen,scrit,ser,fot,te,parm,isnt,consol,oneliners
+          check_filenames: true
+          check_hidden: true
+#  super-linter:
+#    name: super-linter
+#    strategy:
+#      fail-fast: false
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v3
+#      - name: Lint Code Base
+#        uses: github/super-linter@v5.0.0
+#        env:
+#          DEFAULT_BRANCH: master
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 #  macos:
 #    ...
   linux:
+    needs:
+      - codespell
+#      - super-linter
     runs-on: ubuntu-latest
     name: Running tests on ${{ matrix.distro }}
     strategy:
-- 
cgit v1.2.3-74-g34f1


From 483ae9fca47a424bcdbb75bfd63c90afd28b9ccc Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Thu, 11 May 2023 18:01:38 +0000
Subject: CI: Fallback on software-properties-common

---
 .github/prepare_debian.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to '.github')

diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index 5222659e..aa224ef9 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -5,13 +5,18 @@ set -e
 
 export DEBIAN_FRONTEND=noninteractive
 
-sed "s/main/non-free contrib/g" /etc/apt/sources.list.d/debian.sources > /etc/apt/sources.list.d/debian-nonfree.sources
-apt-get update
-apt-get -y install software-properties-common
-if [ $(lsb_release -is) = "Debian" ]; then
-  apt-add-repository non-free
-  apt-get update
+source /etc/os-release
+
+if [ ${ID} = "debian" ]; then
+	if [ -f /etc/apt/sources.list.d/debian.sources  ]; then
+		sed "s/main/non-free contrib/g" /etc/apt/sources.list.d/debian.sources > /etc/apt/sources.list.d/debian-nonfree.sources
+	else
+		apt-get update
+		apt-get -y install software-properties-common
+		apt-add-repository non-free
+	fi
 fi
+apt-get update
 apt-get -y install perl \
 	autotools-dev \
 	libdbi-dev \
-- 
cgit v1.2.3-74-g34f1


From 0918a6a30b204bd61e4b42c5731e18dc86a9e6c4 Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Thu, 11 May 2023 18:23:56 +0000
Subject: CI: Fallback on mysql service

---
 .github/prepare_debian.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github')

diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index aa224ef9..7f5592b4 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -88,7 +88,7 @@ cp tools/squid.conf /etc/squid/squid.conf
 service squid start
 
 # mariadb
-service mariadb start
+service mariadb start || service mysql start
 mysql -e "create database IF NOT EXISTS test;" -uroot
 
 # ldap
-- 
cgit v1.2.3-74-g34f1


From 8cb3480b9bf24bf478c81745d49fbea779489872 Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Mon, 15 May 2023 20:17:48 +0200
Subject: Run tests on PRs again

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.github')

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e825eb34..5685003c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - '*'
   pull_request:
+      - '*'
 
 jobs:
   codespell:
-- 
cgit v1.2.3-74-g34f1


From 22779b1b99fa1278a60e72a674846b12496754eb Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Wed, 28 Jun 2023 15:51:56 +0200
Subject: Fix CI workflow syntax

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github')

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5685003c..88d5d661 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - '*'
+  # Run test for any PRs
   pull_request:
-      - '*'
 
 jobs:
   codespell:
-- 
cgit v1.2.3-74-g34f1


From fbf0c9d208321cc2f9b9a1f166a8a582e41e53f8 Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Wed, 28 Jun 2023 15:37:20 +0200
Subject: Fix indentation

---
 .github/workflows/codeql-analysis.yml | 54 +++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ab8bfaae..b56ac16d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -38,35 +38,35 @@ jobs:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    - name: Install packages
-      run: |
-        sudo apt update
-        sudo apt-get install -y --no-install-recommends m4 gettext automake autoconf make build-essential
-        sudo apt-get install -y --no-install-recommends perl autotools-dev libdbi-dev libldap2-dev libpq-dev \
-                                                        libmysqlclient-dev libradcli-dev libkrb5-dev libdbi0-dev \
-                                                        libdbd-sqlite3 libssl-dev libcurl4-openssl-dev liburiparser-dev
+      - name: Install packages
+        run: |
+          sudo apt update
+          sudo apt-get install -y --no-install-recommends m4 gettext automake autoconf make build-essential
+          sudo apt-get install -y --no-install-recommends perl autotools-dev libdbi-dev libldap2-dev libpq-dev \
+                                                          libmysqlclient-dev libradcli-dev libkrb5-dev libdbi0-dev \
+                                                          libdbd-sqlite3 libssl-dev libcurl4-openssl-dev liburiparser-dev
 
-    - name: Configure build
-      run: |
-        ./tools/setup
-        ./configure --enable-libtap
+      - name: Configure build
+        run: |
+          ./tools/setup
+          ./configure --enable-libtap
 
-    - name: Build
-      run: |
-        make
+      - name: Build
+        run: |
+          make
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
-- 
cgit v1.2.3-74-g34f1


From 73d79c2982478d43e8c63dccc3e54421272e2cbd Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Wed, 28 Jun 2023 15:38:14 +0200
Subject: Add missing document start

---
 .github/dependabot.yml                | 1 +
 .github/workflows/codeql-analysis.yml | 1 +
 .github/workflows/test.yml            | 1 +
 3 files changed, 3 insertions(+)

(limited to '.github')

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 282063c4..07073644 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,3 +1,4 @@
+---
 version: 2
 updates:
   - package-ecosystem: github-actions
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b56ac16d..4fac7032 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,3 +1,4 @@
+---
 # For most projects, this workflow file will not need changing; you simply need
 # to commit it to your repository.
 #
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 88d5d661..306f21cf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,3 +1,4 @@
+---
 name: Test
 
 on:
-- 
cgit v1.2.3-74-g34f1


From dee6b03307c599b0cf74bc7fa3714b1335156aed Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Wed, 28 Jun 2023 15:40:02 +0200
Subject: Fix too many spaces inside brackets

---
 .github/workflows/codeql-analysis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 4fac7032..43b35d31 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,10 +14,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [master]
   schedule:
     - cron: '15 18 * * 0'
 
@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'cpp' ]
+        language: ['cpp']
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-- 
cgit v1.2.3-74-g34f1


From 85c8210e58b1e9fd47d04f2d72145322cbd20353 Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Wed, 28 Jun 2023 18:08:38 +0200
Subject: Try to detect if there are translation updates via CI

---
 .github/workflows/test.yml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to '.github')

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 306f21cf..9c84acc4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -74,6 +74,10 @@ jobs:
               /bin/sh -c '${{ matrix.prepare }} && \
                 tools/setup && \
                 ./configure --enable-libtap  --with-ipv6=no && \
+                set -x && \
+                tmp_dir=$(mktemp -d -t test-XXXX) && cp -a po/ $tmp_dir/  && \
+                cd po && make update-po && cd .. && \
+                diff -Nur $tmp_dir/po/*.po po/*.po | tee -a /tmp/po.diff && diff -Nur $tmp_dir/po/*.pot po/*.pot | tee -a /tmp/po.diff && if [ $(wc -l /tmp/po.diff | cut -f 1 -d" ") -gt 0 ]; then echo "Error: Translations needs to be updated with make update-po!" && exit 1; fi && \ 
                 make && \
                 make test'
           docker container prune -f
-- 
cgit v1.2.3-74-g34f1


From c57b7157daa0a170f9ef76776d493afa123a8d32 Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Sun, 27 Aug 2023 23:51:40 +0200
Subject: Try to not delete random MIBs to avoid compiling errors

---
 .github/prepare_debian.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to '.github')

diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index 7f5592b4..a1e65c04 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -108,12 +108,13 @@ ssh -tt localhost </dev/null >/dev/null 2>/dev/null &
 disown %1
 
 # snmpd
-for DIR in /usr/share/snmp/mibs /usr/share/mibs; do
-    rm -f $DIR/ietf/SNMPv2-PDU \
-          $DIR/ietf/IPSEC-SPD-MIB \
-          $DIR/ietf/IPATM-IPMC-MIB \
-          $DIR/iana/IANA-IPPM-METRICS-REGISTRY-MIB
-done
+service snmpd stop
+#for DIR in /usr/share/snmp/mibs /usr/share/mibs; do
+#    rm -f $DIR/ietf/SNMPv2-PDU \
+#          $DIR/ietf/IPSEC-SPD-MIB \
+#          $DIR/ietf/IPATM-IPMC-MIB \
+#          $DIR/iana/IANA-IPPM-METRICS-REGISTRY-MIB
+#done
 mkdir -p /var/lib/snmp/mib_indexes
 sed -e 's/^agentaddress.*/agentaddress 127.0.0.1/' -i /etc/snmp/snmpd.conf
 service snmpd start
-- 
cgit v1.2.3-74-g34f1


From 70d0457562d58c16acd2a3514c9e4cc3f07ec923 Mon Sep 17 00:00:00 2001
From: Lorenz Kästle <lorenz.kaestle@netways.de>
Date: Mon, 28 Aug 2023 13:05:44 +0200
Subject: Remove dead code from test machine prepare script

---
 .github/prepare_debian.sh | 6 ------
 1 file changed, 6 deletions(-)

(limited to '.github')

diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index a1e65c04..9611670d 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -109,12 +109,6 @@ disown %1
 
 # snmpd
 service snmpd stop
-#for DIR in /usr/share/snmp/mibs /usr/share/mibs; do
-#    rm -f $DIR/ietf/SNMPv2-PDU \
-#          $DIR/ietf/IPSEC-SPD-MIB \
-#          $DIR/ietf/IPATM-IPMC-MIB \
-#          $DIR/iana/IANA-IPPM-METRICS-REGISTRY-MIB
-#done
 mkdir -p /var/lib/snmp/mib_indexes
 sed -e 's/^agentaddress.*/agentaddress 127.0.0.1/' -i /etc/snmp/snmpd.conf
 service snmpd start
-- 
cgit v1.2.3-74-g34f1


From 8fa9370a0c0d576c5e8cb945e4195541be7f3823 Mon Sep 17 00:00:00 2001
From: Franz Schwartau <franz@electromail.org>
Date: Tue, 29 Aug 2023 10:58:31 +0200
Subject: Rename test variables for upcoming new variables with the same name

---
 .github/NPTest.cache   |  4 ++--
 plugins/t/check_smtp.t | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to '.github')

diff --git a/.github/NPTest.cache b/.github/NPTest.cache
index 232305a7..c8dbdf61 100644
--- a/.github/NPTest.cache
+++ b/.github/NPTest.cache
@@ -25,8 +25,8 @@
   'NP_HOST_TCP_POP' => 'pop.web.de',
   'NP_HOST_TCP_PROXY' => 'localhost',
   'NP_HOST_TCP_SMTP' => 'localhost',
-  'NP_HOST_TCP_SMTP_NOTLS' => '',
-  'NP_HOST_TCP_SMTP_TLS' => '',
+  'NP_HOST_TCP_SMTP_NOSTARTTLS' => '',
+  'NP_HOST_TCP_SMTP_STARTTLS' => '',
   'NP_HOST_TLS_CERT' => 'localhost',
   'NP_HOST_TLS_HTTP' => 'localhost',
   'NP_HOST_UDP_TIME' => 'none',
diff --git a/plugins/t/check_smtp.t b/plugins/t/check_smtp.t
index aa6dae45..fd09ed22 100644
--- a/plugins/t/check_smtp.t
+++ b/plugins/t/check_smtp.t
@@ -8,12 +8,12 @@ use strict;
 use Test::More;
 use NPTest;
 
-my $host_tcp_smtp      = getTestParameter( "NP_HOST_TCP_SMTP", 
+my $host_tcp_smtp            = getTestParameter( "NP_HOST_TCP_SMTP",
 					   "A host providing an SMTP Service (a mail server)", "mailhost");
-my $host_tcp_smtp_tls  = getTestParameter( "NP_HOST_TCP_SMTP_TLS",
-					   "A host providing SMTP with TLS", $host_tcp_smtp);
-my $host_tcp_smtp_notls = getTestParameter( "NP_HOST_TCP_SMTP_NOTLS",
-					   "A host providing SMTP without TLS", "");
+my $host_tcp_smtp_starttls   = getTestParameter( "NP_HOST_TCP_SMTP_STARTTLS",
+					   "A host providing SMTP with STARTTLS", $host_tcp_smtp);
+my $host_tcp_smtp_nostarttls = getTestParameter( "NP_HOST_TCP_SMTP_NOSTARTTLS",
+					   "A host providing SMTP without STARTTLS", "");
 
 my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE", 
 					   "The hostname of system not responsive to network requests", "10.0.0.1" );
@@ -45,16 +45,16 @@ SKIP: {
 }
 
 SKIP: {
-	skip "No SMTP server with TLS defined", 1 unless $host_tcp_smtp_tls;
-	# SSL connection for TLS
-	$res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_tls -p 25 -S" );
+	skip "No SMTP server with STARTTLS defined", 1 unless $host_tcp_smtp_starttls;
+	# SSL connection for STARTTLS
+	$res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_starttls -p 25 -S" );
 	is ($res->return_code, 0, "OK, with STARTTLS" );
 }
 
 SKIP: {
-	skip "No SMTP server without TLS defined", 2 unless $host_tcp_smtp_notls;
-	$res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_notls -p 25 -S" );
-	is ($res->return_code, 1, "OK, got warning from server without TLS");
+	skip "No SMTP server without STARTTLS defined", 2 unless $host_tcp_smtp_nostarttls;
+	$res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_nostarttls -p 25 -S" );
+	is ($res->return_code, 1, "OK, got warning from server without STARTTLS");
 	is ($res->output, "WARNING - TLS not supported by server", "Right error message" );
 }
 
-- 
cgit v1.2.3-74-g34f1


From 3a69b8c16a78953f89267238e74abc4c9e5dca7f Mon Sep 17 00:00:00 2001
From: Franz Schwartau <franz@electromail.org>
Date: Tue, 29 Aug 2023 12:25:17 +0200
Subject: enable NP_HOST_TCP_SMTP_STARTTLS

---
 .github/NPTest.cache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github')

diff --git a/.github/NPTest.cache b/.github/NPTest.cache
index c8dbdf61..e3694573 100644
--- a/.github/NPTest.cache
+++ b/.github/NPTest.cache
@@ -26,7 +26,7 @@
   'NP_HOST_TCP_PROXY' => 'localhost',
   'NP_HOST_TCP_SMTP' => 'localhost',
   'NP_HOST_TCP_SMTP_NOSTARTTLS' => '',
-  'NP_HOST_TCP_SMTP_STARTTLS' => '',
+  'NP_HOST_TCP_SMTP_STARTTLS' => 'localhost',
   'NP_HOST_TLS_CERT' => 'localhost',
   'NP_HOST_TLS_HTTP' => 'localhost',
   'NP_HOST_UDP_TIME' => 'none',
-- 
cgit v1.2.3-74-g34f1


From 06ebad83995921b622aecbd2111f1f6e6c62efc4 Mon Sep 17 00:00:00 2001
From: Franz Schwartau <franz@electromail.org>
Date: Tue, 29 Aug 2023 15:12:47 +0200
Subject: check_smtp: add tests for --ssl

---
 .github/NPTest.cache      |  1 +
 .github/prepare_debian.sh |  6 +++++-
 plugins/t/check_smtp.t    | 20 +++++++++++++++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

(limited to '.github')

diff --git a/.github/NPTest.cache b/.github/NPTest.cache
index e3694573..d488d1b9 100644
--- a/.github/NPTest.cache
+++ b/.github/NPTest.cache
@@ -27,6 +27,7 @@
   'NP_HOST_TCP_SMTP' => 'localhost',
   'NP_HOST_TCP_SMTP_NOSTARTTLS' => '',
   'NP_HOST_TCP_SMTP_STARTTLS' => 'localhost',
+  'NP_HOST_TCP_SMTP_TLS' => 'localhost',
   'NP_HOST_TLS_CERT' => 'localhost',
   'NP_HOST_TLS_HTTP' => 'localhost',
   'NP_HOST_UDP_TIME' => 'none',
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index 9611670d..dcf778bc 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -116,7 +116,11 @@ service snmpd start
 # start cron, will be used by check_nagios
 cron
 
-# start postfix
+# postfix
+cat <<EOD >> /etc/postfix/master.cf
+smtps     inet  n       -       n       -       -       smtpd
+  -o smtpd_tls_wrappermode=yes
+EOD
 service postfix start
 
 # start ftpd
diff --git a/plugins/t/check_smtp.t b/plugins/t/check_smtp.t
index fd09ed22..1a1ebe3e 100644
--- a/plugins/t/check_smtp.t
+++ b/plugins/t/check_smtp.t
@@ -14,6 +14,8 @@ my $host_tcp_smtp_starttls   = getTestParameter( "NP_HOST_TCP_SMTP_STARTTLS",
 					   "A host providing SMTP with STARTTLS", $host_tcp_smtp);
 my $host_tcp_smtp_nostarttls = getTestParameter( "NP_HOST_TCP_SMTP_NOSTARTTLS",
 					   "A host providing SMTP without STARTTLS", "");
+my $host_tcp_smtp_tls        = getTestParameter( "NP_HOST_TCP_SMTP_TLS",
+					   "A host providing SMTP with TLS", $host_tcp_smtp);
 
 my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE", 
 					   "The hostname of system not responsive to network requests", "10.0.0.1" );
@@ -22,7 +24,7 @@ my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
                                            "An invalid (not known to DNS) hostname", "nosuchhost" );
 my $res;
 
-plan tests => 10;
+plan tests => 16;
 
 SKIP: {
 	skip "No SMTP server defined", 4 unless $host_tcp_smtp;
@@ -42,6 +44,10 @@ SKIP: {
 		local $TODO = "Output is over two lines";
 		like ( $res->output, qr/^SMTP WARNING/, "Correct error message" );
 	}
+
+	$res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp --ssl -p 25" );
+	is ($res->return_code, 2, "Check rc of connecting to $host_tcp_smtp with TLS on standard SMTP port" );
+	like ($res->output, qr/^CRITICAL - Cannot make SSL connection\./, "Check output of connecting to $host_tcp_smtp with TLS on standard SMTP port");
 }
 
 SKIP: {
@@ -58,6 +64,18 @@ SKIP: {
 	is ($res->output, "WARNING - TLS not supported by server", "Right error message" );
 }
 
+SKIP: {
+	skip "No SMTP server with TLS defined", 1 unless $host_tcp_smtp_tls;
+	$res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_tls --ssl" );
+	is ($res->return_code, 0, "Check rc of connecting to $host_tcp_smtp_tls with TLS" );
+	like ($res->output, qr/^SMTP OK - /, "Check output of connecting to $host_tcp_smtp_tls with TLS" );
+
+	my $unused_port = 4465;
+	$res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_tls -p $unused_port --ssl" );
+	is ($res->return_code, 2, "Check rc of connecting to $host_tcp_smtp_tls with TLS on unused port $unused_port" );
+	like ($res->output, qr/^connect to address $host_tcp_smtp_tls and port $unused_port: Connection refused/, "Check output of connecting to $host_tcp_smtp_tls with TLS on unused port $unused_port");
+}
+
 $res = NPTest->testCmd( "./check_smtp $host_nonresponsive" );
 is ($res->return_code, 2, "CRITICAL - host non responding" );
 
-- 
cgit v1.2.3-74-g34f1


From add465800bcc6651ade714e7c1c248f8246b7c64 Mon Sep 17 00:00:00 2001
From: Franz Schwartau <franz@electromail.org>
Date: Mon, 4 Sep 2023 16:33:04 +0200
Subject: Use codespell-project/actions-codespell@v2

The current master version seems to introduce an issue, e. g.

codespell
Can't use 'tar -xzf' extract archive file: /home/runner/work/_actions/_temp_301f7ff6-2829-439a-bb1e-e3787b7d0b37/0567173d-ce48-4e72-bccb-2a410baeb2a3.tar.gz. return code: 2.

https://github.com/monitoring-plugins/monitoring-plugins/actions/runs/6074675443
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github')

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9c84acc4..5b9f1fcb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Codespell
-        uses: codespell-project/actions-codespell@master
+        uses: codespell-project/actions-codespell@v2
         with:
           skip: "./.git,./.gitignore,./ABOUT-NLS,*.po,./gl,./po,./tools/squid.conf,./build-aux/ltmain.sh"
           ignore_words_list: allright,gord,didi,hda,nd,alis,clen,scrit,ser,fot,te,parm,isnt,consol,oneliners
-- 
cgit v1.2.3-74-g34f1


From 743d41da0eb6452073b4a3f3f773704ae42356db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 04:33:25 +0000
Subject: Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/test.yml            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 43b35d31..0317c8c0 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5b9f1fcb..77b09f43 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Codespell
         uses: codespell-project/actions-codespell@v2
         with:
@@ -31,7 +31,7 @@ jobs:
 #    runs-on: ubuntu-latest
 #    steps:
 #      - name: Checkout
-#        uses: actions/checkout@v3
+#        uses: actions/checkout@v4
 #      - name: Lint Code Base
 #        uses: github/super-linter@v5.0.0
 #        env:
@@ -57,7 +57,7 @@ jobs:
           #...
     steps:
       - name: Git clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       #- name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate
       #  uses: mxschmitt/action-tmate@v3
       - name: Run the tests on ${{ matrix.distro }}
-- 
cgit v1.2.3-74-g34f1