Skip to content

Commit 8c92ade

Browse files
author
John C. Frickson
committed
Merge branch 'nrpe-3.1.1rc1'
2 parents ee2ef8a + 2fab0f7 commit 8c92ade

File tree

11 files changed

+168
-86
lines changed

11 files changed

+168
-86
lines changed

‎Changelog

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22
NRPE Changelog
33
**************
44

5+
3.1.1 - 2017-05-24
6+
------------------
7+
FIXES
8+
- The '--log-file=' or '-g' option is missing from the help (John Frickson)
9+
- check_nrpe = segfault when specifying a config file (John Frickson)
10+
- Alternate log file not being used soon enough (John Frickson)
11+
- Unable to compile v3.1.0rc1 with new SSL checks on rh5 (John Frickson)
12+
- Unable to compile nrpe-3.1.0 - undefined references to va_start, va_end (John Frickson)
13+
- Can't build on Debian Stretch, openssl 1.1.0c (John Frickson)
14+
- Fix build failure with -Werror=format-security (Bas Couwenberg)
15+
- Fixed a typo in `nrpe.spec.in` (John Frickson)
16+
- More detailed error logging for SSL (John Frickson)
17+
- Fix infinite loop when unresolvable host is in allowed_hosts (Nick / John Frickson)
18+
19+
520
3.1.0 - 2017-04-17
621
------------------
722
ENHANCEMENTS

‎configure

Lines changed: 39 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for nrpe 3.1.0-rc1.
3+
# Generated by GNU Autoconf 2.69 for nrpe 3.1.1.
44
#
55
# Report bugs to <nagios-users@lists.sourceforge.net>.
66
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
580580
# Identity of this package.
581581
PACKAGE_NAME='nrpe'
582582
PACKAGE_TARNAME='nrpe'
583-
PACKAGE_VERSION='3.1.0-rc1'
584-
PACKAGE_STRING='nrpe 3.1.0-rc1'
583+
PACKAGE_VERSION='3.1.1'
584+
PACKAGE_STRING='nrpe 3.1.1'
585585
PACKAGE_BUGREPORT='nagios-users@lists.sourceforge.net'
586586
PACKAGE_URL='https://www.nagios.org/downloads/nagios-core-addons/'
587587

@@ -757,6 +757,7 @@ with_logdir
757757
with_piddir
758758
with_pipedir
759759
enable_ssl
760+
with_need_dh
760761
with_ssl
761762
with_ssl_inc
762763
with_ssl_lib
@@ -1319,7 +1320,7 @@ if test "$ac_init_help" = "long"; then
13191320
# Omit some internal or obsolete options to make the list less imposing.
13201321
# This message is too long to be a string in the A/UX 3.1 sh.
13211322
cat <<_ACEOF
1322-
\`configure' configures nrpe 3.1.0-rc1 to adapt to many kinds of systems.
1323+
\`configure' configures nrpe 3.1.1 to adapt to many kinds of systems.
13231324
13241325
Usage: $0 [OPTION]... [VAR=VALUE]...
13251326
@@ -1369,7 +1370,7 @@ fi
13691370

13701371
if test -n "$ac_init_help"; then
13711372
case $ac_init_help in
1372-
short | recursive ) echo "Configuration of nrpe 3.1.0-rc1:";;
1373+
short | recursive ) echo "Configuration of nrpe 3.1.1:";;
13731374
esac
13741375
cat <<\_ACEOF
13751376
@@ -1422,6 +1423,7 @@ Optional Packages:
14221423
--with-logdir=DIR where log files should be placed
14231424
--with-piddir=DIR where the PID file should be placed
14241425
--with-pipedir=DIR where socket and pipe files should be placed
1426+
--with-need-dh set to 'no' to not include Diffie-Hellman SSL logic
14251427
--with-ssl=DIR sets location of the SSL installation
14261428
--with-ssl-inc=DIR sets location of the SSL include files
14271429
--with-ssl-lib=DIR sets location of the SSL libraries
@@ -1514,7 +1516,7 @@ fi
15141516
test -n "$ac_init_help" && exit $ac_status
15151517
if $ac_init_version; then
15161518
cat <<\_ACEOF
1517-
nrpe configure 3.1.0-rc1
1519+
nrpe configure 3.1.1
15181520
generated by GNU Autoconf 2.69
15191521
15201522
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2120,7 +2122,7 @@ cat >config.log <<_ACEOF
21202122
This file contains any messages produced by compilers while
21212123
running configure, to aid debugging if configure makes a mistake.
21222124
2123-
It was created by nrpe $as_me 3.1.0-rc1, which was
2125+
It was created by nrpe $as_me 3.1.1, which was
21242126
generated by GNU Autoconf 2.69. Invocation command line was
21252127
21262128
$ $0 $@
@@ -2485,9 +2487,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
24852487
24862488
24872489
PKG_NAME=nrpe
2488-
PKG_VERSION="3.1.0-rc1"
2490+
PKG_VERSION="3.1.1"
24892491
PKG_HOME_URL="http://www.nagios.org/"
2490-
PKG_REL_DATE="2017-04-06"
2492+
PKG_REL_DATE="2017-05-24"
24912493
RPM_RELEASE=1
24922494
24932495
LANG=C
@@ -3020,29 +3022,29 @@ fi
30203022
30213023
inetd_disabled=""
30223024
3023-
if test x"$init_type" = "xupstart"; then
3024-
inetd_type="upstart"
3025-
elif test "$opsys" = "osx"; then
3026-
inetd_type="launchd"
3027-
fi
3028-
3029-
if test x"$inetd_type" = x; then
3030-
case $dist_type in #(
3025+
case $dist_type in #(
30313026
solaris) :
30323027
if test x"$init_type" = "xsmf10" -o x"$init_type" = "xsmf11"; then
3033-
inetd_type="$init_type"
3034-
else
3035-
inetd_type="inetd"
3036-
fi ;; #(
3028+
inetd_type="$init_type"
3029+
else
3030+
inetd_type="inetd"
3031+
fi ;; #(
30373032
*bsd*) :
30383033
inetd_type=`ps -A -o comm -c | grep inetd` ;; #(
3034+
osx) :
3035+
inetd_type=`launchd` ;; #(
30393036
aix|hp-ux) :
30403037
inetd_type=`UNIX95= ps -A -o comm | grep inetd | head -1` ;; #(
30413038
*) :
3042-
inetd_type=`ps -C "inetd,xinetd" -o fname | grep -vi COMMAND` ;; #(
3039+
inetd_type=`ps -C "inetd,xinetd" -o fname | grep -vi COMMAND | head -1` ;; #(
30433040
*) :
30443041
;;
30453042
esac
3043+
3044+
if test x"$inetd_type" = x; then
3045+
if test x"$init_type" = "xupstart"; then
3046+
inetd_type="upstart"
3047+
fi
30463048
fi
30473049
30483050
if test x"$inetd_type" = x; then
@@ -4346,7 +4348,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
43464348
# report actual input values of CONFIG_FILES etc. instead of their
43474349
# values after options handling.
43484350
ac_log="
4349-
This file was extended by nrpe $as_me 3.1.0-rc1, which was
4351+
This file was extended by nrpe $as_me 3.1.1, which was
43504352
generated by GNU Autoconf 2.69. Invocation command line was
43514353
43524354
CONFIG_FILES = $CONFIG_FILES
@@ -4400,7 +4402,7 @@ _ACEOF
44004402
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
44014403
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
44024404
ac_cs_version="\\
4403-
nrpe config.status 3.1.0-rc1
4405+
nrpe config.status 3.1.1
44044406
configured by $0, generated by GNU Autoconf 2.69,
44054407
with options \\"\$ac_cs_config\\"
44064408
@@ -7278,9 +7280,19 @@ else
72787280
fi
72797281
72807282
7283+
need_dh=yes
7284+
7285+
# Check whether --with-need_dh was given.
7286+
if test "${with_need_dh+set}" = set; then :
7287+
withval=$with_need_dh; need_dh=$withval
7288+
else
7289+
nrpe_group=need_dh
7290+
fi
7291+
7292+
72817293
if test x$check_for_ssl = xyes; then
72827294
# need_dh should only be set for NRPE
7283-
need_dh=yes
7295+
# need_dh=yes
72847296
72857297
72867298
# -------------------------------
@@ -8272,7 +8284,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
82728284
# report actual input values of CONFIG_FILES etc. instead of their
82738285
# values after options handling.
82748286
ac_log="
8275-
This file was extended by nrpe $as_me 3.1.0-rc1, which was
8287+
This file was extended by nrpe $as_me 3.1.1, which was
82768288
generated by GNU Autoconf 2.69. Invocation command line was
82778289
82788290
CONFIG_FILES = $CONFIG_FILES
@@ -8335,7 +8347,7 @@ _ACEOF
83358347
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
83368348
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
83378349
ac_cs_version="\\
8338-
nrpe config.status 3.1.0-rc1
8350+
nrpe config.status 3.1.1
83398351
configured by $0, generated by GNU Autoconf 2.69,
83408352
with options \\"\$ac_cs_config\\"
83418353

‎configure.ac

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ define([AC_CACHE_LOAD],)
55
define([AC_CACHE_SAVE],)
66

77
m4_include([build-aux/custom_help.m4])
8-
AC_INIT([nrpe],[3.1.0-rc1],[nagios-users@lists.sourceforge.net],[nrpe],[https://www.nagios.org/downloads/nagios-core-addons/])
8+
AC_INIT([nrpe],[3.1.1],[nagios-users@lists.sourceforge.net],[nrpe],[https://www.nagios.org/downloads/nagios-core-addons/])
99
AC_CONFIG_SRCDIR([src/nrpe.c])
1010
AC_CONFIG_AUX_DIR([build-aux])
1111
AC_PREFIX_DEFAULT(/usr/local/nagios)
1212

1313
PKG_NAME=nrpe
14-
PKG_VERSION="3.1.0-rc1"
14+
PKG_VERSION="3.1.1"
1515
PKG_HOME_URL="http://www.nagios.org/"
16-
PKG_REL_DATE="2017-04-06"
16+
PKG_REL_DATE="2017-05-24"
1717
RPM_RELEASE=1
1818

1919
LANG=C
@@ -304,10 +304,16 @@ AC_ARG_ENABLE([ssl],
304304
fi
305305
],check_for_ssl=yes)
306306

307+
need_dh=yes
308+
AC_ARG_WITH([need_dh],
309+
AS_HELP_STRING([--with-need-dh],[set to 'no' to not include Diffie-Hellman SSL logic]),
310+
[need_dh=$withval],
311+
[nrpe_group=need_dh])
312+
307313
dnl Optional SSL library and include paths
308314
if test x$check_for_ssl = xyes; then
309315
# need_dh should only be set for NRPE
310-
need_dh=yes
316+
# need_dh=yes
311317
AC_NAGIOS_GET_SSL
312318
fi
313319

‎include/common.h.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* COMMON.H - NRPE Common Include File
44
* Copyright (c) 1999-2007 Ethan Galstad (nagios@nagios.org)
5-
* Last Modified: 2017-04-06
5+
* Last Modified: 2017-05-24
66
*
77
* License:
88
*
@@ -33,8 +33,8 @@
3333
# endif
3434
#endif
3535

36-
#define PROGRAM_VERSION "3.1.0-rc1"
37-
#define MODIFICATION_DATE "2017-04-06"
36+
#define PROGRAM_VERSION "3.1.1"
37+
#define MODIFICATION_DATE "2017-05-24"
3838

3939
#define OK 0
4040
#define ERROR -1

‎macros/ax_nagios_get_inetd

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,29 +93,30 @@ AC_SUBST(inetd_type)
9393

9494
inetd_disabled=""
9595

96-
if test x"$init_type" = "xupstart"; then
97-
inetd_type="upstart"
98-
elif test "$opsys" = "osx"; then
99-
inetd_type="launchd"
100-
fi
96+
AS_CASE([$dist_type],
97+
[solaris],
98+
if test x"$init_type" = "xsmf10" -o x"$init_type" = "xsmf11"; then
99+
inetd_type="$init_type"
100+
else
101+
inetd_type="inetd"
102+
fi,
101103

102-
if test x"$inetd_type" = x; then
103-
AS_CASE([$dist_type],
104-
[solaris],
105-
if test x"$init_type" = "xsmf10" -o x"$init_type" = "xsmf11"; then
106-
inetd_type="$init_type"
107-
else
108-
inetd_type="inetd"
109-
fi,
104+
[*bsd*],
105+
inetd_type=`ps -A -o comm -c | grep inetd`,
106+
107+
[osx],
108+
inetd_type=`launchd`,
110109

111-
[*bsd*],
112-
inetd_type=`ps -A -o comm -c | grep inetd`,
110+
[aix|hp-ux],
111+
inetd_type=`UNIX95= ps -A -o comm | grep inetd | head -1`,
113112

114-
[aix|hp-ux],
115-
inetd_type=`UNIX95= ps -A -o comm | grep inetd | head -1`,
113+
[*],
114+
inetd_type=[`ps -C "inetd,xinetd" -o fname | grep -vi COMMAND | head -1`])
116115

117-
[*],
118-
inetd_type=[`ps -C "inetd,xinetd" -o fname | grep -vi COMMAND | head -1`])
116+
if test x"$inetd_type" = x; then
117+
if test x"$init_type" = "xupstart"; then
118+
inetd_type="upstart"
119+
fi
119120
fi
120121

121122
if test x"$inetd_type" = x; then

‎nrpe.spec.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%endif
1010
%if %{islinux}
1111
%define _init_dir @initdir@
12-
%define _init_tyhpe @init_type@
12+
%define _init_type @init_type@
1313
%define _exec_prefix %{_prefix}/sbin
1414
%define _bindir %{_prefix}/sbin
1515
%define _sbindir %{_prefix}/lib/nagios/cgi
@@ -22,7 +22,7 @@
2222
%define _sysconfdir /etc/nagios
2323

2424
%define name @PACKAGE_NAME@
25-
%define version 3.1.0-rc1
25+
%define version 3.1.1
2626
%define release @RPM_RELEASE@
2727
%define nsusr @nrpe_user@
2828
%define nsgrp @nrpe_group@

‎src/acl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,9 +565,9 @@ int is_an_allowed_host(int family, void *host)
565565
break;
566566
}
567567
}
568-
569-
dns_acl_curr = dns_acl_curr->next;
570568
}
569+
570+
dns_acl_curr = dns_acl_curr->next;
571571
}
572572
return 0;
573573
}

0 commit comments

Comments
 (0)