check_host: Allocate a large-enough buffer for the host table.

[nagiosplug.git] / plugins / check_smtp.c

diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 6040aa121236a2f595a6b749ab8611d296940d6c..ed491638993cdb0598e0c8d1c7b9c74dad492e76 100644 (file)
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -183,7 +183,7 @@ main (int argc, char **argv)
                /* return a WARNING status if we couldn't read any data */
                if (recvlines(buffer, MAX_INPUT_BUFFER) <= 0) {
                        printf (_("recv() failed\n"));
-                       result = STATE_WARNING;
+                       return STATE_WARNING;
                }
                else {
                        if (verbose)
@@ -197,7 +197,7 @@ main (int argc, char **argv)
                                else
                                        printf (_("Invalid SMTP response received from host on port %d: %s\n"),
                                                                        server_port, buffer);
-                               result = STATE_WARNING;
+                               return STATE_WARNING;
                        }
                }
 
@@ -289,7 +289,6 @@ main (int argc, char **argv)
                 * According to rfc821 you can include a null reversepath in the from command
                 * - but a log message is generated on the smtp server.
                 *
-                * You can disable sending mail_command with '--nocommand'
                 * Use the -f option to provide a FROM address
                 */
                if (smtp_use_dummycmd) {
@@ -470,7 +469,6 @@ process_arguments (int argc, char **argv)
                {"authpass", required_argument, 0, 'P'},
                {"command", required_argument, 0, 'C'},
                {"response", required_argument, 0, 'R'},
-               {"nocommand", required_argument, 0, 'n'},
                {"verbose", no_argument, 0, 'v'},
                {"version", no_argument, 0, 'V'},
                {"use-ipv4", no_argument, 0, '4'},
@@ -769,23 +767,23 @@ print_help (void)
 
        print_usage ();
 
-       printf (_(UT_HELP_VRSN));
-       printf (_(UT_EXTRA_OPTS));
+       printf (UT_HELP_VRSN);
+       printf (UT_EXTRA_OPTS);
 
-       printf (_(UT_HOST_PORT), 'p', myport);
+       printf (UT_HOST_PORT, 'p', myport);
 
-       printf (_(UT_IPv46));
+       printf (UT_IPv46);
 
        printf (" %s\n", "-e, --expect=STRING");
   printf (_("    String to expect in first line of server response (default: '%s')\n"), SMTP_EXPECT);
-  printf (" %s\n", "-n, nocommand");
-  printf ("    %s\n", _("Suppress SMTP command"));
   printf (" %s\n", "-C, --command=STRING");
   printf ("    %s\n", _("SMTP command (may be used repeatedly)"));
   printf (" %s\n", "-R, --command=STRING");
   printf ("    %s\n", _("Expected response to command (may be used repeatedly)"));
   printf (" %s\n", "-f, --from=STRING");
   printf ("    %s\n", _("FROM-address to include in MAIL command, required by Exchange 2000")),
+  printf (" %s\n", "-F, --fqdn=STRING");
+  printf ("    %s\n", _("FQDN used for HELO"));
 #ifdef HAVE_SSL
   printf (" %s\n", "-D, --certificate=INTEGER");
   printf ("    %s\n", _("Minimum number of days a certificate has to be valid."));
@@ -800,11 +798,11 @@ print_help (void)
   printf (" %s\n", "-P, --authpass=STRING");
   printf ("    %s\n", _("SMTP AUTH password"));
 
-       printf (_(UT_WARN_CRIT));
+       printf (UT_WARN_CRIT);
 
-       printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+       printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-       printf (_(UT_VERBOSE));
+       printf (UT_VERBOSE);
 
        printf("\n");
        printf ("%s\n", _("Successul connects return STATE_OK, refusals and timeouts return"));
@@ -812,13 +810,7 @@ print_help (void)
   printf ("%s\n", _("connects, but incorrect reponse messages from the host result in"));
   printf ("%s\n", _("STATE_WARNING return values."));
 
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
-#endif
-
-       printf (_(UT_SUPPORT));
+       printf (UT_SUPPORT);
 }
 
 
@@ -826,9 +818,9 @@ print_help (void)
 void
 print_usage (void)
 {
-  printf (_("Usage:"));
-       printf ("%s -H host [-p port] [-e expect] [-C command] [-f from addr]", progname);
+  printf ("%s\n", _("Usage:"));
+  printf ("%s -H host [-p port] [-e expect] [-C command] [-f from addr]", progname);
   printf ("[-A authtype -U authuser -P authpass] [-w warn] [-c crit] [-t timeout]\n");
-  printf ("[-S] [-D days] [-n] [-v] [-4|-6]\n");
+  printf ("[-F fqdn] [-S] [-D days] [-v] [-4|-6]\n");
 }