Some changes for problems found in initial AIX testing

build-aux/ax_nagios_get_paths

@@ -51,7 +51,7 @@ if test x$DBG_PATHS != x; then
 	echo
 	echo Incoming paths:
 	echo "    prefix        $prefix"
-	echo "    execprefix    $execprefix"
+	echo "    exec_prefix   $exec_prefix"
 	echo "    bindir        $bindir"
 	echo "    sbindir       $sbindir"
 	echo "    libexecdir    $libexecdir"
@@ -226,7 +226,7 @@ else
 	if test x"$sysconfdir" = x'${prefix}/etc'; then AS_UNSET(sysconfdir); fi
 
 	if test x"$prefix" = "xNONE"; then prefix="/usr"; fi
-	if test x"$exec_prefix" = "xNONE"; then exec_prefix=${prefix}; fi
+	if test x"$exec_prefix" = "xNONE"; then exec_prefix=$prefix; fi
 	if test x"$localstatedir" = x'${prefix}/var'; then
 		if test $opsys = "osx"; then
 			localstatedir="/private/var"
@@ -487,6 +487,20 @@ else
 
 fi
 
+eval prefix=$prefix
+eval exec_prefix=$exec_prefix
+eval bindir=$bindir
+eval sbindir=$sbindir
+eval datarootdir=$datarootdir
+eval datadir=$datadir
+eval libexecdir=$libexecdir
+eval brokersdir=$brokersdir
+eval pluginsdir=$pluginsdir
+eval cgibindir=$cgibindir
+eval pkglocalstatedir=$pkglocalstatedir
+eval webdir=$webdir
+eval localedir=$localedir
+
 #
 # Init scripts/files
 #

configure

@@ -3065,7 +3065,7 @@ if test x$DBG_PATHS != x; then
 	echo
 	echo Incoming paths:
 	echo "    prefix        $prefix"
-	echo "    execprefix    $execprefix"
+	echo "    exec_prefix   $exec_prefix"
 	echo "    bindir        $bindir"
 	echo "    sbindir       $sbindir"
 	echo "    libexecdir    $libexecdir"
@@ -3278,7 +3278,7 @@ else
 	if test x"$sysconfdir" = x'${prefix}/etc'; then { sysconfdir=; unset sysconfdir;}; fi
 
 	if test x"$prefix" = "xNONE"; then prefix="/usr"; fi
-	if test x"$exec_prefix" = "xNONE"; then exec_prefix=${prefix}; fi
+	if test x"$exec_prefix" = "xNONE"; then exec_prefix=$prefix; fi
 	if test x"$localstatedir" = x'${prefix}/var'; then
 		if test $opsys = "osx"; then
 			localstatedir="/private/var"
@@ -3541,6 +3541,20 @@ else
 
 fi
 
+eval prefix=$prefix
+eval exec_prefix=$exec_prefix
+eval bindir=$bindir
+eval sbindir=$sbindir
+eval datarootdir=$datarootdir
+eval datadir=$datadir
+eval libexecdir=$libexecdir
+eval brokersdir=$brokersdir
+eval pluginsdir=$pluginsdir
+eval cgibindir=$cgibindir
+eval pkglocalstatedir=$pkglocalstatedir
+eval webdir=$webdir
+eval localedir=$localedir
+
 #
 # Init scripts/files
 #

paths.in

@@ -4,10 +4,6 @@ wrout () {
 	if test "$2" != "N/A"; then printf "  %-20s %s\n" "$1" "$2"; fi
 }
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-datarootdir=@datarootdir@
-
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Paths are:"
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"

src/Makefile.in

@@ -59,7 +59,7 @@ nrpe: $(srcdir)/nrpe.c $(srcdir)/utils.c $(srcdir)/acl.c $(SRC_INCLUDE)/nrpe.h $
 	$(CC) $(CFLAGS) -o $@ $(srcdir)/nrpe.c $(srcdir)/utils.c $(srcdir)/acl.c $(LDFLAGS) $(SOCKETLIBS) $(LIBWRAPLIBS) $(SNPRINTF_O) $(OTHERLIBS)
 
 check_nrpe: $(srcdir)/check_nrpe.c $(srcdir)/utils.c $(SRC_INCLUDE)/utils.h $(SRC_INCLUDE)/common.h $(CFG_INCLUDE)/config.h
-	$(CC) $(CFLAGS) -o $@ $(srcdir)/check_nrpe.c $(srcdir)/utils.c $(LDFLAGS) $(SOCKETLIBS) $(OTHERLIBS)
+	$(CC) $(CFLAGS) -o $@ $(srcdir)/check_nrpe.c $(srcdir)/utils.c $(LDFLAGS) $(SOCKETLIBS) $(SNPRINTF_O) $(OTHERLIBS)
 
 install:
 	$(MAKE) install-plugin

src/nrpe.c

@@ -41,7 +41,7 @@ int       deny_severity = LOG_WARNING;
 #endif
 
 #ifdef HAVE_SSL
-# ifdef __sun
+# if defined(__sun) || defined(_AIX)
 SSL_METHOD *meth;
 # else
 const SSL_METHOD *meth;
@@ -276,10 +276,14 @@ void init_ssl(void)
 # endif
 	if (sslprm.ssl_min_ver == TLSv1)
 		meth = TLSv1_server_method();
+# ifdef SSL_TXT_TLSV1_1
 	if (sslprm.ssl_min_ver == TLSv1_1)
 		meth = TLSv1_1_server_method();
+#  ifdef SSL_TXT_TLSV1_2
 	if (sslprm.ssl_min_ver == TLSv1_2)
 		meth = TLSv1_2_server_method();
+#  endif
+# endif
 
 	ctx = SSL_CTX_new(meth);
 	if (ctx == NULL) {
@@ -330,7 +334,8 @@ void init_ssl(void)
 		/* use anonymous DH ciphers */
 		if (sslprm.allowDH == 2)
 			strcpy(sslprm.cipher_list, "ADH");
-		dh = get_dh2048();
+		/*dh = get_dh2048();*/
+		dh = get_dh1024();
 		SSL_CTX_set_tmp_dh(ctx, dh);
 		DH_free(dh);
 	}

startup/bsd-init

@@ -20,7 +20,7 @@
 sig_reload=HUP
 
 nrpe_enable=${nrpe_enable:-"NO"}
-command=${nrpe_program:-"${exec_prefix}/sbin/nrpe"}
+command=${nrpe_program:-"/usr/sbin/nrpe"}
 command_args="-c ${nrpe_configfile} -d"
 extra_commands=reload
 pidfile=${pidfile:-"/var/run/nrpe.pid"}

startup/debian-init

@@ -4,7 +4,7 @@
 #
 # Start/stop the nrpe daemon.
 
-NRPE_BIN=${exec_prefix}/sbin/nrpe
+NRPE_BIN=/usr/sbin/nrpe
 NRPE_CFG=/etc/nagios/nrpe.cfg
 PID_FILE=/var/run/nrpe/nrpe.pid
 

startup/default-inetd

@@ -1,2 +1,2 @@
 # Enable the following entry to enable the nrpe daemon
-#nrpe stream tcp nowait nagios ${exec_prefix}/sbin/nrpe -c /etc/nagios/nrpe.cfg --inetd
+#nrpe stream tcp nowait nagios /usr/sbin/nrpe -c /etc/nagios/nrpe.cfg --inetd

startup/default-init

@@ -18,7 +18,7 @@
 ### END INIT INFO
 
 
-NRPE_BIN=${exec_prefix}/sbin/nrpe
+NRPE_BIN=/usr/sbin/nrpe
 NRPE_CFG=/etc/nagios/nrpe.cfg
 LOCK_DIR=/var/lock/subsys
 LOCK_FILE=/var/lock/subsys/nrpe

startup/default-service

@@ -11,7 +11,7 @@ WantedBy=multi-user.target
 Type=forking
 Restart=on-abort
 PIDFile=/var/run/nrpe.pid
-ExecStart=${exec_prefix}/sbin/nrpe -c /etc/nagios/nrpe.cfg
+ExecStart=/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg
 ExecStopPost=/bin/rm -f /var/run/nrpe.pid
 TimeoutStopSec=60
 User=nagios

startup/default-xinetd

@@ -8,7 +8,7 @@ service nrpe
     wait            = no
     user            = nagios
     group           = nagios
-    server          = ${exec_prefix}/sbin/nrpe
+    server          = /usr/sbin/nrpe
     server_args     = -c /etc/nagios/nrpe.cfg --inetd
     only_from       = 127.0.0.1
     log_on_failure  += USERID

startup/mac-org.nagios.PKG_NAME.plist

@@ -9,7 +9,7 @@
 	<key>GroupName</key>
 	<string>nagios</string>
 	<key>Program</key>
-	<string>${exec_prefix}/sbin/nrpe</string>
+	<string>/usr/sbin/nrpe</string>
 	<key>ProgramArguments</key>
 	<array>
 		<string>-c</string>

startup/openrc-init

@@ -9,7 +9,7 @@
 opts="reload"
 # extra_started_commands="reload"		use this if OpenRC >= 0.9.4
 
-NRPE_BIN="${exec_prefix}/sbin/nrpe"
+NRPE_BIN="/usr/sbin/nrpe"
 NRPE_PID="/var/run/nrpe/nrpe.pid"
 
 depend() {

startup/solaris-PKG_NAME.xml

@@ -96,7 +96,7 @@
 			type='method'
 			name='start'
 			exec='/usr/sfw/sbin/tcpd -c /etc/nagios/nrpe.cfg -i'
-			arg0='${exec_prefix}/sbin/nrpe'
+			arg0='/usr/sbin/nrpe'
 			timeout_seconds='60'/>
 
 		<exec_method