Standardize the extra-opts notes

diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 51ac96eab7246b75926ede2e73eff82edf65eecc..ba35197ef96bf9b1d9557ea46b9e13a26839211c 100644 (file)
--- a/plugins-root/check_dhcp.c
+++ b/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;
        }

diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 590bb1a65d5e0a5c915fe1284c7ff5b2fe089bba..5f0224d54ec863317aa113bd9f1d3fed8a7076a3 100644 (file)
--- a/plugins-root/check_icmp.c
+++ b/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);
 }

diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index 7276f0310871000157fa1f62754f50cdafaeb28f..148049434133af5fc8603c18c3a2d8de63f2e9e9 100644 (file)
--- a/plugins/check_apt.c
+++ b/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);
 }
 

diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index b688d4350ca3ae040e79d47c5645f270363f23c7..a569c195ccf1a679dc2a2293091d4d2420e759b0 100644 (file)
--- a/plugins/check_by_ssh.c
+++ b/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);
 }
 

diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index f2322271e4b00ec4b888cfdc1c4c6f186d148ea9..8c209f9c72cfc6770c4638649aac8f67d2f786c0 100644 (file)
--- a/plugins/check_cluster.c
+++ b/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:"));

diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 45189b000d222ce7c4ca0a7186103bafaabaddfa..6f4d8e77f52734b986c7d14dba4fa70918bfdf7f 100644 (file)
--- a/plugins/check_dig.c
+++ b/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);
 }
 

diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 633aa5fce071160bef77930e557cc9661579475e..f2ed983bfb97320f3666b3f011a60eef58b8a3e9 100644 (file)
--- a/plugins/check_disk.c
+++ b/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 /");

diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index a921429859dd8320d9d292575a01e0a8f299a12e..43167122e11430b24cc07c4d5fdfd4827e921d2a 100644 (file)
--- a/plugins/check_dns.c
+++ b/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);
 }
 

diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 4e6533fa359e537f6be0076b7ba6b4bef69d609c..d2c945dd3138008e12f3c7f4d235a2eb9fb3077c 100644 (file)
--- a/plugins/check_fping.c
+++ b/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);
 }
 

diff --git a/plugins/check_game.c b/plugins/check_game.c
index bcde103888fcaa9b468a665d78ae461b52e3ce4c..815c72d610c33e2bfe29b731af218378ad67ffc0 100644 (file)
--- a/plugins/check_game.c
+++ b/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);
 }

diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index e4e8e6e514c071ddc65c6974e9115de52f0d2e33..97411d184c96c179406daac9a6758dfbb6fdf2ad 100644 (file)
--- a/plugins/check_hpjd.c
+++ b/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);
 }
 

diff --git a/plugins/check_http.c b/plugins/check_http.c
index 6c53f7ad495e0bb2d264de080b1e5ffc202babff..a21669c05c747798f3deecd67d027ead572bd17b 100644 (file)
--- a/plugins/check_http.c
+++ b/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");

diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index 3811dc12059739c7b3b8516c2e24ac6b29de2bb8..b0517395bd7575c21982f1bc38433eec112bfcce 100644 (file)
--- a/plugins/check_ide_smart.c
+++ b/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);
 }
 

diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 66834e88c6fc55b588a98219a6ef75f3589bbbbc..11644a1fb96d68e4c192461f5b30bcef7b27fde2 100644 (file)
--- a/plugins/check_ldap.c
+++ b/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);
 }

diff --git a/plugins/check_load.c b/plugins/check_load.c
index 450a4fc3bc3afa99c9017b12bb447629c0c6e2e5..99e2a15fb70f1f617dc030b82fcf514ec27d2c5b 100644 (file)
--- a/plugins/check_load.c
+++ b/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);
 }
 

diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index 6736c117f8bf2305a2875733993fefe7e0234c9c..07013ee6ce92caafc26f796a7ec0d66d540773d5 100644 (file)
--- a/plugins/check_mrtg.c
+++ b/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);
 }

diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 1234bff498afd042066b2cf066ab0e16b1a2c6e6..4fd9bc0a72e2dea17ae62737e10e2783a60cd762 100644 (file)
--- a/plugins/check_mrtgtraf.c
+++ b/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);
 }

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index ce190621d60f507cbcccf59eb39490ba6b721639..b3caf4b53da45345dff00d891ddcd6fce7e71e25 100644 (file)
--- a/plugins/check_mysql.c
+++ b/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);
 }

diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 40adf09279fca709006a1ddd9da9548e27a01df8..cae4718730780ff10e9292765f1b030b2ae1ed7d 100644 (file)
--- a/plugins/check_mysql_query.c
+++ b/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);
 }

diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 24ddadd71ef87c3d25ea47c9435bfd558e814c80..1a809164b84b07fe7e6345fd05d39e8a5adb6d51 100644 (file)
--- a/plugins/check_nagios.c
+++ b/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");

diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index c877f9cc6d4857b019c8b2590677aa7205524163..e4d64e8f8acc82a6f936cb7aa7aa6f17a987feab 100644 (file)
--- a/plugins/check_nt.c
+++ b/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);
 }

diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 35fddec9038f00888805b78970ddea99c0190b54..e752bd9ff8852dbdff12b09b3a3077e988c3e8ba 100644 (file)
--- a/plugins/check_ntp.c
+++ b/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:"));

diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index fa18cfb920eb72f8e11dd124c362647769dc5b0a..abe91a52471c899cd5d8ccfe39d2fd41a89f3116 100644 (file)
--- a/plugins/check_ntp_peer.c
+++ b/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:"));

diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index cd412fe5f7d262e9ce6b471520e79164d4a820a8..1ea3e893aad5e21e2b637a4b59b53aa21c5d2e13 100644 (file)
--- a/plugins/check_ntp_time.c
+++ b/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:"));

diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 2c3369a5fe941606790086466bba794edf70c40a..6e09286773a503c8837ce07a513d9c0120d6c635 100644 (file)
--- a/plugins/check_nwstat.c
+++ b/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);
 }

diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 5751dc053a0a305f2e0ebf5363166537468f5b15..606799f1817eb3cd56d04c54eb027f66d0d5211e 100644 (file)
--- a/plugins/check_overcr.c
+++ b/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);
 }

diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index a3652149d7fa81202ce9e132fd63a5d994db19c7..06e1127bf225052ea19d1d91fdd88522709d6dc7 100644 (file)
--- a/plugins/check_pgsql.c
+++ b/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);
 }
 

diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 45108afb8cbe7b446ff602bd450895591d66c6ab..db8e623fc406fadf8ad1233035b26d252bc381ce 100644 (file)
--- a/plugins/check_ping.c
+++ b/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);
 }
 

diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index e9372ff610b04b0abf697cb0b68388d177ea828e..8655f6a31fab244a632f8a2d216cc9ecfda256e2 100644 (file)
--- a/plugins/check_procs.c
+++ b/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."));

diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index c95fbe1ff2ec2ad20fec96da721d9a7f5087461c..d5907ddebd3e058b2f67ef2368553ee532a49869 100644 (file)
--- a/plugins/check_radius.c
+++ b/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);
 }
 

diff --git a/plugins/check_real.c b/plugins/check_real.c
index 1643347026fad971f8eef23424b6eb1890881fe7..1f8ae4298ebe186a7ff32e5dacc757325ff9a622 100644 (file)
--- a/plugins/check_real.c
+++ b/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);
 }
 

diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index c78b709ce5a71462b803b1a3ca162bd949f2861f..6707ec5304b601d822110c7155a15019857b1eb8 100644 (file)
--- a/plugins/check_smtp.c
+++ b/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);
 }
 

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 6a44bc8c3eedd6ac0e664fd2d50073a6b7b6610c..3f0deb70ccc6a1cafc37d586cc7922236a0dc75f 100644 (file)
--- a/plugins/check_snmp.c
+++ b/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);
 }

diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 9a1934383111ff5b5b738d82bb7731b8af546dc6..b9b8a2d3eeb4898be031fc41f57d0c9f70d814b2 100644 (file)
--- a/plugins/check_ssh.c
+++ b/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);
 }
 

diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index a1356cfac3e5030971cc54b63af43ffadb6aeca5..c5682d78e9c3d38223ec4f0d0244561ea867dd30 100644 (file)
--- a/plugins/check_swap.c
+++ b/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);
 }

diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 156765edac0d2234447a88235b7f3fd4c9cb7ad9..555b8b9a2b69d7528604bf7311ea587056061de0 100644 (file)
--- a/plugins/check_tcp.c
+++ b/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);
 }
 

diff --git a/plugins/check_time.c b/plugins/check_time.c
index 7816b238c72427abf9924af895e2eb32d92dd33a..9e81d9eedc1ef52098e6a123062a29afa21c9ae5 100644 (file)
--- a/plugins/check_time.c
+++ b/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);
 }
 

diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index ce57ef3d00f8aafc415397c21183b12a1f7c8c04..aef8e116976adc1b115575ab1726c4e2f67a5de9 100644 (file)
--- a/plugins/check_ups.c
+++ b/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);
 }

diff --git a/plugins/check_users.c b/plugins/check_users.c
index dc661d89f69ba4a393b101e91337d3c21503caff..061c2fe9e0c4015f5310437f4974d347fa688873 100644 (file)
--- a/plugins/check_users.c
+++ b/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);
 }
 

diff --git a/plugins/utils.h b/plugins/utils.h
index 8da2160e86eebb1c6126b4826212fb4fb2ff7b30..812f588b76339817da4b5c80aa22cecd600e84e9 100644 (file)
--- a/plugins/utils.h
+++ b/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 _("\