check-users thresholds was >= rather than > as documented.

[nagiosplug.git] / plugins / check_ldap.c

diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 5541e5c868890ef9a1f36ffcaf6f0fe47ebbfebd..3d6f05c4352f566cb98f8057392b91c7dbae1c16 100644 (file)
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -1,40 +1,38 @@
-/******************************************************************************
-*
+/*****************************************************************************
+* 
 * Nagios check_ldap plugin
-*
+* 
 * License: GPL
-* Copyright (c) 2000-2006 nagios-plugins team
-*
+* Copyright (c) 2000-2008 Nagios Plugins Development Team
+* 
 * Last Modified: $Date$
-*
+* 
 * Description:
-*
+* 
 * This file contains the check_ldap plugin
-*
-* License Information:
-*
-* This program is free software; you can redistribute it and/or modify
+* 
+* 
+* This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
+* the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-*
+* 
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-*
+* 
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id$
- 
-******************************************************************************/
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* 
+* $Id$
+* 
+*****************************************************************************/
 
 /* progname may be check_ldaps */
 char *progname = "check_ldap";
 const char *revision = "$Revision$";
-const char *copyright = "2000-2006";
+const char *copyright = "2000-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -106,7 +104,10 @@ main (int argc, char *argv[])
        if (strstr(argv[0],"check_ldaps")) {
                asprintf (&progname, "check_ldaps");
        }
-       
+
+       /* Parse extra opts if any */
+       argv=np_extra_opts (&argc, argv, progname);
+
        if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
@@ -394,11 +395,12 @@ print_help (void)
        printf ("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n");
        printf (COPYRIGHT, copyright, email);
 
-  printf ("\n\n");
-  
+       printf ("\n\n");
+
        print_usage ();
 
        printf (_(UT_HELP_VRSN));
+       printf (_(UT_EXTRA_OPTS));
 
        printf (_(UT_HOST_PORT), 'p', myport);
 
@@ -431,12 +433,17 @@ print_help (void)
 
        printf (_(UT_VERBOSE));
 
-       printf ("\n%s\n", _("Note:"));
-       printf ("%s\n", _("If this plugin is called via 'check_ldaps', method 'STARTTLS' will be"));
-       printf (_("implied (using default port %i) unless --port=636 is specified. In that case %s"), DEFAULT_PORT, "\n");
-       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."));
+       printf ("\n");
+       printf ("%s\n", _("Notes:"));
+       printf (" %s\n", _("If this plugin is called via 'check_ldaps', method 'STARTTLS' will be"));
+       printf (_(" implied (using default port %i) unless --port=636 is specified. In that case\n"), DEFAULT_PORT);
+       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));
 }