internationalization fixes and help fixes

[nagiosplug.git] / plugins / check_ldap.c

diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index adfa966a9c13dad9964ac06b6f199e88109ee302..80c0907afa0af6ef2656670aae8fd8ccebe0fde3 100644 (file)
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -14,11 +14,13 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+ $Id$
+ 
 ******************************************************************************/
 
 const char *progname = "check_ldap";
 const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -29,7 +31,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #include <ldap.h>
 
 enum {
-       UNDEFINED = -1,
+       UNDEFINED = 0,
 #ifdef HAVE_LDAP_SET_OPTION
        DEFAULT_PROTOCOL = 2,
 #endif
@@ -51,8 +53,9 @@ int ld_port = DEFAULT_PORT;
 #ifdef HAVE_LDAP_SET_OPTION
 int ld_protocol = DEFAULT_PROTOCOL;
 #endif
-int warn_time = UNDEFINED;
-int crit_time = UNDEFINED;
+double warn_time = UNDEFINED;
+double crit_time = UNDEFINED;
+struct timeval tv;
 
 int
 main (int argc, char *argv[])
@@ -61,15 +64,18 @@ main (int argc, char *argv[])
        LDAP *ld;
        LDAPMessage *result;
 
-       int t_diff;
-       time_t time0, time1;
+       /* should be    int result = STATE_UNKNOWN; */
+       
+       int status = STATE_UNKNOWN;
+       long microsec;
+       double elapsed_time;
 
        setlocale (LC_ALL, "");
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) == ERROR)
-               usage (_("check_ldap: could not parse arguments\n"));
+       if (process_arguments (argc, argv) != TRUE)
+               usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */
        signal (SIGALRM, socket_timeout_alarm_handler);
@@ -78,7 +84,7 @@ main (int argc, char *argv[])
        alarm (socket_timeout);
 
        /* get the start time */
-       time (&time0);
+       gettimeofday (&tv, NULL);
 
        /* initialize ldap */
        if (!(ld = ldap_open (ld_host, ld_port))) {
@@ -117,26 +123,28 @@ main (int argc, char *argv[])
        /* reset the alarm handler */
        alarm (0);
 
-       /* get the finish time */
-       time (&time1);
-
        /* calcutate the elapsed time and compare to thresholds */
-       t_diff = time1 - time0;
 
-       if (crit_time!=UNDEFINED && t_diff>=crit_time) {
-               printf (_("LDAP CRITICAL - %i seconds response time\n"), t_diff);
-               return STATE_CRITICAL;
-       }
+       microsec = deltime (tv);
+       elapsed_time = (double)microsec / 1.0e6;
 
-       if (warn_time!=UNDEFINED && t_diff>=warn_time) {
-               printf (_("LDAP WARNING - %i seconds response time\n"), t_diff);
-               return STATE_WARNING;
-       }
+       if (crit_time!=UNDEFINED && elapsed_time>crit_time)
+               status = STATE_CRITICAL;
+       else if (warn_time!=UNDEFINED && elapsed_time>warn_time)
+               status = STATE_WARNING;
+       else
+               status = STATE_OK;
 
        /* print out the result */
-       printf (_("LDAP OK - %i seconds response time\n"), t_diff);
-
-       return STATE_OK;
+       printf (_("LDAP %s - %.3f seconds response time|%s\n"),
+               state_text (status),
+               elapsed_time,
+               fperfdata ("time", elapsed_time, "s",
+                         (int)warn_time, warn_time,
+                         (int)crit_time, crit_time,
+                         TRUE, 0, FALSE, 0));
+
+       return status;
 }
 
 /* process command-line arguments */
@@ -191,7 +199,7 @@ process_arguments (int argc, char **argv)
                        exit (STATE_OK);
                case 't':                                                                       /* timeout period */
                        if (!is_intnonneg (optarg))
-                               usage2 (_("timeout interval must be a positive integer"), optarg);
+                               usage2 (_("Timeout interval must be a positive integer"), optarg);
                        else
                                socket_timeout = atoi (optarg);
                        break;
@@ -214,10 +222,10 @@ process_arguments (int argc, char **argv)
                        ld_passwd = optarg;
                        break;
                case 'w':
-                       warn_time = atoi (optarg);
+                       warn_time = strtod (optarg, NULL);
                        break;
                case 'c':
-                       crit_time = atoi (optarg);
+                       crit_time = strtod (optarg, NULL);
                        break;
 #ifdef HAVE_LDAP_SET_OPTION
                case '2':
@@ -238,8 +246,9 @@ process_arguments (int argc, char **argv)
 #endif
                        break;
                default:
-                       usage (_("check_ldap: could not parse unknown arguments\n"));
-                       break;
+                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
+                       print_usage ();
+                       exit (STATE_UNKNOWN);
                }
        }
 
@@ -256,10 +265,10 @@ process_arguments (int argc, char **argv)
 int
 validate_arguments ()
 {
-       if (strlen(ld_host) == 0)
+       if (ld_host==NULL || strlen(ld_host)==0)
                usage (_("please specify the host name\n"));
 
-       if (strlen(ld_base) == 0)
+       if (ld_base==NULL || strlen(ld_base)==0)
                usage (_("please specify the LDAP base\n"));
 
        return OK;
@@ -270,7 +279,6 @@ validate_arguments ()
 
 
 
-\f
 void
 print_help (void)
 {
@@ -279,8 +287,8 @@ print_help (void)
 
        print_revision (progname, revision);
 
-       printf (_("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n"));
-       printf (_(COPYRIGHT), copyright, email);
+       printf ("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n");
+       printf (COPYRIGHT, copyright, email);
 
        print_usage ();
 
@@ -325,10 +333,17 @@ print_help (void)
 void
 print_usage (void)
 {
-       printf (_("\
+       printf ("\
 Usage: %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]\n\
   [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]%s\n\
-(Note: all times are in seconds.)\n"),
-               progname, (HAVE_LDAP_SET_OPTION ? "[-2|-3] [-4|-6]" : ""));
-       printf (_(UT_HLP_VRS), progname, progname);
+(Note: all times are in seconds.)\n",
+               progname,
+#ifdef HAVE_LDAP_SET_OPTION
+                       " [-2|-3] [-4|-6]"
+#else
+                       ""
+#endif
+                       );
+
+       printf (UT_HLP_VRS, progname, progname);
 }