--- nagios-plugins-1.4-beta1/plugins/check_nagios.c.orig	2004-12-26 09:17:44 +1000

+++ nagios-plugins-1.4-beta1/plugins/check_nagios.c	2005-01-08 02:14:48 +1000

@@ -54,7 +54,7 @@

 	int procrss = 0;

 	float procpcpu = 0;

 	char procstat[8];

-	char procetime[MAX_INPUT_BUFFER];

+	/* char procetime[MAX_INPUT_BUFFER]; */

 	char procprog[MAX_INPUT_BUFFER];

 	char *procargs;

 	int pos, cols;

--- nagios-plugins-1.4-beta1/plugins/check_dhcp.c.orig	2005-01-08 02:11:52 +1000

+++ nagios-plugins-1.4-beta1/plugins/check_dhcp.c	2005-01-08 02:14:10 +1000

@@ -456,7 +456,7 @@

 	if (verbose) {

 		printf(_("DHCPDISCOVER to %s port %d\n"),inet_ntoa(sockaddr_broadcast.sin_addr),ntohs(sockaddr_broadcast.sin_port));

-		printf("DHCPDISCOVER XID: %lu (0x%X)\n",ntohl(discover_packet.xid),ntohl(discover_packet.xid));

+		printf("DHCPDISCOVER XID: %u (0x%X)\n",ntohl(discover_packet.xid),ntohl(discover_packet.xid));

 		printf("DHCDISCOVER ciaddr:  %s\n",inet_ntoa(discover_packet.ciaddr));

 		printf("DHCDISCOVER yiaddr:  %s\n",inet_ntoa(discover_packet.yiaddr));

 		printf("DHCDISCOVER siaddr:  %s\n",inet_ntoa(discover_packet.siaddr));

@@ -480,7 +480,7 @@

 	dhcp_packet offer_packet;

 	struct sockaddr_in source;

 	int result=OK;

-	int timeout=1;

+	/* int timeout=1; */

 	int responses=0;

 	int x;

 	time_t start_time;

@@ -519,13 +519,13 @@

 		if (verbose) {

 			printf(_("DHCPOFFER from IP address %s\n"),inet_ntoa(source.sin_addr));

-			printf("DHCPOFFER XID: %lu (0x%X)\n",ntohl(offer_packet.xid),ntohl(offer_packet.xid));

+			printf("DHCPOFFER XID: %u (0x%X)\n",ntohl(offer_packet.xid),ntohl(offer_packet.xid));

 		}

 		/* check packet xid to see if its the same as the one we used in the discover packet */

 		if(ntohl(offer_packet.xid)!=packet_xid){

 			if (verbose)

-				printf(_("DHCPOFFER XID (%lu) did not match DHCPDISCOVER XID (%lu) - ignoring packet\n"),ntohl(offer_packet.xid),packet_xid);

+				printf(_("DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n"),ntohl(offer_packet.xid),packet_xid);

 			continue;

 		        }

@@ -576,7 +576,7 @@

 /* sends a DHCP packet */

 int send_dhcp_packet(void *buffer, int buffer_size, int sock, struct sockaddr_in *dest){

-	struct sockaddr_in myname;

+	/* struct sockaddr_in myname; */

 	int result;

 	result=sendto(sock,(char *)buffer,buffer_size,0,(struct sockaddr *)dest,sizeof(*dest));