[Nagiosplug-checkins] CVS: nagiosplug/plugins check_by_ssh.c,1.2,1.3

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv23365

Modified Files:
	check_by_ssh.c 
Log Message:
typo in options passed to ssh for ipv6.
fix by setting a generic hook for 1-char pasthhru options


Index: check_by_ssh.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_by_ssh.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** check_by_ssh.c	14 Aug 2002 19:04:29 -0000	1.2
--- check_by_ssh.c	18 Aug 2002 18:03:10 -0000	1.3
***************
*** 258,265 ****
  #ifdef HAVE_GETOPT_H
  		c =
! 			getopt_long (argc, argv, "+?Vvhft46:H:O:p:i:u:l:C:n:s:", long_options,
  									 &option_index);
  #else
! 		c = getopt (argc, argv, "+?Vvhft46:H:O:p:i:u:l:C:n:s:");
  #endif
  
--- 258,265 ----
  #ifdef HAVE_GETOPT_H
  		c =
! 			getopt_long (argc, argv, "+?Vvhft46H:O:p:i:u:l:C:n:s:", long_options,
  									 &option_index);
  #else
! 		c = getopt (argc, argv, "+?Vvhft46H:O:p:i:u:l:C:n:s:");
  #endif
  
***************
*** 294,300 ****
  			verbose = TRUE;
  			break;
- 		case 'f':									/* fork to background */
- 			comm = ssprintf (comm, "%s -f", comm);
- 			break;
  		case 't':									/* timeout period */
  			if (!is_integer (optarg))
--- 294,297 ----
***************
*** 328,336 ****
  			comm = ssprintf (comm, "%s -%c %s", comm, c, optarg);
  			break;
! 		case '4':									/* IPv4 */
! 			comm = ssprintf (comm, "%s -4", comm);
! 			break;
! 		case '6': 									/* IPv6 */
! 			comm = ssprintf (comm, "%s -4", comm);
  			break;
  		case 'C':									/* Command for remote machine */
--- 325,332 ----
  			comm = ssprintf (comm, "%s -%c %s", comm, c, optarg);
  			break;
! 		case '4':									/* Pass these switches directly to ssh */
! 		case '6': 								/* -4 for IPv4, -6 for IPv6 */
! 		case 'f':									/* fork to background */
! 			comm = ssprintf (comm, "%s -%c", comm, c);
  			break;
  		case 'C':									/* Command for remote machine */