diff options
author | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-05-07 10:02:42 +0000 |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-05-07 10:02:42 +0000 |
commit | 44f8455b2cf248c6f50c35bfc3510d2946084c5b (patch) | |
tree | 26b696c5d61872f1d41466be9fcc650c22d75aeb /plugins/check_ldap.c | |
parent | 4d157889e3018119e07bdcc7f48afde1422f7396 (diff) | |
download | monitoring-plugins-44f8455b2cf248c6f50c35bfc3510d2946084c5b.tar.gz |
Added support for --extra-opts in all C plugins (disabled by default, see configure --help)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1991 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'plugins/check_ldap.c')
-rw-r--r-- | plugins/check_ldap.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index 74ca3b0c..3d6f05c4 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c | |||
@@ -104,7 +104,10 @@ main (int argc, char *argv[]) | |||
104 | if (strstr(argv[0],"check_ldaps")) { | 104 | if (strstr(argv[0],"check_ldaps")) { |
105 | asprintf (&progname, "check_ldaps"); | 105 | asprintf (&progname, "check_ldaps"); |
106 | } | 106 | } |
107 | 107 | ||
108 | /* Parse extra opts if any */ | ||
109 | argv=np_extra_opts (&argc, argv, progname); | ||
110 | |||
108 | if (process_arguments (argc, argv) == ERROR) | 111 | if (process_arguments (argc, argv) == ERROR) |
109 | usage4 (_("Could not parse arguments")); | 112 | usage4 (_("Could not parse arguments")); |
110 | 113 | ||
@@ -392,11 +395,12 @@ print_help (void) | |||
392 | printf ("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n"); | 395 | printf ("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n"); |
393 | printf (COPYRIGHT, copyright, email); | 396 | printf (COPYRIGHT, copyright, email); |
394 | 397 | ||
395 | printf ("\n\n"); | 398 | printf ("\n\n"); |
396 | 399 | ||
397 | print_usage (); | 400 | print_usage (); |
398 | 401 | ||
399 | printf (_(UT_HELP_VRSN)); | 402 | printf (_(UT_HELP_VRSN)); |
403 | printf (_(UT_EXTRA_OPTS)); | ||
400 | 404 | ||
401 | printf (_(UT_HOST_PORT), 'p', myport); | 405 | printf (_(UT_HOST_PORT), 'p', myport); |
402 | 406 | ||
@@ -429,12 +433,17 @@ print_help (void) | |||
429 | 433 | ||
430 | printf (_(UT_VERBOSE)); | 434 | printf (_(UT_VERBOSE)); |
431 | 435 | ||
432 | printf ("\n%s\n", _("Notes:")); | 436 | printf ("\n"); |
437 | printf ("%s\n", _("Notes:")); | ||
433 | printf (" %s\n", _("If this plugin is called via 'check_ldaps', method 'STARTTLS' will be")); | 438 | printf (" %s\n", _("If this plugin is called via 'check_ldaps', method 'STARTTLS' will be")); |
434 | printf (_(" implied (using default port %i) unless --port=636 is specified. In that case %s"), DEFAULT_PORT, "\n"); | 439 | printf (_(" implied (using default port %i) unless --port=636 is specified. In that case\n"), DEFAULT_PORT); |
435 | printf (" %s\n", _("'SSL on connect' will be used no matter how the plugin was called.")); | 440 | printf (" %s\n", _("'SSL on connect' will be used no matter how the plugin was called.")); |
436 | printf (" %s\n", _("This detection is deprecated, please use 'check_ldap' with the '--starttls' or '--ssl' flags")); | 441 | printf (" %s\n", _("This detection is deprecated, please use 'check_ldap' with the '--starttls' or '--ssl' flags")); |
437 | printf (" %s\n", _("to define the behaviour explicitly instead.")); | 442 | printf (" %s\n", _("to define the behaviour explicitly instead.")); |
443 | #ifdef NP_EXTRA_OPTS | ||
444 | printf ("\n"); | ||
445 | printf (_(UT_EXTRA_OPTS_NOTES)); | ||
446 | #endif | ||
438 | 447 | ||
439 | printf (_(UT_SUPPORT)); | 448 | printf (_(UT_SUPPORT)); |
440 | } | 449 | } |