From: Matthias Eble <psychotrahe@gmx.de>
Date: Fri, 22 May 2009 18:17:50 +0000 (+0200)
Subject: Removed -n option in check_smtp's help and usage output (#2782784)
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6f0665719c3510b11d42cdd2cad656b63a408ef8;p=nagiosplug.git

Removed -n option in check_smtp's help and usage output (#2782784)

Check_smtp's help showed the -n/--nocommand options to not send an
SMTP command. This usage is covered by check_tcp and is thus not needed
in check_smtp.
---

diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 6040aa1..62f1025 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -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'},
@@ -778,8 +776,6 @@ print_help (void)
 
 	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");
@@ -829,6 +825,6 @@ print_usage (void)
   printf (_("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 ("[-S] [-D days] [-v] [-4|-6]\n");
 }