Merge pull request #289 from tsadpbb/change-ssl-to-nrpe-ssl

Change ssl to nrpe ssl
NagiosEnterprises · Dec 10, 2024 · fb7c38e · fb7c38e
2 parents c58dd52 + de18e4e
commit fb7c38e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 NRPE Changelog
 ==============
+[4.1.3](https://github.com/NagiosEnterprises/nrpe/releases/tag/nrpe-4.1.3) - 2024-12-10
+------------------
+**FIXES**
+- Change of ssl.c and ssl.h to nrpe-ssl.c and nrpe-ssl.h
+
+
+
 [4.1.2](https://github.com/NagiosEnterprises/nrpe/releases/tag/nrpe-4.1.2) - 2024-12-09
 ------------------
 **FIXES**
@@ -8,7 +15,6 @@ NRPE Changelog
 
 
 
-
 [4.1.1](https://github.com/NagiosEnterprises/nrpe/releases/tag/nrpe-4.1.1) - 2024-08-01
 ------------------
 **FIXES**

diff --git a/configure b/configure
@@ -7727,7 +7727,7 @@ if ac_fn_c_try_link "$LINENO"; then :
 
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-				SSL_OBJS="ssl.o"
+				SSL_OBJS="nrpe-ssl.o"
 
 
 else

diff --git a/include/ssl.h → include/nrpe-ssl.h b/include/ssl.h → include/nrpe-ssl.h
diff --git a/macros/ax_nagios_get_ssl b/macros/ax_nagios_get_ssl
@@ -297,7 +297,7 @@ if test x$SSL_TYPE != xNONE; then
 			[AC_LANG_PROGRAM([#include <${SSL_INC_PREFIX}${SSL_HDR}>], [SSL_new(NULL)])],
 			[
 				AC_MSG_RESULT([yes])
-				SSL_OBJS="ssl.o"
+				SSL_OBJS="nrpe-ssl.o"
 				$1
 			], [
 				AC_MSG_ERROR([no])

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -55,8 +55,8 @@ check_nrpe: $(srcdir)/check_nrpe.c utils.o $(SRC_INCLUDE)/utils.h $(CFG_INCLUDE)
 utils.o: $(srcdir)/utils.c $(SRC_INCLUDE)/utils.h $(CFG_INCLUDE)/common.h $(CFG_INCLUDE)/config.h
 	$(CC) $(CFLAGS) -c -o $@ $(srcdir)/utils.c
 
-ssl.o: $(srcdir)/ssl.c $(SRC_INCLUDE)/ssl.h $(CFG_INCLUDE)/common.h $(CFG_INCLUDE)/config.h
-	$(CC) $(CFLAGS) -c -o $@ $(srcdir)/ssl.c
+nrpe-ssl.o: $(srcdir)/nrpe-ssl.c $(SRC_INCLUDE)/nrpe-ssl.h $(CFG_INCLUDE)/common.h $(CFG_INCLUDE)/config.h
+	$(CC) $(CFLAGS) -c -o $@ $(srcdir)/nrpe-ssl.c
 
 @SSL_DH_HEADER_MAKE@
 
@@ -88,7 +88,7 @@ install-uninstall:
 	$(INSTALL) -m 755 ../uninstall $(SBINDIR)/nrpe-uninstall
 
 clean:
-	rm -f core nrpe check_nrpe generate_dh_params utils.o ssl.o $(SNPRINTF_O) $(SSL_DH_HEADER)
+	rm -f core nrpe check_nrpe generate_dh_params utils.o nrpe-ssl.o $(SNPRINTF_O) $(SSL_DH_HEADER)
 	rm -f *~ */*~
 	rm -rf nrpe.dSYM check_nrpe.dSYM
 

diff --git a/src/check_nrpe.c b/src/check_nrpe.c
@@ -41,7 +41,7 @@
 #endif
 #include "common.h"
 #include "utils.h"
-#include "ssl.h"
+#include "nrpe-ssl.h"
 
 #define DEFAULT_NRPE_COMMAND "_NRPE_CHECK"	/* check version of NRPE daemon */
 

diff --git a/src/ssl.c → src/nrpe-ssl.c b/src/ssl.c → src/nrpe-ssl.c
@@ -2,7 +2,7 @@
 # include "config.h"
 #endif
 #include "common.h"
-#include "ssl.h"
+#include "nrpe-ssl.h"
 #include "utils.h"
 
 #ifdef HAVE_SSL

diff --git a/src/nrpe.c b/src/nrpe.c
@@ -41,7 +41,7 @@
 #include "nrpe.h"
 #include "utils.h"
 #include "acl.h"
-#include "ssl.h"
+#include "nrpe-ssl.h"
 
 #ifdef HAVE_SSL
 # if defined(USE_SSL_DH) && !defined(AUTO_SSL_DH)