Browse files

[FIXED JENKINS-11719]

Using the latest com4j that supports 64bit ADSI.
  • Loading branch information...
1 parent 8b4c00a commit ccb1339d34f74e0611a2779ea372aac72494d370 @kohsuke kohsuke committed Apr 26, 2012
View
2 pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.jvnet.com4j</groupId>
<artifactId>com4j</artifactId>
- <version>20080107</version>
+ <version>20120426-2</version>
</dependency>
</dependencies>
View
6 src/main/java/hudson/plugins/active_directory/ActiveDirectoryAuthenticationProvider.java
@@ -98,7 +98,7 @@ protected UserDetails retrieveUser(String username, UsernamePasswordAuthenticati
getFullName(usr), getEmailAddress(usr), getTelehoneNumber(usr)
).updateUserInfo();
} finally {
- col.diposeAll();
+ col.disposeAll();
COM4J.removeListener(col);
}
}
@@ -159,7 +159,7 @@ private String getDnOfUserOrGroup(String userOrGroupname) throws UsernameNotFoun
cmd.activeConnection(con);
cmd.commandText("<LDAP://"+defaultNamingContext+">;(sAMAccountName="+userOrGroupname+");distinguishedName;subTree");
- _Recordset rs = cmd.execute(null, Variant.MISSING, -1/*default*/);
+ _Recordset rs = cmd.execute(null, Variant.getMissing(), -1/*default*/);
if(rs.eof())
throw new UsernameNotFoundException("No such user or group: "+userOrGroupname);
@@ -194,7 +194,7 @@ protected ActiveDirectoryGroupDetails compute(String groupname) {
} catch (UsernameNotFoundException e) {
return null; // failed to convert group name to DN
} finally {
- col.diposeAll();
+ col.disposeAll();
COM4J.removeListener(col);
}
}

0 comments on commit ccb1339

Please sign in to comment.