diff --git a/ChangeLog b/ChangeLog index 1dca3bd..b6fd2e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,58 @@ +2014-12-02 Holger Weiss + + * NEWS: Modify list of changes for 2.1.1 release + + Make the list of changes slightly more descriptive. + +2014-12-01 Jan Wagner + + * NP-VERSION-GEN, configure.ac: Prepare release + + * THANKS.in: Add new authors + + * NEWS: Updating all the fixes + +2014-11-30 Sebastian Herbszt + + * plugins/check_tcp.c: check_tcp: fix help description regarding escape + option + + The help description should print '\\' for backslash not just '\'. + +2014-12-01 Holger Weiss + + * plugins/check_ntp.c: check_ntp: Nul-terminate jitter data + + Make sure the jitter response is nul-terminated before parsing the data + using string functions. + +2014-11-30 Holger Weiss + + * plugins/check_ntp.c: Revert "plugins/check_ntp.c - Verify struct from + response" + + This reverts commit a04df3e1b67dc5eab3adc202cc89901f801cdeaa. The "fix" + was bogus in many ways and broke jitter checking. + + Conflicts: + plugins/check_ntp.c + +2014-11-27 Sebastian Herbszt + + * plugins/check_real.c: check_real: fix null termination + + Fix null termination introduced by commit b61f51a ("plugins/check_real.c - recv string null terminate"). + +2014-11-26 Sebastian Herbszt + + * plugins/check_ntp.c: check_ntp: fix null termination + + Fix null termination introduced by commit a04df3e ("plugins/check_ntp.c - Verify struct from response"). + + * plugins/check_apt.c: check_apt: fix memset + + Fix memset introduced by commit 9ce7369 ("plugins/check_apt.c - Print uninitialized ereg"). + 2014-10-15 Holger Weiss * NEWS, NP-VERSION-GEN, configure.ac: Prepare for the 2.1 release diff --git a/NEWS b/NEWS index 16d66e3..c999e51 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,13 @@ This file documents the major additions and syntax changes between releases. +2.1.1 2nd December 2014 + FIXES + Fix check_ntp's jitter checking + Fix check_ntp's handling of invalid server responses + Fix check_apt's handling of invalid regular expressions + Fix check_real's server response processing + Fix backslash escaping in check_tcp's --help output + 2.1 15th October 2014 ENHANCEMENTS New check_hpjd -p option for port specification (abrist) diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN index 1878eb9..12efad7 100755 --- a/NP-VERSION-GEN +++ b/NP-VERSION-GEN @@ -6,7 +6,7 @@ SRC_ROOT=`dirname $0` NPVF=NP-VERSION-FILE -DEF_VER=2.1.git +DEF_VER=2.1.1.git LF=' ' diff --git a/THANKS b/THANKS index ef6b5d8..2b312f7 100644 --- a/THANKS +++ b/THANKS @@ -134,6 +134,7 @@ Sebastian Harl Michael Haro Olli Hauer Gunnar Hellekson +Sebastian Herbszt Johannes Herlitz Ian Holsman Peter Hoogendijk diff --git a/configure b/configure index c3ba8b6..f241c87 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for monitoring-plugins 2.1. +# Generated by GNU Autoconf 2.69 for monitoring-plugins 2.1.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='monitoring-plugins' PACKAGE_TARNAME='monitoring-plugins' -PACKAGE_VERSION='2.1' -PACKAGE_STRING='monitoring-plugins 2.1' +PACKAGE_VERSION='2.1.1' +PACKAGE_STRING='monitoring-plugins 2.1.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -2400,7 +2400,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures monitoring-plugins 2.1 to adapt to many kinds of systems. +\`configure' configures monitoring-plugins 2.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2471,7 +2471,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of monitoring-plugins 2.1:";; + short | recursive ) echo "Configuration of monitoring-plugins 2.1.1:";; esac cat <<\_ACEOF @@ -2637,7 +2637,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -monitoring-plugins configure 2.1 +monitoring-plugins configure 2.1.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3342,7 +3342,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by monitoring-plugins $as_me 2.1, which was +It was created by monitoring-plugins $as_me 2.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4213,7 +4213,7 @@ fi # Define the identity of the package. PACKAGE='monitoring-plugins' - VERSION='2.1' + VERSION='2.1.1' cat >>confdefs.h <<_ACEOF @@ -40937,7 +40937,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by monitoring-plugins $as_me 2.1, which was +This file was extended by monitoring-plugins $as_me 2.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -41003,7 +41003,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -monitoring-plugins config.status 2.1 +monitoring-plugins config.status 2.1.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 991c1f8..8514f98 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(monitoring-plugins,2.1) +AC_INIT(monitoring-plugins,2.1.1) AC_CONFIG_SRCDIR(NPTest.pm) AC_CONFIG_FILES([gl/Makefile]) AC_CONFIG_AUX_DIR(build-aux) diff --git a/pkg/solaris/pkginfo b/pkg/solaris/pkginfo index 4d43d8c..9e617ef 100644 --- a/pkg/solaris/pkginfo +++ b/pkg/solaris/pkginfo @@ -2,11 +2,11 @@ PKG="NGOSplugin" NAME="monitoring-plugins" DESC="Network Monitoring Plugins for Nagios and compatible" ARCH="unknown" -VERSION="2.1,REV=2014.10.15.14.31" +VERSION="2.1.1,REV=2014.12.02.00.45" CATEGORY="application" VENDOR="Monitoring Plugins Development Team" EMAIL="devel@monitoring-plugins.org" -PSTAMP="nag20141015143143" +PSTAMP="nag20141202004507" BASEDIR="/" CLASSES="none" diff --git a/plugins/check_apt.c b/plugins/check_apt.c index 07622c2..8747f90 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c @@ -224,7 +224,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount){ char *cmdline=NULL, rerrbuf[64]; /* initialize ereg as it is possible it is printed while uninitialized */ - memset(&ereg, "\0", sizeof(ereg.buffer)); + memset(&ereg, '\0', sizeof(ereg.buffer)); if(upgrade==NO_UPGRADE) return STATE_OK; diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index 09a923e..a7d278d 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c @@ -517,14 +517,13 @@ setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq){ double jitter_request(const char *host, int *status){ int conn=-1, i, npeers=0, num_candidates=0, syncsource_found=0; int run=0, min_peer_sel=PEER_INCLUDED, num_selected=0, num_valid=0; - int peers_size=0, peer_offset=0, bytes_read=0; + int peers_size=0, peer_offset=0; ntp_assoc_status_pair *peers=NULL; ntp_control_message req; const char *getvar = "jitter"; double rval = 0.0, jitter = -1.0; char *startofvalue=NULL, *nptr=NULL; void *tmp; - int ntp_cm_ints = sizeof(uint16_t) * 5 + sizeof(uint8_t) * 2; /* Long-winded explanation: * Getting the jitter requires a number of steps: @@ -591,6 +590,9 @@ double jitter_request(const char *host, int *status){ for (i = 0; i < npeers; i++){ /* Only query this server if it is the current sync source */ if (PEER_SEL(peers[i].status) >= min_peer_sel){ + char jitter_data[MAX_CM_SIZE+1]; + size_t jitter_data_count; + num_selected++; setup_control_request(&req, OP_READVAR, 2); req.assoc = peers[i].assoc; @@ -609,15 +611,7 @@ double jitter_request(const char *host, int *status){ req.count = htons(MAX_CM_SIZE); DBG(printf("recieving READVAR response...\n")); - - /* cov-66524 - req.data not null terminated before usage. Also covers verifying struct was returned correctly*/ - if ((bytes_read = read(conn, &req, SIZEOF_NTPCM(req))) == -1) - die(STATE_UNKNOWN, _("Cannot read from socket: %s"), strerror(errno)); - if (bytes_read != ntp_cm_ints + req.count) - die(STATE_UNKNOWN, _("Invalid NTP response: %d bytes read does not equal %d plus %d data segment"), bytes_read, ntp_cm_ints, req.count); - /* else null terminate */ - strncpy(req.data[req.count], "\0", 1); - + read(conn, &req, SIZEOF_NTPCM(req)); DBG(print_ntp_control_message(&req)); if(req.op&REM_ERROR && strstr(getvar, "jitter")) { @@ -632,7 +626,14 @@ double jitter_request(const char *host, int *status){ if(verbose) { printf("parsing jitter from peer %.2x: ", ntohs(peers[i].assoc)); } - startofvalue = strchr(req.data, '='); + if((jitter_data_count = ntohs(req.count)) >= sizeof(jitter_data)){ + die(STATE_UNKNOWN, + _("jitter response too large (%lu bytes)\n"), + (unsigned long)jitter_data_count); + } + memcpy(jitter_data, req.data, jitter_data_count); + jitter_data[jitter_data_count] = '\0'; + startofvalue = strchr(jitter_data, '='); if(startofvalue != NULL) { startofvalue++; jitter = strtod(startofvalue, &nptr); diff --git a/plugins/check_real.c b/plugins/check_real.c index 36f6413..1816bf5 100644 --- a/plugins/check_real.c +++ b/plugins/check_real.c @@ -178,7 +178,7 @@ main (int argc, char **argv) /* watch for the REAL connection string */ result = recv (sd, buffer, MAX_INPUT_BUFFER - 1, 0); - buffer[result] = "\0"; /* null terminate recieved buffer */ + buffer[result] = '\0'; /* null terminate recieved buffer */ /* return a CRITICAL status if we couldn't read any data */ if (result == -1) { diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index fc0adba..63f9fd9 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -643,7 +643,7 @@ print_help (void) printf (UT_IPv46); printf (" %s\n", "-E, --escape"); - printf (" %s\n", _("Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or quit option")); + printf (" %s\n", _("Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send or quit option")); printf (" %s\n", _("Default: nothing added to send, \\r\\n added to end of quit")); printf (" %s\n", "-s, --send=STRING"); printf (" %s\n", _("String to send to the server")); diff --git a/po/de.gmo b/po/de.gmo index ef84e02..676a78d 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 441163d..9ebe538 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: nagiosplug\n" "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" -"POT-Creation-Date: 2014-10-15 14:32+0200\n" +"POT-Creation-Date: 2014-12-02 00:46+0100\n" "PO-Revision-Date: 2004-12-23 17:46+0100\n" "Last-Translator: <>\n" "Language-Team: English \n" @@ -24,7 +24,7 @@ msgstr "" #: plugins/check_fping.c:93 plugins/check_game.c:82 plugins/check_hpjd.c:104 #: plugins/check_http.c:167 plugins/check_ldap.c:109 plugins/check_load.c:122 #: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:124 -#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:781 +#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:782 #: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:559 #: plugins/check_nwstat.c:173 plugins/check_overcr.c:102 #: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:172 @@ -226,7 +226,7 @@ msgstr "" #: plugins/check_by_ssh.c:446 plugins/check_cluster.c:261 #: plugins/check_dig.c:364 plugins/check_disk.c:945 plugins/check_http.c:1562 -#: plugins/check_nagios.c:312 plugins/check_ntp.c:880 +#: plugins/check_nagios.c:312 plugins/check_ntp.c:881 #: plugins/check_ntp_peer.c:733 plugins/check_ntp_time.c:644 #: plugins/check_procs.c:763 plugins/negate.c:251 plugins/urlize.c:179 msgid "Examples:" @@ -238,7 +238,7 @@ msgstr "" #: plugins/check_game.c:331 plugins/check_hpjd.c:432 plugins/check_http.c:1592 #: plugins/check_ldap.c:451 plugins/check_load.c:334 plugins/check_mrtg.c:382 #: plugins/check_mysql.c:581 plugins/check_nagios.c:323 plugins/check_nt.c:774 -#: plugins/check_ntp.c:899 plugins/check_ntp_peer.c:753 +#: plugins/check_ntp.c:900 plugins/check_ntp_peer.c:753 #: plugins/check_ntp_time.c:653 plugins/check_nwstat.c:1685 #: plugins/check_overcr.c:467 plugins/check_pgsql.c:578 #: plugins/check_ping.c:610 plugins/check_procs.c:781 @@ -295,7 +295,7 @@ msgstr "" #: plugins/check_cluster.c:257 plugins/check_game.c:318 #: plugins/check_http.c:1544 plugins/check_ldap.c:438 plugins/check_mrtg.c:363 #: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:570 -#: plugins/check_nt.c:758 plugins/check_ntp.c:876 plugins/check_ntp_peer.c:724 +#: plugins/check_nt.c:758 plugins/check_ntp.c:877 plugins/check_ntp_peer.c:724 #: plugins/check_ntp_time.c:635 plugins/check_nwstat.c:1670 #: plugins/check_overcr.c:456 plugins/check_snmp.c:1180 #: plugins/check_swap.c:558 plugins/check_ups.c:642 @@ -908,7 +908,7 @@ msgstr "FPING %s - %s (verloren=%.0f%% )|%s\n" #: plugins/check_fping.c:326 plugins/check_fping.c:332 #: plugins/check_hpjd.c:339 plugins/check_hpjd.c:368 plugins/check_mysql.c:383 -#: plugins/check_mysql.c:470 plugins/check_ntp.c:720 +#: plugins/check_mysql.c:470 plugins/check_ntp.c:721 #: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:500 #: plugins/check_pgsql.c:335 plugins/check_ping.c:295 plugins/check_ping.c:418 #: plugins/check_radius.c:271 plugins/check_real.c:315 @@ -940,7 +940,7 @@ msgstr "Warnung time muss ein positiver Integer sein" msgid "Interval must be a positive integer" msgstr "Timeout interval muss ein positiver Integer sein" -#: plugins/check_fping.c:402 plugins/check_ntp.c:744 +#: plugins/check_fping.c:402 plugins/check_ntp.c:745 #: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:530 #: plugins/check_radius.c:321 plugins/check_time.c:319 msgid "Hostname was not supplied" @@ -1209,7 +1209,7 @@ msgstr "Ung msgid "Could Not Compile Regular Expression: %s" msgstr "" -#: plugins/check_http.c:464 plugins/check_ntp.c:733 +#: plugins/check_http.c:464 plugins/check_ntp.c:734 #: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:519 #: plugins/check_smtp.c:621 plugins/check_ssh.c:151 plugins/check_tcp.c:481 msgid "IPv6 support not available" @@ -2729,93 +2729,87 @@ msgstr "" msgid "and on the client service it's connecting to." msgstr "" -#: plugins/check_ntp.c:615 +#: plugins/check_ntp.c:631 #, c-format -msgid "Cannot read from socket: %s" +msgid "jitter response too large (%lu bytes)\n" msgstr "" -#: plugins/check_ntp.c:617 -#, c-format -msgid "" -"Invalid NTP response: %d bytes read does not equal %d plus %d data segment" -msgstr "" - -#: plugins/check_ntp.c:818 plugins/check_ntp_peer.c:619 +#: plugins/check_ntp.c:819 plugins/check_ntp_peer.c:619 #: plugins/check_ntp_time.c:578 msgid "NTP CRITICAL:" msgstr "NTP CRITICAL:" -#: plugins/check_ntp.c:821 plugins/check_ntp_peer.c:622 +#: plugins/check_ntp.c:822 plugins/check_ntp_peer.c:622 #: plugins/check_ntp_time.c:581 msgid "NTP WARNING:" msgstr "NTP WARNING:" -#: plugins/check_ntp.c:824 plugins/check_ntp_peer.c:625 +#: plugins/check_ntp.c:825 plugins/check_ntp_peer.c:625 #: plugins/check_ntp_time.c:584 msgid "NTP OK:" msgstr "NTP OK:" -#: plugins/check_ntp.c:827 plugins/check_ntp_peer.c:628 +#: plugins/check_ntp.c:828 plugins/check_ntp_peer.c:628 #: plugins/check_ntp_time.c:587 msgid "NTP UNKNOWN:" msgstr "NTP UNKNOWN:" -#: plugins/check_ntp.c:831 plugins/check_ntp_peer.c:637 +#: plugins/check_ntp.c:832 plugins/check_ntp_peer.c:637 #: plugins/check_ntp_time.c:591 msgid "Offset unknown" msgstr "" -#: plugins/check_ntp.c:834 plugins/check_ntp_peer.c:640 +#: plugins/check_ntp.c:835 plugins/check_ntp_peer.c:640 #: plugins/check_ntp_peer.c:642 plugins/check_ntp_peer.c:644 #: plugins/check_ntp_time.c:594 msgid "Offset" msgstr "" -#: plugins/check_ntp.c:855 plugins/check_ntp_peer.c:690 +#: plugins/check_ntp.c:856 plugins/check_ntp_peer.c:690 #, fuzzy msgid "This plugin checks the selected ntp server" msgstr "" "Testet den DNS Dienst auf dem angegebenen Host mit dig\n" "\n" -#: plugins/check_ntp.c:865 plugins/check_ntp_peer.c:702 +#: plugins/check_ntp.c:866 plugins/check_ntp_peer.c:702 #: plugins/check_ntp_time.c:621 msgid "Offset to result in warning status (seconds)" msgstr "" -#: plugins/check_ntp.c:867 plugins/check_ntp_peer.c:704 +#: plugins/check_ntp.c:868 plugins/check_ntp_peer.c:704 #: plugins/check_ntp_time.c:623 msgid "Offset to result in critical status (seconds)" msgstr "" -#: plugins/check_ntp.c:869 plugins/check_ntp_peer.c:710 +#: plugins/check_ntp.c:870 plugins/check_ntp_peer.c:710 #, fuzzy msgid "Warning threshold for jitter" msgstr "Warning threshold Integer sein" -#: plugins/check_ntp.c:871 plugins/check_ntp_peer.c:712 +#: plugins/check_ntp.c:872 plugins/check_ntp_peer.c:712 #, fuzzy msgid "Critical threshold for jitter" msgstr "Critical threshold muss ein Integer sein" -#: plugins/check_ntp.c:881 +#: plugins/check_ntp.c:882 msgid "Normal offset check:" msgstr "" -#: plugins/check_ntp.c:884 plugins/check_ntp_peer.c:737 +#: plugins/check_ntp.c:885 plugins/check_ntp_peer.c:737 msgid "" "Check jitter too, avoiding critical notifications if jitter isn't available" msgstr "" -#: plugins/check_ntp.c:885 plugins/check_ntp_peer.c:738 +#: plugins/check_ntp.c:886 plugins/check_ntp_peer.c:738 msgid "(See Notes above for more details on thresholds formats):" msgstr "" -#: plugins/check_ntp.c:890 plugins/check_ntp.c:897 +#: plugins/check_ntp.c:891 plugins/check_ntp.c:898 msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or" msgstr "" -#: plugins/check_ntp.c:891 plugins/check_ntp.c:898 +#: plugins/check_ntp.c:892 plugins/check_ntp.c:899 msgid "check_ntp_time instead." msgstr "" @@ -5081,8 +5075,8 @@ msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." #: plugins/check_tcp.c:646 msgid "" -"Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or " -"quit option" +"Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send " +"or quit option" msgstr "" #: plugins/check_tcp.c:647 diff --git a/po/fr.gmo b/po/fr.gmo index 368fd50..74d25f7 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 701ef2e..dbdc09a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" -"POT-Creation-Date: 2014-10-15 14:32+0200\n" +"POT-Creation-Date: 2014-12-02 00:46+0100\n" "PO-Revision-Date: 2010-04-21 23:38-0400\n" "Last-Translator: Thomas Guyot-Sionnest \n" "Language-Team: Nagios Plugin Development Mailing List \n" "Language-Team: LANGUAGE \n" @@ -23,7 +23,7 @@ msgstr "" #: plugins/check_fping.c:93 plugins/check_game.c:82 plugins/check_hpjd.c:104 #: plugins/check_http.c:167 plugins/check_ldap.c:109 plugins/check_load.c:122 #: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:124 -#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:781 +#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:782 #: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:559 #: plugins/check_nwstat.c:173 plugins/check_overcr.c:102 #: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:172 @@ -217,7 +217,7 @@ msgstr "" #: plugins/check_by_ssh.c:446 plugins/check_cluster.c:261 #: plugins/check_dig.c:364 plugins/check_disk.c:945 plugins/check_http.c:1562 -#: plugins/check_nagios.c:312 plugins/check_ntp.c:880 +#: plugins/check_nagios.c:312 plugins/check_ntp.c:881 #: plugins/check_ntp_peer.c:733 plugins/check_ntp_time.c:644 #: plugins/check_procs.c:763 plugins/negate.c:251 plugins/urlize.c:179 msgid "Examples:" @@ -229,7 +229,7 @@ msgstr "" #: plugins/check_game.c:331 plugins/check_hpjd.c:432 plugins/check_http.c:1592 #: plugins/check_ldap.c:451 plugins/check_load.c:334 plugins/check_mrtg.c:382 #: plugins/check_mysql.c:581 plugins/check_nagios.c:323 plugins/check_nt.c:774 -#: plugins/check_ntp.c:899 plugins/check_ntp_peer.c:753 +#: plugins/check_ntp.c:900 plugins/check_ntp_peer.c:753 #: plugins/check_ntp_time.c:653 plugins/check_nwstat.c:1685 #: plugins/check_overcr.c:467 plugins/check_pgsql.c:578 #: plugins/check_ping.c:610 plugins/check_procs.c:781 @@ -286,7 +286,7 @@ msgstr "" #: plugins/check_cluster.c:257 plugins/check_game.c:318 #: plugins/check_http.c:1544 plugins/check_ldap.c:438 plugins/check_mrtg.c:363 #: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:570 -#: plugins/check_nt.c:758 plugins/check_ntp.c:876 plugins/check_ntp_peer.c:724 +#: plugins/check_nt.c:758 plugins/check_ntp.c:877 plugins/check_ntp_peer.c:724 #: plugins/check_ntp_time.c:635 plugins/check_nwstat.c:1670 #: plugins/check_overcr.c:456 plugins/check_snmp.c:1180 #: plugins/check_swap.c:558 plugins/check_ups.c:642 @@ -884,7 +884,7 @@ msgstr "" #: plugins/check_fping.c:326 plugins/check_fping.c:332 #: plugins/check_hpjd.c:339 plugins/check_hpjd.c:368 plugins/check_mysql.c:383 -#: plugins/check_mysql.c:470 plugins/check_ntp.c:720 +#: plugins/check_mysql.c:470 plugins/check_ntp.c:721 #: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:500 #: plugins/check_pgsql.c:335 plugins/check_ping.c:295 plugins/check_ping.c:418 #: plugins/check_radius.c:271 plugins/check_real.c:315 @@ -914,7 +914,7 @@ msgstr "" msgid "Interval must be a positive integer" msgstr "" -#: plugins/check_fping.c:402 plugins/check_ntp.c:744 +#: plugins/check_fping.c:402 plugins/check_ntp.c:745 #: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:530 #: plugins/check_radius.c:321 plugins/check_time.c:319 msgid "Hostname was not supplied" @@ -1168,7 +1168,7 @@ msgstr "" msgid "Could Not Compile Regular Expression: %s" msgstr "" -#: plugins/check_http.c:464 plugins/check_ntp.c:733 +#: plugins/check_http.c:464 plugins/check_ntp.c:734 #: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:519 #: plugins/check_smtp.c:621 plugins/check_ssh.c:151 plugins/check_tcp.c:481 msgid "IPv6 support not available" @@ -2660,88 +2660,82 @@ msgstr "" msgid "and on the client service it's connecting to." msgstr "" -#: plugins/check_ntp.c:615 +#: plugins/check_ntp.c:631 #, c-format -msgid "Cannot read from socket: %s" +msgid "jitter response too large (%lu bytes)\n" msgstr "" -#: plugins/check_ntp.c:617 -#, c-format -msgid "" -"Invalid NTP response: %d bytes read does not equal %d plus %d data segment" -msgstr "" - -#: plugins/check_ntp.c:818 plugins/check_ntp_peer.c:619 +#: plugins/check_ntp.c:819 plugins/check_ntp_peer.c:619 #: plugins/check_ntp_time.c:578 msgid "NTP CRITICAL:" msgstr "" -#: plugins/check_ntp.c:821 plugins/check_ntp_peer.c:622 +#: plugins/check_ntp.c:822 plugins/check_ntp_peer.c:622 #: plugins/check_ntp_time.c:581 msgid "NTP WARNING:" msgstr "" -#: plugins/check_ntp.c:824 plugins/check_ntp_peer.c:625 +#: plugins/check_ntp.c:825 plugins/check_ntp_peer.c:625 #: plugins/check_ntp_time.c:584 msgid "NTP OK:" msgstr "" -#: plugins/check_ntp.c:827 plugins/check_ntp_peer.c:628 +#: plugins/check_ntp.c:828 plugins/check_ntp_peer.c:628 #: plugins/check_ntp_time.c:587 msgid "NTP UNKNOWN:" msgstr "" -#: plugins/check_ntp.c:831 plugins/check_ntp_peer.c:637 +#: plugins/check_ntp.c:832 plugins/check_ntp_peer.c:637 #: plugins/check_ntp_time.c:591 msgid "Offset unknown" msgstr "" -#: plugins/check_ntp.c:834 plugins/check_ntp_peer.c:640 +#: plugins/check_ntp.c:835 plugins/check_ntp_peer.c:640 #: plugins/check_ntp_peer.c:642 plugins/check_ntp_peer.c:644 #: plugins/check_ntp_time.c:594 msgid "Offset" msgstr "" -#: plugins/check_ntp.c:855 plugins/check_ntp_peer.c:690 +#: plugins/check_ntp.c:856 plugins/check_ntp_peer.c:690 msgid "This plugin checks the selected ntp server" msgstr "" -#: plugins/check_ntp.c:865 plugins/check_ntp_peer.c:702 +#: plugins/check_ntp.c:866 plugins/check_ntp_peer.c:702 #: plugins/check_ntp_time.c:621 msgid "Offset to result in warning status (seconds)" msgstr "" -#: plugins/check_ntp.c:867 plugins/check_ntp_peer.c:704 +#: plugins/check_ntp.c:868 plugins/check_ntp_peer.c:704 #: plugins/check_ntp_time.c:623 msgid "Offset to result in critical status (seconds)" msgstr "" -#: plugins/check_ntp.c:869 plugins/check_ntp_peer.c:710 +#: plugins/check_ntp.c:870 plugins/check_ntp_peer.c:710 msgid "Warning threshold for jitter" msgstr "" -#: plugins/check_ntp.c:871 plugins/check_ntp_peer.c:712 +#: plugins/check_ntp.c:872 plugins/check_ntp_peer.c:712 msgid "Critical threshold for jitter" msgstr "" -#: plugins/check_ntp.c:881 +#: plugins/check_ntp.c:882 msgid "Normal offset check:" msgstr "" -#: plugins/check_ntp.c:884 plugins/check_ntp_peer.c:737 +#: plugins/check_ntp.c:885 plugins/check_ntp_peer.c:737 msgid "" "Check jitter too, avoiding critical notifications if jitter isn't available" msgstr "" -#: plugins/check_ntp.c:885 plugins/check_ntp_peer.c:738 +#: plugins/check_ntp.c:886 plugins/check_ntp_peer.c:738 msgid "(See Notes above for more details on thresholds formats):" msgstr "" -#: plugins/check_ntp.c:890 plugins/check_ntp.c:897 +#: plugins/check_ntp.c:891 plugins/check_ntp.c:898 msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or" msgstr "" -#: plugins/check_ntp.c:891 plugins/check_ntp.c:898 +#: plugins/check_ntp.c:892 plugins/check_ntp.c:899 msgid "check_ntp_time instead." msgstr "" @@ -4949,8 +4943,8 @@ msgstr "" #: plugins/check_tcp.c:646 msgid "" -"Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or " -"quit option" +"Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send " +"or quit option" msgstr "" #: plugins/check_tcp.c:647 diff --git a/release b/release index 879b416..3e3c2f1 100644 --- a/release +++ b/release @@ -1 +1 @@ -2.1 +2.1.1