[Nagiosplug-checkins] nagiosplug/plugins check_ldap.c,1.36,1.37

[Matthias Eble]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6228

Modified Files:
	check_ldap.c 
Log Message:
Fixed default behaviour of check_ldaps


Index: check_ldap.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ldap.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- check_ldap.c	20 Jun 2007 11:00:20 -0000	1.36
+++ check_ldap.c	20 Jun 2007 11:09:47 -0000	1.37
@@ -101,12 +101,14 @@
 
 	if (strstr(argv[0],"check_ldaps")) {
 		asprintf (&progname, "check_ldaps");
-		starttls = TRUE;
  	}
 	
 	if (process_arguments (argc, argv) == ERROR)
 		usage4 (_("Could not parse arguments"));
 
+	if (strstr(argv[0],"check_ldaps") && ! starttls && ! ssl_on_connect)
+		starttls = TRUE;
+
 	/* initialize alarm signal handling */
 	signal (SIGALRM, socket_timeout_alarm_handler);