X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_ldap.c;h=726ffa64ff63f229dad8a5639edddf1aa5ecbe51;hb=a2a279e262ef341b95fe2511d7164cbc60f6b026;hp=582f9cc1c88115d6ddbbb871cc1b84f6e5dce5df;hpb=fa4efcdf6df1096ff1f6740c7f44b213b47dc9d3;p=nagiosplug.git
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 582f9cc..726ffa6 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -5,8 +5,6 @@
* License: GPL
* Copyright (c) 2000-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_ldap plugin
@@ -25,13 +23,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*
-* $Id$
*
*****************************************************************************/
/* progname may be check_ldaps */
char *progname = "check_ldap";
-const char *revision = "$Revision$";
const char *copyright = "2000-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
@@ -40,6 +36,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
#include "utils.h"
#include
+#define LDAP_DEPRECATED 1
#include
enum {
@@ -61,7 +58,7 @@ char *ld_host = NULL;
char *ld_base = NULL;
char *ld_passwd = NULL;
char *ld_binddn = NULL;
-int ld_port = DEFAULT_PORT;
+int ld_port = -1;
#ifdef HAVE_LDAP_SET_OPTION
int ld_protocol = DEFAULT_PROTOCOL;
#endif
@@ -87,15 +84,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);
@@ -104,7 +101,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"));
@@ -126,7 +126,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");
@@ -134,7 +134,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) !=
@@ -149,7 +149,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)
@@ -176,7 +176,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;
@@ -186,13 +186,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;
}
@@ -286,7 +286,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))
@@ -341,7 +341,8 @@ process_arguments (int argc, char **argv)
case 'S':
if (! starttls) {
ssl_on_connect = TRUE;
- ld_port = LDAPS_PORT;
+ if (ld_port == -1)
+ ld_port = LDAPS_PORT;
} else
usage_va(_("%s cannot be combined with %s"), "-S/--ssl", "-T/--starttls");
break;
@@ -364,6 +365,9 @@ process_arguments (int argc, char **argv)
if (ld_base == NULL && argv[c])
ld_base = strdup (argv[c++]);
+ if (ld_port == -1)
+ ld_port = DEFAULT_PORT;
+
return validate_arguments ();
}
@@ -374,7 +378,7 @@ validate_arguments ()
if (ld_host==NULL || strlen(ld_host)==0)
usage4 (_("Please specify the host name\n"));
- if (ld_base==NULL || strlen(ld_base)==0)
+ if (ld_base==NULL)
usage4 (_("Please specify the LDAP base\n"));
return OK;
@@ -387,20 +391,21 @@ 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_HELP_VRSN);
+ printf (UT_EXTRA_OPTS);
- printf (_(UT_HOST_PORT), 'p', myport);
+ printf (UT_HOST_PORT, 'p', myport);
- printf (_(UT_IPv46));
+ printf (UT_IPv46);
printf (" %s\n", "-a [--attr]");
printf (" %s\n", _("ldap attribute to search (default: \"(objectclass=*)\""));
@@ -423,20 +428,21 @@ print_help (void)
printf (" (%s %d)\n", _("default protocol version:"), DEFAULT_PROTOCOL);
#endif
- printf (_(UT_WARN_CRIT));
+ printf (UT_WARN_CRIT);
- printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+ printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
- printf (_(UT_VERBOSE));
+ 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."));
- printf (_(UT_SUPPORT));
+ printf (UT_SUPPORT);
}
/* todo
@@ -447,7 +453,7 @@ print_help (void)
void
print_usage (void)
{
- printf (_("Usage:"));
+ printf ("%s\n", _("Usage:"));
printf (" %s -H -b [-p ] [-a ] [-D ]",progname);
printf ("\n [-P ] [-w ] [-c ] [-t timeout]%s\n",
#ifdef HAVE_LDAP_SET_OPTION