From f25648d6bbfdefd25d8c366e3e6913927bd3fe75 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Wed, 6 Dec 2023 11:40:18 -0500 Subject: Prevent -lcrypto from showing up in Makefile dependencies --- plugins-root/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins-root') diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index 40aa020d..a80229e2 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am @@ -26,7 +26,7 @@ EXTRA_PROGRAMS = pst3 EXTRA_DIST = t pst3.c -BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a $(LIB_CRYPTO) +BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS) NETLIBS = $(NETOBJS) $(SOCKETLIBS) @@ -80,8 +80,8 @@ install-exec-local: $(noinst_PROGRAMS) ############################################################################## # the actual targets -check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) -check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) +check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) $(LIB_CRYPTO) +check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) $(LIB_CRYPTO) # -m64 needed at compiler and linker phase pst3_CFLAGS = @PST3CFLAGS@ -- cgit v1.2.3-74-g34f1 From 8fe3fc78299dbd5fc3612853a502a99fbaf35451 Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Fri, 29 Dec 2023 00:59:58 +0100 Subject: check_dhcp: Make implicit conversion explicit to dismiss warning --- plugins-root/check_dhcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins-root') diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c index 6b07df51..4b8f5e27 100644 --- a/plugins-root/check_dhcp.c +++ b/plugins-root/check_dhcp.c @@ -497,7 +497,7 @@ int send_dhcp_discover(int sock){ memcpy(&discover_packet.options[opts],&requested_address,sizeof(requested_address)); opts += sizeof(requested_address); } - discover_packet.options[opts++]=DHCP_OPTION_END; + discover_packet.options[opts++]= (char)DHCP_OPTION_END; /* unicast fields */ if(unicast) -- cgit v1.2.3-74-g34f1