Merge pull request #8 from blt04/fix-ldaps

[JENKINS-21073] Fix forceLdaps system property
jenkinsci · Mar 10, 2014 · a700b73 · a700b73
2 parents 45dfbcc + e870166
commit a700b73
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/active_directory/ActiveDirectorySecurityRealm.java b/src/main/java/hudson/plugins/active_directory/ActiveDirectorySecurityRealm.java
@@ -556,7 +556,7 @@ public int compareTo(PrioritizedSocketInfo that) {
                         // map to LDAPS ports. I don't think there's any SRV records specifically for LDAPS.
                         // I think Microsoft considers LDAP+TLS the way to go, or else there should have been
                         // separate SRV entries.
-                        if (port==389)  port=686;
+                        if (port==389)  port=636;
                         if (port==3268) port=3269;
                     }
                     int p = Integer.parseInt(fields[0]);
@@ -621,5 +621,5 @@ protected UserDetails authenticate(String username, String password) throws Auth
      * One legitimate use case is when the domain controller is Windows 2000, which doesn't support TLS
      * (according to http://support.microsoft.com/kb/321051).
      */
-    public static boolean FORCE_LDAPS = Boolean.getBoolean(ActiveDirectoryUnixAuthenticationProvider.class.getName()+".forceLdaps");
+    public static boolean FORCE_LDAPS = Boolean.getBoolean(ActiveDirectorySecurityRealm.class.getName()+".forceLdaps");
 }