1 files changed, 15 insertions, 7 deletions

diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 09806373..924322e4 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -89,6 +89,14 @@ const int DEFAULT_NNTPS_PORT = 563;
 const int DEFAULT_CLAMD_PORT = 3310;
 
 int main(int argc, char **argv) {
+#ifdef __OpenBSD__
+        /* - rpath is required to read --extra-opts (given up later)
+         * - inet is required for sockets
+         * - unix is required for Unix domain sockets
+         * - dns is required for name lookups */
+        pledge("stdio rpath inet unix dns", NULL);
+#endif // __OpenBSD__
+
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
@@ -216,6 +224,10 @@ int main(int argc, char **argv) {
                 usage4(_("Could not parse arguments"));
         }
 
+#ifdef __OpenBSD__
+        pledge("stdio inet unix dns", NULL);
+#endif // __OpenBSD__
+
         config = paw.config;
 
         if (verbosity > 0) {
@@ -550,7 +562,7 @@ static check_tcp_config_wrapper process_arguments(int argc, char **argv, check_t
                 int option_index =
                         getopt_long(argc, argv, "+hVv46EAH:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:", longopts, &option);
 
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                if (CHECK_EOF(option_index) || option_index == 1) {
                         break;
                 }
 
@@ -571,11 +583,7 @@ static check_tcp_config_wrapper process_arguments(int argc, char **argv, check_t
                         address_family = AF_INET;
                         break;
                 case '6': // Apparently unused TODO
-#ifdef USE_IPV6
                         address_family = AF_INET6;
-#else
-                        usage4(_("IPv6 support not available"));
-#endif
                         break;
                 case 'H': /* hostname */
                         config.host_specified = true;
@@ -675,7 +683,7 @@ static check_tcp_config_wrapper process_arguments(int argc, char **argv, check_t
                         break;
                 case 'D': /* Check SSL cert validity - days 'til certificate expiration */
 #ifdef HAVE_SSL
-#       ifdef USE_OPENSSL /* XXX */
+#       ifdef MOPL_USE_OPENSSL /* XXX */
                 {
                         char *temp;
                         if ((temp = strchr(optarg, ',')) != NULL) {
@@ -700,7 +708,7 @@ static check_tcp_config_wrapper process_arguments(int argc, char **argv, check_t
                         config.check_cert = true;
                         config.use_tls = true;
                 } break;
-#       endif /* USE_OPENSSL */
+#       endif /* MOPL_USE_OPENSSL */
 #endif
                         /* fallthrough if we don't have ssl */
                 case 'S':