diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 492839468130b1fa54f7a093bcbdc8ef5b40a6f0..726ffa64ff63f229dad8a5639edddf1aa5ecbe51 100644 (file)
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
char *ld_base = NULL;
char *ld_passwd = NULL;
char *ld_binddn = 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
#ifdef HAVE_LDAP_SET_OPTION
int ld_protocol = DEFAULT_PROTOCOL;
#endif
case 'S':
if (! starttls) {
ssl_on_connect = TRUE;
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;
} else
usage_va(_("%s cannot be combined with %s"), "-S/--ssl", "-T/--starttls");
break;
if (ld_base == NULL && argv[c])
ld_base = strdup (argv[c++]);
if (ld_base == NULL && argv[c])
ld_base = strdup (argv[c++]);
+ if (ld_port == -1)
+ ld_port = DEFAULT_PORT;
+
return validate_arguments ();
}
return validate_arguments ();
}
if (ld_host==NULL || strlen(ld_host)==0)
usage4 (_("Please specify the host name\n"));
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;
usage4 (_("Please specify the LDAP base\n"));
return OK;
print_usage ();
print_usage ();
- printf (_(UT_HELP_VRSN));
- printf (_(UT_EXTRA_OPTS));
+ 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=*)\""));
printf (" %s\n", "-a [--attr]");
printf (" %s\n", _("ldap attribute to search (default: \"(objectclass=*)\""));
printf (" (%s %d)\n", _("default protocol version:"), DEFAULT_PROTOCOL);
#endif
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");
printf ("%s\n", _("Notes:"));
printf ("\n");
printf ("%s\n", _("Notes:"));
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 (" %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));
+ printf (UT_SUPPORT);
}
/* todo
}
/* todo
void
print_usage (void)
{
void
print_usage (void)
{
- printf (_("Usage:"));
+ printf ("%s\n", _("Usage:"));
printf (" %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]",progname);
printf ("\n [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]%s\n",
#ifdef HAVE_LDAP_SET_OPTION
printf (" %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]",progname);
printf ("\n [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]%s\n",
#ifdef HAVE_LDAP_SET_OPTION