[FIXED JENKINS-11719]

Using the latest com4j that supports 64bit ADSI.
jenkinsci · Apr 27, 2012 · ccb1339 · ccb1339
1 parent 8b4c00a
commit ccb1339
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.jvnet.com4j</groupId>
       <artifactId>com4j</artifactId>
-      <version>20080107</version>
+      <version>20120426-2</version>
     </dependency>
   </dependencies>
 

diff --git a/src/main/java/hudson/plugins/active_directory/ActiveDirectoryAuthenticationProvider.java b/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);
             }
         }