[Nagiosplug-checkins] CVS: nagiosplug/plugins check_ldap.c,1.8,1.9

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv18955/plugins

Modified Files:
	check_ldap.c 
Log Message:
markup for translation

Index: check_ldap.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ldap.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** check_ldap.c	30 Jun 2003 19:47:21 -0000	1.8
--- check_ldap.c	3 Aug 2003 06:02:11 -0000	1.9
***************
*** 1,26 ****
! /***************************************************************************** *
!  * CHECK_LDAP.C
!  *
!  * Program: Ldap plugin for Nagios
!  * License: GPL
!  * Copyright (c) 1999 Didi Rieder (adrieder at sbox.tu-graz.ac.at)
!  * 
!  * Last Modified: $Date$
!  *
!  * Command line: check_ldap -H <host> -b <base_dn> -p <port> -w <warn_time> -w <crit_time>
!  *
!  * Description:
!  *
!  * This plugin is for testing a ldap server.
!  *
!  * Modifications:
!  *
!  * 08-25-1999 Ethan Galstad (nagios at nagios.org)
!  *            Modified to use common plugin include file
!  *
!  *****************************************************************************/
  
  const char *progname = "check_ldap";
  const char *revision = "$Revision$";
  
  #include "config.h"
--- 1,24 ----
! /******************************************************************************
! *
! * 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
! * (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.
! *
! ******************************************************************************/
  
  const char *progname = "check_ldap";
  const char *revision = "$Revision$";
+ const char *copyright = "2000-2003";
+ const char *email = "nagiosplug-devel at lists.sourceforge.net";
  
  #include "config.h"
***************
*** 40,47 ****
  };
  
  int process_arguments (int, char **);
  int validate_arguments (void);
- void print_help (void);
- void print_usage (void);
  
  char ld_defattr[] = "(objectclass=*)";
--- 38,96 ----
  };
  
+ void
+ print_usage ()
+ {
+ 	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);
+ }
+ 
+ void
+ print_help ()
+ {
+ 	char *myport;
+ 	asprintf (&myport, "%d", DEFAULT_PORT);
+ 
+ 	print_revision (progname, revision);
+ 
+ 	printf (_("Copyright (c) 1999 Didi Rieder (adrieder at sbox.tu-graz.ac.at)\n"));
+ 	printf (_(COPYRIGHT), copyright, email);
+ 
+ 	print_usage ();
+ 
+ 	printf (_(UT_HELP_VRSN));
+ 
+ 	printf (_(UT_HOST_PORT), 'p', myport);
+ 
+ 	printf (_(UT_IPv46));
+ 
+ 	printf (_("\
+  -a [--attr]\n\
+     ldap attribute to search (default: \"(objectclass=*)\"\n\
+  -b [--base]\n\
+     ldap base (eg. ou=my unit, o=my org, c=at)\n\
+  -D [--bind]\n\
+     ldap bind DN (if required)\n\
+  -P [--pass]\n\
+     ldap password (if required)\n"));
+ 
+ #ifdef HAVE_LDAP_SET_OPTION
+ 	printf (_("\
+  -2 [--ver2]\n\
+      use ldap protocol version 2\n\
+  -3 [--ver3]\n\
+     use ldap protocol version 3\n\
+     (default protocol version: %d)\n"),
+ 	        DEFAULT_PROTOCOL);
+ #endif
+ 
+ 	printf (_(UT_WARN_CRIT));
+ }
+ 
  int process_arguments (int, char **);
  int validate_arguments (void);
  
  char ld_defattr[] = "(objectclass=*)";
***************
*** 69,73 ****
  
  	if (process_arguments (argc, argv) == ERROR)
! 		usage ("check_ldap: could not parse arguments\n");
  
  	/* initialize alarm signal handling */
--- 118,122 ----
  
  	if (process_arguments (argc, argv) == ERROR)
! 		usage (_("check_ldap: could not parse arguments\n"));
  
  	/* initialize alarm signal handling */
***************
*** 83,87 ****
  	if (!(ld = ldap_open (ld_host, ld_port))) {
  		/*ldap_perror(ld, "ldap_open"); */
! 		printf ("Could not connect to the server at port %i\n", ld_port);
  		return STATE_CRITICAL;
  	}
--- 132,136 ----
  	if (!(ld = ldap_open (ld_host, ld_port))) {
  		/*ldap_perror(ld, "ldap_open"); */
! 		printf (_("Could not connect to the server at port %i\n"), ld_port);
  		return STATE_CRITICAL;
  	}
***************
*** 91,95 ****
  	if (ldap_set_option (ld, LDAP_OPT_PROTOCOL_VERSION, &ld_protocol) !=
  			LDAP_OPT_SUCCESS ) {
! 		printf("Could not set protocol version %d\n", ld_protocol);
  		return STATE_CRITICAL;
  	}
--- 140,144 ----
  	if (ldap_set_option (ld, LDAP_OPT_PROTOCOL_VERSION, &ld_protocol) !=
  			LDAP_OPT_SUCCESS ) {
! 		printf(_("Could not set protocol version %d\n"), ld_protocol);
  		return STATE_CRITICAL;
  	}
***************
*** 99,103 ****
  			LDAP_SUCCESS) {
  		/*ldap_perror(ld, "ldap_bind"); */
! 		printf ("Could not bind to the ldap-server\n");
  		return STATE_CRITICAL;
  	}
--- 148,152 ----
  			LDAP_SUCCESS) {
  		/*ldap_perror(ld, "ldap_bind"); */
! 		printf (_("Could not bind to the ldap-server\n"));
  		return STATE_CRITICAL;
  	}
***************
*** 107,111 ****
  			!= LDAP_SUCCESS) {
  		/*ldap_perror(ld, "ldap_search"); */
! 		printf ("Could not search/find objectclasses in %s\n", ld_base);
  		return STATE_CRITICAL;
  	}
--- 156,160 ----
  			!= LDAP_SUCCESS) {
  		/*ldap_perror(ld, "ldap_search"); */
! 		printf (_("Could not search/find objectclasses in %s\n"), ld_base);
  		return STATE_CRITICAL;
  	}
***************
*** 124,138 ****
  
  	if (crit_time!=UNDEFINED && t_diff>=crit_time) {
! 		printf ("LDAP CRITICAL - %i seconds response time\n", t_diff);
  		return STATE_CRITICAL;
  	}
  
  	if (warn_time!=UNDEFINED && t_diff>=warn_time) {
! 		printf ("LDAP WARNING - %i seconds response time\n", t_diff);
  		return STATE_WARNING;
  	}
  
  	/* print out the result */
! 	printf ("LDAP OK - %i seconds response time\n", t_diff);
  
  	return STATE_OK;
--- 173,187 ----
  
  	if (crit_time!=UNDEFINED && t_diff>=crit_time) {
! 		printf (_("LDAP CRITICAL - %i seconds response time\n"), t_diff);
  		return STATE_CRITICAL;
  	}
  
  	if (warn_time!=UNDEFINED && t_diff>=warn_time) {
! 		printf (_("LDAP WARNING - %i seconds response time\n"), t_diff);
  		return STATE_WARNING;
  	}
  
  	/* print out the result */
! 	printf (_("LDAP OK - %i seconds response time\n"), t_diff);
  
  	return STATE_OK;
***************
*** 191,195 ****
  		case 't':									/* timeout period */
  			if (!is_intnonneg (optarg))
! 				usage2 ("timeout interval must be a positive integer", optarg);
  			socket_timeout = atoi (optarg);
  			break;
--- 240,244 ----
  		case 't':									/* timeout period */
  			if (!is_intnonneg (optarg))
! 				usage2 (_("timeout interval must be a positive integer"), optarg);
  			socket_timeout = atoi (optarg);
  			break;
***************
*** 233,241 ****
  			address_family = AF_INET6;
  #else
! 			usage ("IPv6 support not available\n");
  #endif
  			break;
  		default:
! 			usage ("check_ldap: could not parse unknown arguments\n");
  			break;
  		}
--- 282,290 ----
  			address_family = AF_INET6;
  #else
! 			usage (_("IPv6 support not available\n"));
  #endif
  			break;
  		default:
! 			usage (_("check_ldap: could not parse unknown arguments\n"));
  			break;
  		}
***************
*** 257,316 ****
  {
  	if (strlen(ld_host) == 0)
! 		usage ("please specify the host name\n");
  
  	if (strlen(ld_base) == 0)
! 		usage ("please specify the LDAP base\n");
! 
! 	else
! 		return OK;
! 
! }
! 
! 
! 
! /* function print_help */
! void
! print_help ()
! {
! 	print_revision (progname, revision);
! 	printf
! 		("Copyright (c) 1999 Didi Rieder (adrieder at sbox.tu-graz.ac.at)\n"
! 		 "License: GPL\n" "\n");
! 	print_usage ();
! 	printf
! 		("\n"
! 		 "Options:\n"
! 		 "\t-H [--host] ... host\n"
! 		 "\t-a [--attr] ... ldap attribute to search (default: \"(objectclass=*)\"\n"
! 		 "\t-b [--base] ... ldap base (eg. ou=my unit, o=my org, c=at)\n"
! 		 "\t-D [--bind] ... ldap bind DN (if required)\n"
! 		 "\t-P [--pass] ... ldap password (if required)\n"
! 		 "\t-p [--port] ... ldap port (default: %d)\n"
! #ifdef HAVE_LDAP_SET_OPTION
! 		 "\t-2 [--ver2] ... use ldap protocol version 2\n"
! 		 "\t-3 [--ver3] ... use ldap protocol version 3\n"
! 		 "\t-4 [--use-ipv4] ... use IPv4 protocol\n"
! 		 "\t-6 [--use-ipv6] ... use IPv6 protocol\n"
! 		 "\t\t(default protocol version: %d)\n"
! #endif
! 		 "\t-w [--warn] ... time in secs. - if the exceeds <warn> the STATE_WARNING will be returned\n"
! 		 "\t-c [--crit] ... time in secs. - if the exceeds <crit> the STATE_CRITICAL will be returned\n"
! 		 "\n", DEFAULT_PORT
! #ifdef HAVE_LDAP_SET_OPTION
!  		     , DEFAULT_PROTOCOL
! #endif
! 		);
! }
  
  
- void
- print_usage ()
- {
- 	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]\n"
- #ifdef HAVE_LDAP_SET_OPTION
- 		 "         [-2|-3] [-4|-6]\n"
- #endif
- 		 "(Note: all times are in seconds.)\n", progname);
  }
--- 306,315 ----
  {
  	if (strlen(ld_host) == 0)
! 		usage (_("please specify the host name\n"));
  
  	if (strlen(ld_base) == 0)
! 		usage (_("please specify the LDAP base\n"));
  
+ 	return OK;
  
  }