Merge pull request #1887 from franzs/feature_support_sni_for_check_smtp

Add support for SNI in check_smtp

1 files changed, 63 insertions, 63 deletions

diff --git a/po/monitoring-plugins.pot b/po/monitoring-plugins.pot
index 9ca153e8..471aae8c 100644
--- a/po/monitoring-plugins.pot
+++ b/po/monitoring-plugins.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
-"POT-Creation-Date: 2023-06-12 16:29+0200\n"
+"POT-Creation-Date: 2023-06-12 20:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 #: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:557
 #: plugins/check_nwstat.c:173 plugins/check_overcr.c:102
 #: plugins/check_pgsql.c:174 plugins/check_ping.c:97 plugins/check_procs.c:176
-#: plugins/check_radius.c:176 plugins/check_real.c:80 plugins/check_smtp.c:145
+#: plugins/check_radius.c:176 plugins/check_real.c:80 plugins/check_smtp.c:146
 #: plugins/check_snmp.c:248 plugins/check_ssh.c:74 plugins/check_swap.c:115
 #: plugins/check_tcp.c:222 plugins/check_time.c:78 plugins/check_ups.c:122
 #: plugins/check_users.c:84 plugins/negate.c:210 plugins-root/check_dhcp.c:270
@@ -67,14 +67,14 @@ msgstr ""
 
 #: plugins/check_by_ssh.c:242 plugins/check_disk.c:568 plugins/check_http.c:292
 #: plugins/check_ldap.c:334 plugins/check_pgsql.c:314 plugins/check_procs.c:461
-#: plugins/check_radius.c:323 plugins/check_real.c:357 plugins/check_smtp.c:601
+#: plugins/check_radius.c:323 plugins/check_real.c:357 plugins/check_smtp.c:607
 #: plugins/check_snmp.c:789 plugins/check_ssh.c:140 plugins/check_tcp.c:519
 #: plugins/check_time.c:302 plugins/check_ups.c:559 plugins/negate.c:160
 msgid "Timeout interval must be a positive integer"
 msgstr ""
 
 #: plugins/check_by_ssh.c:254 plugins/check_pgsql.c:344
-#: plugins/check_radius.c:287 plugins/check_real.c:328 plugins/check_smtp.c:526
+#: plugins/check_radius.c:287 plugins/check_real.c:328 plugins/check_smtp.c:532
 #: plugins/check_tcp.c:525 plugins/check_time.c:296 plugins/check_ups.c:521
 msgid "Port must be a positive integer"
 msgstr ""
@@ -243,7 +243,7 @@ msgstr ""
 #: plugins/check_ntp_peer.c:753 plugins/check_ntp_time.c:651
 #: plugins/check_nwstat.c:1685 plugins/check_overcr.c:467
 #: plugins/check_pgsql.c:551 plugins/check_ping.c:617 plugins/check_procs.c:829
-#: plugins/check_radius.c:400 plugins/check_real.c:452 plugins/check_smtp.c:875
+#: plugins/check_radius.c:400 plugins/check_real.c:452 plugins/check_smtp.c:890
 #: plugins/check_snmp.c:1346 plugins/check_ssh.c:325 plugins/check_swap.c:607
 #: plugins/check_tcp.c:710 plugins/check_time.c:371 plugins/check_ups.c:663
 #: plugins/check_users.c:262 plugins/check_ide_smart.c:606 plugins/negate.c:273
@@ -933,8 +933,8 @@ msgstr ""
 #: plugins/check_ntp.c:719 plugins/check_ntp_peer.c:497
 #: plugins/check_ntp_time.c:498 plugins/check_pgsql.c:338
 #: plugins/check_ping.c:301 plugins/check_ping.c:424 plugins/check_radius.c:279
-#: plugins/check_real.c:315 plugins/check_real.c:377 plugins/check_smtp.c:519
-#: plugins/check_smtp.c:667 plugins/check_ssh.c:162 plugins/check_time.c:240
+#: plugins/check_real.c:315 plugins/check_real.c:377 plugins/check_smtp.c:525
+#: plugins/check_smtp.c:680 plugins/check_ssh.c:162 plugins/check_time.c:240
 #: plugins/check_time.c:315 plugins/check_ups.c:507 plugins/check_ups.c:576
 msgid "Invalid hostname/address"
 msgstr ""
@@ -1187,7 +1187,7 @@ msgid "file does not exist or is not readable"
 msgstr ""
 
 #: plugins/check_http.c:324 plugins/check_http.c:329 plugins/check_http.c:335
-#: plugins/check_smtp.c:615 plugins/check_tcp.c:590 plugins/check_tcp.c:595
+#: plugins/check_smtp.c:621 plugins/check_tcp.c:590 plugins/check_tcp.c:595
 #: plugins/check_tcp.c:601
 msgid "Invalid certificate expiration period"
 msgstr ""
@@ -1226,7 +1226,7 @@ msgstr ""
 
 #: plugins/check_http.c:521 plugins/check_ntp.c:732
 #: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:517
-#: plugins/check_smtp.c:647 plugins/check_ssh.c:151 plugins/check_tcp.c:491
+#: plugins/check_smtp.c:660 plugins/check_ssh.c:151 plugins/check_tcp.c:491
 msgid "IPv6 support not available"
 msgstr ""
 
@@ -1482,7 +1482,7 @@ msgstr ""
 msgid "1.2 = TLSv1.2). With a '+' suffix, newer versions are also accepted."
 msgstr ""
 
-#: plugins/check_http.c:1749
+#: plugins/check_http.c:1749 plugins/check_smtp.c:856
 msgid "Enable SSL/TLS hostname extension support (SNI)"
 msgstr ""
 
@@ -4271,7 +4271,7 @@ msgstr ""
 msgid "Invalid NAS-Identifier\n"
 msgstr ""
 
-#: plugins/check_radius.c:199 plugins/check_smtp.c:155
+#: plugins/check_radius.c:199 plugins/check_smtp.c:156
 #, c-format
 msgid "gethostname() failed!\n"
 msgstr ""
@@ -4453,7 +4453,7 @@ msgstr ""
 msgid "This plugin will attempt to open an RTSP connection with the host."
 msgstr ""
 
-#: plugins/check_real.c:439 plugins/check_smtp.c:862
+#: plugins/check_real.c:439 plugins/check_smtp.c:877
 msgid "Successful connects return STATE_OK, refusals and timeouts return"
 msgstr ""
 
@@ -4471,220 +4471,220 @@ msgstr ""
 msgid "values."
 msgstr ""
 
-#: plugins/check_smtp.c:151 plugins/check_swap.c:283 plugins/check_swap.c:289
+#: plugins/check_smtp.c:152 plugins/check_swap.c:283 plugins/check_swap.c:289
 #, c-format
 msgid "malloc() failed!\n"
 msgstr ""
 
-#: plugins/check_smtp.c:199 plugins/check_smtp.c:211
+#: plugins/check_smtp.c:200 plugins/check_smtp.c:212
 #, c-format
 msgid "recv() failed\n"
 msgstr ""
 
-#: plugins/check_smtp.c:221
+#: plugins/check_smtp.c:222
 #, c-format
 msgid "WARNING - TLS not supported by server\n"
 msgstr ""
 
-#: plugins/check_smtp.c:233
+#: plugins/check_smtp.c:234
 #, c-format
 msgid "Server does not support STARTTLS\n"
 msgstr ""
 
-#: plugins/check_smtp.c:239
+#: plugins/check_smtp.c:240
 #, c-format
 msgid "CRITICAL - Cannot create SSL context.\n"
 msgstr ""
 
-#: plugins/check_smtp.c:259
+#: plugins/check_smtp.c:260
 msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS."
 msgstr ""
 
-#: plugins/check_smtp.c:264
+#: plugins/check_smtp.c:265
 #, c-format
 msgid "sent %s"
 msgstr ""
 
-#: plugins/check_smtp.c:266
+#: plugins/check_smtp.c:267
 msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS."
 msgstr ""
 
-#: plugins/check_smtp.c:296
+#: plugins/check_smtp.c:297
 #, c-format
 msgid "Invalid SMTP response received from host: %s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:298
+#: plugins/check_smtp.c:299
 #, c-format
 msgid "Invalid SMTP response received from host on port %d: %s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:321 plugins/check_snmp.c:865
+#: plugins/check_smtp.c:322 plugins/check_snmp.c:865
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr ""
 
-#: plugins/check_smtp.c:330
+#: plugins/check_smtp.c:331
 #, c-format
 msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
 msgstr ""
 
-#: plugins/check_smtp.c:334 plugins/check_snmp.c:540
+#: plugins/check_smtp.c:335 plugins/check_snmp.c:540
 #, c-format
 msgid "Execute Error: %s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:348
+#: plugins/check_smtp.c:349
 msgid "no authuser specified, "
 msgstr ""
 
-#: plugins/check_smtp.c:353
+#: plugins/check_smtp.c:354
 msgid "no authpass specified, "
 msgstr ""
 
-#: plugins/check_smtp.c:360 plugins/check_smtp.c:381 plugins/check_smtp.c:401
-#: plugins/check_smtp.c:714
+#: plugins/check_smtp.c:361 plugins/check_smtp.c:382 plugins/check_smtp.c:402
+#: plugins/check_smtp.c:727
 #, c-format
 msgid "sent %s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:363
+#: plugins/check_smtp.c:364
 msgid "recv() failed after AUTH LOGIN, "
 msgstr ""
 
-#: plugins/check_smtp.c:368 plugins/check_smtp.c:389 plugins/check_smtp.c:409
-#: plugins/check_smtp.c:725
+#: plugins/check_smtp.c:369 plugins/check_smtp.c:390 plugins/check_smtp.c:410
+#: plugins/check_smtp.c:738
 #, c-format
 msgid "received %s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:372
+#: plugins/check_smtp.c:373
 msgid "invalid response received after AUTH LOGIN, "
 msgstr ""
 
-#: plugins/check_smtp.c:385
+#: plugins/check_smtp.c:386
 msgid "recv() failed after sending authuser, "
 msgstr ""
 
-#: plugins/check_smtp.c:393
+#: plugins/check_smtp.c:394
 msgid "invalid response received after authuser, "
 msgstr ""
 
-#: plugins/check_smtp.c:405
+#: plugins/check_smtp.c:406
 msgid "recv() failed after sending authpass, "
 msgstr ""
 
-#: plugins/check_smtp.c:413
+#: plugins/check_smtp.c:414
 msgid "invalid response received after authpass, "
 msgstr ""
 
-#: plugins/check_smtp.c:420
+#: plugins/check_smtp.c:421
 msgid "only authtype LOGIN is supported, "
 msgstr ""
 
-#: plugins/check_smtp.c:444
+#: plugins/check_smtp.c:445
 #, c-format
 msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:556 plugins/check_smtp.c:568
+#: plugins/check_smtp.c:562 plugins/check_smtp.c:574
 #, c-format
 msgid "Could not realloc() units [%d]\n"
 msgstr ""
 
-#: plugins/check_smtp.c:576
+#: plugins/check_smtp.c:582
 msgid "Critical time must be a positive"
 msgstr ""
 
-#: plugins/check_smtp.c:584
+#: plugins/check_smtp.c:590
 msgid "Warning time must be a positive"
 msgstr ""
 
-#: plugins/check_smtp.c:627
+#: plugins/check_smtp.c:633 plugins/check_smtp.c:644
 msgid "SSL support not available - install OpenSSL and recompile"
 msgstr ""
 
-#: plugins/check_smtp.c:705 plugins/check_smtp.c:710
+#: plugins/check_smtp.c:718 plugins/check_smtp.c:723
 #, c-format
 msgid "Connection closed by server before sending QUIT command\n"
 msgstr ""
 
-#: plugins/check_smtp.c:720
+#: plugins/check_smtp.c:733
 #, c-format
 msgid "recv() failed after QUIT."
 msgstr ""
 
-#: plugins/check_smtp.c:722
+#: plugins/check_smtp.c:735
 #, c-format
 msgid "Connection reset by peer."
 msgstr ""
 
-#: plugins/check_smtp.c:812
+#: plugins/check_smtp.c:825
 msgid "This plugin will attempt to open an SMTP connection with the host."
 msgstr ""
 
-#: plugins/check_smtp.c:826
+#: plugins/check_smtp.c:839
 #, c-format
 msgid "    String to expect in first line of server response (default: '%s')\n"
 msgstr ""
 
-#: plugins/check_smtp.c:828
+#: plugins/check_smtp.c:841
 msgid "SMTP command (may be used repeatedly)"
 msgstr ""
 
-#: plugins/check_smtp.c:830
+#: plugins/check_smtp.c:843
 msgid "Expected response to command (may be used repeatedly)"
 msgstr ""
 
-#: plugins/check_smtp.c:832
+#: plugins/check_smtp.c:845
 msgid "FROM-address to include in MAIL command, required by Exchange 2000"
 msgstr ""
 
-#: plugins/check_smtp.c:834
+#: plugins/check_smtp.c:847
 msgid "FQDN used for HELO"
 msgstr ""
 
-#: plugins/check_smtp.c:836
+#: plugins/check_smtp.c:849
 msgid "Use PROXY protocol prefix for the connection."
 msgstr ""
 
-#: plugins/check_smtp.c:839 plugins/check_tcp.c:689
+#: plugins/check_smtp.c:852 plugins/check_tcp.c:689
 msgid "Minimum number of days a certificate has to be valid."
 msgstr ""
 
-#: plugins/check_smtp.c:841
+#: plugins/check_smtp.c:854
 msgid "Use STARTTLS for the connection."
 msgstr ""
 
-#: plugins/check_smtp.c:845
+#: plugins/check_smtp.c:860
 msgid "SMTP AUTH type to check (default none, only LOGIN supported)"
 msgstr ""
 
-#: plugins/check_smtp.c:847
+#: plugins/check_smtp.c:862
 msgid "SMTP AUTH username"
 msgstr ""
 
-#: plugins/check_smtp.c:849
+#: plugins/check_smtp.c:864
 msgid "SMTP AUTH password"
 msgstr ""
 
-#: plugins/check_smtp.c:851
+#: plugins/check_smtp.c:866
 msgid "Send LHLO instead of HELO/EHLO"
 msgstr ""
 
-#: plugins/check_smtp.c:853
+#: plugins/check_smtp.c:868
 msgid "Ignore failure when sending QUIT command to server"
 msgstr ""
 
-#: plugins/check_smtp.c:863
+#: plugins/check_smtp.c:878
 msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful"
 msgstr ""
 
-#: plugins/check_smtp.c:864
+#: plugins/check_smtp.c:879
 msgid "connects, but incorrect response messages from the host result in"
 msgstr ""
 
-#: plugins/check_smtp.c:865
+#: plugins/check_smtp.c:880
 msgid "STATE_WARNING return values."
 msgstr ""