1 files changed, 3 insertions, 1 deletions

diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index a2f0dee6..fc1d3c6c 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -101,12 +101,14 @@ main (int argc, char *argv[])
 
         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);