check_snmp: Remove that is_numeric madness

[nagiosplug.git] / plugins / check_ldap.c

diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 3d6f05c4352f566cb98f8057392b91c7dbae1c16..b933ff280666b17f55515dc877ec232982ce2424 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 * 
-* $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 <lber.h>
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 enum {
@@ -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);
@@ -129,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");
@@ -137,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) !=
@@ -152,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)
@@ -179,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;
@@ -189,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;
        }
 
@@ -289,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))
@@ -377,7 +374,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;
@@ -390,7 +387,7 @@ 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);
@@ -399,12 +396,12 @@ print_help (void)
 
        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=*)\""));
@@ -427,11 +424,11 @@ 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");
        printf ("%s\n", _("Notes:"));
@@ -440,12 +437,8 @@ print_help (void)
        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
@@ -456,7 +449,7 @@ print_help (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