From c32808c8d74c4b5508689040863529c3676defc4 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 24 Jan 2012 14:08:10 -0800 Subject: [PATCH] [FIXED JENKINS-8152] Formatting error in the rootDN inference code. It shouldn't include attribute name. Originally-Committed-As: c99fc315dddf707dba3a2dea6a048bd76dce4c2e --- core/src/main/java/hudson/security/LDAPSecurityRealm.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/security/LDAPSecurityRealm.java b/core/src/main/java/hudson/security/LDAPSecurityRealm.java index fbe5188..37f94ac 100644 --- a/core/src/main/java/hudson/security/LDAPSecurityRealm.java +++ b/core/src/main/java/hudson/security/LDAPSecurityRealm.java @@ -325,8 +325,8 @@ public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm { DirContext ctx = new InitialDirContext(props); Attributes atts = ctx.getAttributes(""); Attribute a = atts.get("defaultNamingContext"); - if(a!=null) // this entry is available on Active Directory. See http://msdn2.microsoft.com/en-us/library/ms684291(VS.85).aspx - return a.toString(); + if(a!=null && a.get()!=null) // this entry is available on Active Directory. See http://msdn2.microsoft.com/en-us/library/ms684291(VS.85).aspx + return a.get().toString(); a = atts.get("namingcontexts"); if(a==null) {