Standardize the extra-opts notes

plugins-root/check_dhcp.c

@@ -1410,12 +1410,6 @@ void print_help(void){
   printf (" %s\n", "-u, --unicast");
   printf ("    %s\n", _("Unicast testing: mimic a DHCP relay, requires -s"));
 
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
   printf (UT_SUPPORT);
 	return;
 	}

plugins-root/check_icmp.c

@@ -1335,10 +1335,6 @@ print_help(void)
 /*  printf ("%s\n", _("Long options are currently unsupported."));
   printf ("%s\n", _("Options marked with * require an argument"));
 */
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
 
   printf (UT_SUPPORT);
 }

plugins/check_apt.c

@@ -453,12 +453,6 @@ print_help (void)
   printf ("    %s\n", _("timeout (with -t) to prevent the plugin from timing out if apt-get"));
   printf ("    %s\n", _("upgrade is expected to take longer than the default timeout."));
 
-#ifdef NP_EXTRA_OPTS
-  printf("\n");
-  printf("%s\n", _("Notes:"));
-  printf(UT_EXTRA_OPTS_NOTES);
-#endif
-
   printf(UT_SUPPORT);
 }
 

plugins/check_by_ssh.c

@@ -442,12 +442,6 @@ print_help (void)
   printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c2;0; up 2 days");
   printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days");
 
-#ifdef NP_EXTRA_OPTS
-	printf("\n");
-	printf("%s\n", _("Notes:"));
-	printf(UT_EXTRA_OPTS_NOTES);
-#endif
-
 	printf(UT_SUPPORT);
 }
 

plugins/check_cluster.c

@@ -256,10 +256,6 @@ print_help(void)
 	printf("\n");
 	printf("%s\n", _("Notes:"));
 	printf(UT_THRESHOLDS_NOTES);
-#ifdef NP_EXTRA_OPTS
-	printf ("\n");
-	printf (UT_EXTRA_OPTS_NOTES);
-#endif
 
 	printf ("\n");
 	printf ("%s\n", _("Examples:"));

plugins/check_dig.c

@@ -343,12 +343,6 @@ print_help (void)
   printf (" %s\n", "check_dig -H DNSSERVER -l www.example.com -A \"+tcp\"");
   printf (" %s\n", "This will send a tcp query to DNSSERVER for www.example.com");
 
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
   printf (UT_SUPPORT);
 }
 

plugins/check_disk.c

@@ -959,12 +959,6 @@ print_help (void)
   printf (" %s\n", "-X, --exclude-type=TYPE");
   printf ("    %s\n", _("Ignore all filesystems of indicated type (may be repeated)"));
 
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
   printf ("\n");
   printf ("%s\n", _("Examples:"));
   printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /");

plugins/check_dns.c

@@ -476,12 +476,6 @@ print_help (void)
 
   printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
   printf (UT_SUPPORT);
 }
 

plugins/check_fping.c

@@ -422,12 +422,6 @@ print_help (void)
   printf (" %s\n", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"));
   printf (" %s\n", _("packet loss to trigger an alarm state."));
 
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
   printf (UT_SUPPORT);
 }
 

plugins/check_game.c

@@ -319,10 +319,6 @@ print_help (void)
   printf (" %s\n", _("This plugin uses the 'qstat' command, the popular game server status query tool."));
   printf (" %s\n", _("If you don't have the package installed, you will need to download it from"));
   printf (" %s\n", _("http://www.activesw.com/people/steve/qstat.html before you can use this plugin."));
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
 
   printf (UT_SUPPORT);
 }

plugins/check_hpjd.c

@@ -403,12 +403,6 @@ print_help (void)
 	printf (_("(default=%s)"), DEFAULT_COMMUNITY);
 	printf ("\n");
 
-#ifdef NP_EXTRA_OPTS
-	printf ("\n");
-	printf ("%s\n", _("Notes:"));
-	printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
 	printf (UT_SUPPORT);
 }
 

plugins/check_http.c

@@ -1400,8 +1400,6 @@ print_help (void)
   printf (" %s\n", _("messages from the host result in STATE_WARNING return values.  If you are"));
   printf (" %s\n", _("checking a virtual server that uses 'host headers' you must supply the FQDN"));
   printf (" %s\n", _("(fully qualified domain name) as the [host_name] argument."));
-  printf ("\n");
-  printf (UT_EXTRA_OPTS_NOTES);
 
 #ifdef HAVE_SSL
   printf ("\n");

plugins/check_ide_smart.c

@@ -506,12 +506,6 @@ print_help (void)
   printf (" %s\n", "-n, --nagios");
   printf ("    %s\n", _("Output suitable for Nagios"));
 
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
   printf (UT_SUPPORT);
 }
 

plugins/check_ldap.c

@@ -437,10 +437,6 @@ print_help (void)
 	printf (" %s\n", _("'SSL on connect' will be used no matter how the plugin was called."));
 	printf (" %s\n", _("This detection is deprecated, please use 'check_ldap' with the '--starttls' or '--ssl' flags"));
 	printf (" %s\n", _("to define the behaviour explicitly instead."));
-#ifdef NP_EXTRA_OPTS
-	printf ("\n");
-	printf (UT_EXTRA_OPTS_NOTES);
-#endif
 
 	printf (UT_SUPPORT);
 }

plugins/check_load.c

@@ -316,12 +316,6 @@ print_help (void)
   printf (" %s\n", "-r, --percpu");
   printf ("    %s\n", _("Divide the load averages by the number of CPUs (when possible)"));
 
-#ifdef NP_EXTRA_OPTS
-	printf ("\n");
-	printf ("%s\n", _("Notes:"));
-	printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
 	printf (UT_SUPPORT);
 }
 

plugins/check_mrtg.c

@@ -367,9 +367,6 @@ print_help (void)
   printf ("   %s\n", _("you can always hack the code to make this plugin work for you..."));
   printf (" %s\n", _("- MRTG stands for the Multi Router Traffic Grapher.  It can be downloaded from"));
   printf ("   %s\n", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
-#ifdef NP_EXTRA_OPTS
-	printf (" -%s", UT_EXTRA_OPTS_NOTES);
-#endif
 
 	printf (UT_SUPPORT);
 }

plugins/check_mrtgtraf.c

@@ -366,9 +366,6 @@ print_help (void)
   printf (" %s\n", _("- The calculated i/o rates are a little off from what MRTG actually"));
   printf (" %s\n", _("  reports.  I'm not sure why this is right now, but will look into it"));
   printf (" %s\n", _("  for future enhancements of this plugin."));
-#ifdef NP_EXTRA_OPTS
-	printf (" -%s", UT_EXTRA_OPTS_NOTES);
-#endif
 
 	printf (UT_SUPPORT);
 }

plugins/check_mysql.c

@@ -410,14 +410,10 @@ print_help (void)
   printf (" %s\n", _("using the default unix socket. You can force TCP on localhost by using an"));
   printf (" %s\n", _("IP address or FQDN ('localhost' will use the socket as well)."));
 
-#ifdef NP_EXTRA_OPTS
 	printf ("\n");
 	printf ("%s\n", _("Notes:"));
-	printf (UT_EXTRA_OPTS_NOTES);
-	printf ("\n");
 	printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
 	printf (" %s\n", _("overriding any my.cnf settings."));
-#endif
 
 	printf (UT_SUPPORT);
 }

plugins/check_mysql_query.c

@@ -310,14 +310,10 @@ print_help (void)
 	printf (" %s\n", _("A query is required. The result from the query should be numeric."));
 	printf (" %s\n", _("For extra security, create a user with minimal access."));
 
-#ifdef NP_EXTRA_OPTS
 	printf ("\n");
 	printf ("%s\n", _("Notes:"));
-	printf (UT_EXTRA_OPTS_NOTES);
-	printf ("\n");
 	printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
 	printf (" %s\n", _("overriding any my.cnf settings."));
-#endif
 
 	printf (UT_SUPPORT);
 }

plugins/check_nagios.c

@@ -298,12 +298,6 @@ print_help (void)
   printf ("    %s\n", _("Substring to search for in process arguments"));
   printf (UT_VERBOSE);
 
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
   printf ("\n");
   printf ("%s\n", _("Examples:"));
   printf (" %s\n", "check_nagios -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios");

plugins/check_nt.c

@@ -748,9 +748,6 @@ void print_help(void)
 	printf ("   %s\n", _("output when this happens contains \"Cannot map xxxxx to protocol number\"."));
 	printf ("   %s\n", _("One fix for this is to change the port to something else on check_nt "));
 	printf ("   %s\n", _("and on the client service it\'s connecting to."));
-#ifdef NP_EXTRA_OPTS
-	printf (" -%s", UT_EXTRA_OPTS_NOTES);
-#endif
 
 	printf (UT_SUPPORT);
 }

plugins/check_ntp.c

@@ -859,10 +859,6 @@ void print_help(void){
 	printf("\n");
 	printf("%s\n", _("Notes:"));
 	printf(UT_THRESHOLDS_NOTES);
-#ifdef NP_EXTRA_OPTS
-	printf("\n");
-	printf(UT_EXTRA_OPTS_NOTES);
-#endif
 
 	printf("\n");
 	printf("%s\n", _("Examples:"));

plugins/check_ntp_peer.c

@@ -693,10 +693,6 @@ void print_help(void){
 	printf(" %s\n", _("server; please use check_ntp_time for that purpose."));
 	printf("\n");
 	printf(UT_THRESHOLDS_NOTES);
-#ifdef NP_EXTRA_OPTS
-	printf("\n");
-	printf(UT_EXTRA_OPTS_NOTES);
-#endif
 
 	printf("\n");
 	printf("%s\n", _("Examples:"));

plugins/check_ntp_time.c

@@ -623,10 +623,6 @@ void print_help(void){
 	printf(" %s\n", _("check_ntp_peer."));
 	printf("\n");
 	printf(UT_THRESHOLDS_NOTES);
-#ifdef NP_EXTRA_OPTS
-	printf("\n");
-	printf(UT_EXTRA_OPTS_NOTES);
-#endif
 
 	printf("\n");
 	printf("%s\n", _("Examples:"));

plugins/check_nwstat.c

@@ -1674,9 +1674,6 @@ void print_help(void)
   printf (" %s\n", _("- Values for critical thresholds should be lower than warning thresholds"));
   printf (" %s\n", _("  when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "));
   printf (" %s\n", _("  TCB, LRUS and LRUM."));
-#ifdef NP_EXTRA_OPTS
-  printf (" -%s", UT_EXTRA_OPTS_NOTES);
-#endif
 
 	printf (UT_SUPPORT);
 }

plugins/check_overcr.c

@@ -456,10 +456,6 @@ print_help (void)
   printf ("%s\n", _("Notes:"));
   printf (" %s\n", _("For the available options, the critical threshold value should always be"));
   printf (" %s\n", _("higher than the warning threshold value, EXCEPT with the uptime variable"));
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
 
   printf (UT_SUPPORT);
 }

plugins/check_pgsql.c

@@ -466,12 +466,6 @@ print_help (void)
 	printf (" %s\n", _("able to connect to the database without a password. The plugin can also send"));
 	printf (" %s\n", _("a password, but no effort is made to obsure or encrypt the password."));
 
-#ifdef NP_EXTRA_OPTS
-	printf ("\n");
-	printf ("%s\n", _("Notes:"));
-	printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
 	printf (UT_SUPPORT);
 }
 

plugins/check_ping.c

@@ -592,12 +592,6 @@ print_help (void)
   printf ("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"));
   printf ("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/"));
 
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
 	printf (UT_SUPPORT);
 }
 

plugins/check_procs.c

@@ -739,12 +739,6 @@ the specified threshold ranges. The process count can be filtered by\n\
 process owner, parent process PID, current state (e.g., 'Z'), or may\n\
 be the total number of running processes\n\n"));
 
-#ifdef NP_EXTRA_OPTS
-  printf ("%s\n", _("Notes:"));
-  printf (UT_EXTRA_OPTS_NOTES);
-  printf ("\n");
-#endif
-
 	printf ("%s\n", _("Examples:"));
   printf (" %s\n", "check_procs -w 2:2 -c 2:1024 -C portsentry");
   printf ("  %s\n", _("Warning if not two processes with command name portsentry."));

plugins/check_radius.c

@@ -374,12 +374,6 @@ print_help (void)
   printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that"));
   printf ("%s\n", _("the password used does not allow access to sensitive system resources."));
 
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
 	printf (UT_SUPPORT);
 }
 

plugins/check_real.c

@@ -440,12 +440,6 @@ print_help (void)
   printf ("%s\n", _("but incorrect reponse messages from the host result in STATE_WARNING return"));
   printf ("%s\n", _("values."));
 
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
 	printf (UT_SUPPORT);
 }
 

plugins/check_smtp.c

@@ -808,12 +808,6 @@ 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);
 }
 

plugins/check_snmp.c

@@ -944,9 +944,6 @@ print_help (void)
 	printf (" %s\n", _("- Note that only one string and one regex may be checked at present"));
 	printf (" %s\n", _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value"));
 	printf ("   %s\n", _("returned from the SNMP query is an unsigned integer."));
-#ifdef NP_EXTRA_OPTS
-	printf (" -%s", UT_EXTRA_OPTS_NOTES);
-#endif
 
 	printf (UT_SUPPORT);
 }

plugins/check_ssh.c

@@ -291,12 +291,6 @@ print_help (void)
 
 	printf (UT_VERBOSE);
 
-#ifdef NP_EXTRA_OPTS
-	printf ("\n");
-	printf ("%s\n", _("Notes:"));
-	printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
 	printf (UT_SUPPORT);
 }
 

plugins/check_swap.c

@@ -546,11 +546,6 @@ print_help (void)
 	printf ("\n");
   printf ("%s\n", _("Notes:"));
   printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."));
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
 
 	printf (UT_SUPPORT);
 }

plugins/check_tcp.c

@@ -641,12 +641,6 @@ print_help (void)
 
 	printf (UT_VERBOSE);
 
-#ifdef NP_EXTRA_OPTS
-	printf ("\n");
-	printf ("%s\n", _("Notes:"));
-	printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
 	printf (UT_SUPPORT);
 }
 

plugins/check_time.c

@@ -360,12 +360,6 @@ print_help (void)
 
 	printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-#ifdef NP_EXTRA_OPTS
-	printf ("\n");
-	printf ("%s\n", _("Notes:"));
-	printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
 	printf (UT_SUPPORT);
 }
 

plugins/check_ups.c

@@ -649,10 +649,6 @@ print_help (void)
   printf (" %s\n", _("Network UPS Tools be installed on the remote host. If you do not have the"));
   printf (" %s\n", _("package installed on your system, you can download it from"));
   printf (" %s\n", _("http://www.networkupstools.org"));
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
 
 	printf (UT_SUPPORT);
 }

plugins/check_users.c

@@ -219,12 +219,6 @@ print_help (void)
   printf (" %s\n", "-c, --critical=INTEGER");
   printf ("    %s\n", _("Set CRITICAL status if more than INTEGER users are logged in"));
 
-#ifdef NP_EXTRA_OPTS
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (UT_EXTRA_OPTS_NOTES);
-#endif
-
 	printf (UT_SUPPORT);
 }
 

plugins/utils.h

@@ -183,12 +183,9 @@ char *fperfdata (const char *,
 #ifdef NP_EXTRA_OPTS
 #define UT_EXTRA_OPTS _("\
  --extra-opts=[section][@file]\n\
-    Read additionnal options from ini file\n")
-#define UT_EXTRA_OPTS_NOTES _("\
- See: http://nagiosplugins.org/extra-opts for --extra-opts usage and examples.\n")
+    Read options from an ini file. See http://nagiosplugins.org/extra-opts for usage\n")
 #else
 #define UT_EXTRA_OPTS ""
-#define UT_EXTRA_OPTS_NOTES ""
 #endif
 
 #define UT_THRESHOLDS_NOTES _("\