[Nagiosplug-checkins] nagiosplug/plugins check_dns.c,1.34,1.35 check_ldap.c,1.20,1.21 check_procs.c,1.33,1.34

Benoit Mortier opensides at users.sourceforge.net
Thu Dec 2 13:24:03 CET 2004


Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5986/plugins

Modified Files:
	check_dns.c check_ldap.c check_procs.c 
Log Message:

--disable-nls throws an error on check_dns, check_procs and 
check_ldap without this patch.



Index: check_ldap.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ldap.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_ldap.c	2 Dec 2004 16:51:24 -0000	1.20
+++ check_ldap.c	2 Dec 2004 21:23:50 -0000	1.21
@@ -335,6 +335,13 @@
 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]" : ""));
+	        progname,
+#ifdef HAVE_LDAP_SET_OPTION
+			" [-2|-3] [-4|-6]"
+#else
+			""
+#endif
+			);
+
 	printf (_(UT_HLP_VRS), progname, progname);
 }

Index: check_dns.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- check_dns.c	2 Dec 2004 16:51:24 -0000	1.34
+++ check_dns.c	2 Dec 2004 21:23:50 -0000	1.35
@@ -196,7 +196,7 @@
 			multi_address = TRUE;
 
 		printf ("DNS %s: ", _("OK"));
-		printf (ngettext("%.3f second response time, ", "%.3f seconds response time, ", elapsed_time), elapsed_time);
+		printf (_("%.3f seconds response time"), elapsed_time);
 		printf (_("%s returns %s"), query_address, address);
 		printf ("|%s\n", fperfdata ("time", elapsed_time, "s", FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
 	}

Index: check_procs.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_procs.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- check_procs.c	2 Dec 2004 16:51:25 -0000	1.33
+++ check_procs.c	2 Dec 2004 21:23:50 -0000	1.34
@@ -277,7 +277,7 @@
 			printf (_("%d crit, %d warn out of "), crit, warn);
 		}
 	} 
-	printf (ngettext ("%d process", "%d processes", (unsigned long) procs), procs);
+	printf ("%d %s", procs, procs == 1 ? _("process") : _("processes"));
 	
 	if (strcmp(fmt,"") != 0) {
 		printf (_(" with %s"), fmt);





More information about the Commits mailing list