From a01c271460a37f24a8ebeffe54029690da448f94 Mon Sep 17 00:00:00 2001
From: c-a-m <cam.morris@owasp.org>
Date: Wed, 21 Jan 2015 10:36:13 -0700
Subject: [PATCH] ldap: changes default AD URL to be clear-text

If no URL is set, it is derived from the URL.  Now it will default to clear-text and port 389

Original commit: elastic/x-pack-elasticsearch@6d1b9d3e421ee1cd8851caf69ead576ad0a85d4c
---
 .../active_directory/ActiveDirectoryConnectionFactory.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/elasticsearch/shield/authc/active_directory/ActiveDirectoryConnectionFactory.java b/src/main/java/org/elasticsearch/shield/authc/active_directory/ActiveDirectoryConnectionFactory.java
index b6bea827dbe..239b46641a8 100644
--- a/src/main/java/org/elasticsearch/shield/authc/active_directory/ActiveDirectoryConnectionFactory.java
+++ b/src/main/java/org/elasticsearch/shield/authc/active_directory/ActiveDirectoryConnectionFactory.java
@@ -62,7 +62,7 @@ public class ActiveDirectoryConnectionFactory extends ConnectionFactory<ActiveDi
         userSearchScope = SearchScope.resolve(settings.get(AD_USER_SEARCH_SCOPE_SETTING), SearchScope.SUB_TREE);
         userSearchFilter = settings.get(AD_USER_SEARCH_FILTER_SETTING, "(&(objectClass=user)(|(sAMAccountName={0})(userPrincipalName={0}@" + domainName + ")))");
         timeout = settings.getAsTime(TIMEOUT_LDAP_SETTING, TIMEOUT_DEFAULT);
-        String[] ldapUrls = settings.getAsArray(URLS_SETTING, new String[] { "ldaps://" + domainName + ":636" });
+        String[] ldapUrls = settings.getAsArray(URLS_SETTING, new String[] { "ldap://" + domainName + ":389" });
 
         ImmutableMap.Builder<String, Serializable> builder = ImmutableMap.<String, Serializable>builder()
                 .put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory")