[Nagiosplug-checkins] CVS: nagiosplug/plugins check_ping.c,1.17,1.18 check_ssh.c,1.8,1.9 check_tcp.c,1.25,1.26 netutils.c,1.10,1.11

[Jeremy T. Bouse]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv17048/plugins

Modified Files:
	check_ping.c check_ssh.c check_tcp.c netutils.c 
Log Message:
Corrections to get code to compile on systems without IPv6 support


Index: check_ping.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ping.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** check_ping.c	29 Jun 2003 19:22:26 -0000	1.17
--- check_ping.c	30 Jun 2003 18:52:38 -0000	1.18
***************
*** 228,232 ****
--- 228,236 ----
  			break;
  		case '6':	/* IPv6 only */
+ #ifdef USE_IPV6
  			address_family = AF_INET6;
+ #else
+ 			usage ("IPv6 support not available\n");
+ #endif
  			break;
  		case 'H':	/* hostname */

Index: check_ssh.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ssh.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** check_ssh.c	29 Jun 2003 06:36:55 -0000	1.8
--- check_ssh.c	30 Jun 2003 18:52:38 -0000	1.9
***************
*** 111,115 ****
--- 111,119 ----
  			break;
  		case '6':
+ #ifdef USE_IPV6
  			address_family = AF_INET6;
+ #else
+ 			usage ("IPv6 support not available\n");
+ #endif
  			break;
  		case 'H':									/* host */

Index: check_tcp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** check_tcp.c	29 Jun 2003 19:22:26 -0000	1.25
--- check_tcp.c	30 Jun 2003 18:52:38 -0000	1.26
***************
*** 450,454 ****
--- 450,458 ----
  			break;
  		case '6':
+ #ifdef USE_IPV6
  			address_family = AF_INET6;
+ #else
+ 			usage ("IPv6 support not available\n");
+ #endif
  			break;
  		case 'H':                 /* hostname */

Index: netutils.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** netutils.c	29 Jun 2003 19:17:27 -0000	1.10
--- netutils.c	30 Jun 2003 18:52:38 -0000	1.11
***************
*** 327,331 ****
--- 327,335 ----
  is_addr (char *address)
  {
+ #ifdef USE_IPV6
  	if (is_inet_addr (address) && address_family != AF_INET6)
+ #else
+ 	if (is_inet_addr (address))
+ #endif
  		return (TRUE);