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 6707ec5304b601d822110c7155a15019857b1eb8..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;
                        }
                }
 
@@ -782,6 +782,8 @@ print_help (void)
   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."));
@@ -816,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] [-v] [-4|-6]\n");
+  printf ("[-F fqdn] [-S] [-D days] [-v] [-4|-6]\n");
 }