[nagiosplug] check_tcp: Print performance data even with -D

 Module: nagiosplug
 Branch: master
 Commit: cbc8a7f313c3e093165e544b4507539932c7f3e1
 Author: Holger Weiss <[email protected]>
   Date: Wed Jun 27 17:29:11 2012 +0200
    URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=cbc8a7f

check_tcp: Print performance data even with -D

When using the 1.4.15 release of the Nagios Plugins, a command such as

  check_tcp -H pop.example.com -p 995 -D 14

usually produced two lines of output, e.g.:

  OK - Certificate will expire on 12/13/2014 23:59.
  TCP OK - 0.009 second response time on port 995|time=0.008849s;;;0.000000;10.000000

The second line was removed by 4d06603060fc1233861b164870f0d3a2e0d8d2eb.
However, as the old two-line output is a valid (though in this case
unintended) way to spit out performance data, removing the second line
might break current setups.  Therefore, we revert to the old behaviour,
at least for the moment.

The issue was reported by Jochen Bern on the "nagiosplug-devel" mailing
list (Message-ID: <[email protected]>).

---

 plugins/check_tcp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 7b0f7f8..1bbb05a 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -238,7 +238,7 @@ main (int argc, char **argv)
 			result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
 		}
 	}
-	if(result != STATE_OK || check_cert == TRUE){
+	if(result != STATE_OK){
 		np_net_ssl_cleanup();
 		if(sd) close(sd);
 		return result;


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/