X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_ldap.c;h=25432de12f9e35b6b8379e97f8150d3b74075eda;hb=7cb3ae09334796f3b54e4e6438e38c2cc679b360;hp=d731cbca63aeffbe3da71ca8a130a414640ef30f;hpb=fb6f6237818372ccf4fde37e57e999e22b38e226;p=nagiosplug.git diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index d731cbc..25432de 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c @@ -1,40 +1,34 @@ -/****************************************************************************** -* +/***************************************************************************** +* * Nagios check_ldap plugin -* +* * License: GPL -* Copyright (c) 2000-2006 nagios-plugins team -* -* Last Modified: $Date$ -* +* Copyright (c) 2000-2008 Nagios Plugins Development Team +* * 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 . +* +* +*****************************************************************************/ /* 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" @@ -67,6 +61,9 @@ int ld_port = DEFAULT_PORT; #ifdef HAVE_LDAP_SET_OPTION int ld_protocol = DEFAULT_PROTOCOL; #endif +#ifndef LDAP_OPT_SUCCESS +# define LDAP_OPT_SUCCESS LDAP_SUCCESS +#endif double warn_time = UNDEFINED; double crit_time = UNDEFINED; struct timeval tv; @@ -86,15 +83,15 @@ main (int argc, char *argv[]) LDAPMessage *result; /* should be int result = STATE_UNKNOWN; */ - + int status = STATE_UNKNOWN; long microsec; double elapsed_time; - + /* for ldap tls */ - - int tls; - int version=3; + + int tls; + int version=3; setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -103,7 +100,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")); @@ -125,7 +125,7 @@ main (int argc, char *argv[]) printf ("Could not connect to the server at port %i\n", ld_port); return STATE_CRITICAL; } -#else +#else if (!(ld = ldap_open (ld_host, ld_port))) { if (verbose) ldap_perror(ld, "ldap_open"); @@ -133,7 +133,7 @@ main (int argc, char *argv[]) return STATE_CRITICAL; } #endif /* HAVE_LDAP_INIT */ - + #ifdef HAVE_LDAP_SET_OPTION /* set ldap options */ if (ldap_set_option (ld, LDAP_OPT_PROTOCOL_VERSION, &ld_protocol) != @@ -148,7 +148,7 @@ main (int argc, char *argv[]) #if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_X_TLS) /* ldaps: set option tls */ tls = LDAP_OPT_X_TLS_HARD; - + if (ldap_set_option (ld, LDAP_OPT_X_TLS, &tls) != LDAP_SUCCESS) { if (verbose) @@ -175,7 +175,7 @@ main (int argc, char *argv[]) /* call start_tls */ if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS) { - if (verbose) + if (verbose) ldap_perror(ld, "ldap_start_tls"); printf (_("Could not init startTLS at port %i!\n"), ld_port); return STATE_CRITICAL; @@ -185,13 +185,13 @@ main (int argc, char *argv[]) return STATE_CRITICAL; #endif /* HAVE_LDAP_START_TLS_S */ } - + /* bind to the ldap server */ if (ldap_bind_s (ld, ld_binddn, ld_passwd, LDAP_AUTH_SIMPLE) != LDAP_SUCCESS) { if (verbose) ldap_perror(ld, "ldap_bind"); - printf (_("Could not bind to the ldap-server\n")); + printf (_("Could not bind to the LDAP server\n")); return STATE_CRITICAL; } @@ -285,7 +285,7 @@ process_arguments (int argc, char **argv) print_help (); exit (STATE_OK); case 'V': /* version */ - print_revision (progname, revision); + print_revision (progname, NP_VERSION); exit (STATE_OK); case 't': /* timeout period */ if (!is_intnonneg (optarg)) @@ -386,16 +386,17 @@ print_help (void) char *myport; asprintf (&myport, "%d", DEFAULT_PORT); - print_revision (progname, revision); + print_revision (progname, NP_VERSION); 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); @@ -412,14 +413,14 @@ print_help (void) printf (" %s\n", "-T [--starttls]"); printf (" %s\n", _("use starttls mechanism introduced in protocol version 3")); printf (" %s\n", "-S [--ssl]"); - printf (_(" use ldaps (ldap v2 ssl method). this also sets the default port to %i\n"), LDAPS_PORT); + printf (" %s %i\n", _("use ldaps (ldap v2 ssl method). this also sets the default port to"), LDAPS_PORT); #ifdef HAVE_LDAP_SET_OPTION printf (" %s\n", "-2 [--ver2]"); printf (" %s\n", _("use ldap protocol version 2")); printf (" %s\n", "-3 [--ver3]"); printf (" %s\n", _("use ldap protocol version 3")); - printf (" (default protocol version: %d)\n", DEFAULT_PROTOCOL); + printf (" (%s %d)\n", _("default protocol version:"), DEFAULT_PROTOCOL); #endif printf (_(UT_WARN_CRIT)); @@ -428,12 +429,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)); }