checks for start_tls were accidentally deleted
authorAlan T. DeKok <aland@freeradius.org>
Mon, 26 Jan 2015 22:11:22 +0000 (17:11 -0500)
committerAlan T. DeKok <aland@freeradius.org>
Mon, 26 Jan 2015 22:11:55 +0000 (17:11 -0500)
src/modules/rlm_ldap/rlm_ldap.c

index 702ec8e..0363f98 100644 (file)
@@ -759,6 +759,12 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
                         */
                        if (ldap_url->lud_scheme) {
                                if (strcmp(ldap_url->lud_scheme, "ldaps") == 0) {
+                                       if (inst->start_tls == true) {
+                                               cf_log_err_cs(conf, "ldaps:// scheme is not compatible "
+                                                             "with 'start_tls'");
+                                               return -1;
+                                       }
+
                                        port = inst->port ? inst->port : LDAPS_PORT;
 
                                } else if (strcmp(ldap_url->lud_scheme, "ldapi") == 0) {