[utilities COMMIT] /changepass/trunk/src/main/java/net/shibboleth/infra/passwd/PasswordChangeServlet.java

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul 30 16:18:51 2013
New Revision: 420

URL: http://svn.shibboleth.net/view/utilities?rev=420&view=rev
Log:
Changes suggested by Daniel

Modified:
    changepass/trunk/src/main/java/net/shibboleth/infra/passwd/PasswordChangeServlet.java

Modified: changepass/trunk/src/main/java/net/shibboleth/infra/passwd/PasswordChangeServlet.java
URL: http://svn.shibboleth.net/view/utilities/changepass/trunk/src/main/java/net/shibboleth/infra/passwd/PasswordChangeServlet.java?rev=420&r1=419&r2=420&view=diff
==============================================================================
--- changepass/trunk/src/main/java/net/shibboleth/infra/passwd/PasswordChangeServlet.java (original)
+++ changepass/trunk/src/main/java/net/shibboleth/infra/passwd/PasswordChangeServlet.java Tue Jul 30 16:18:51 2013
@@ -248,14 +248,12 @@
         log.debug("LDAP configuration. URL: {}, BaseDN: {}, UseID Field: {}", new Object[] {ldapUrl, ldapBaseDN,
                 ldapUserIdField,});
         final AuthenticatorConfig authConfig = new AuthenticatorConfig(ldapUrl, ldapBaseDN);
-        authConfig.setBatchSize(1);
         authConfig.setUserField(new String[] {ldapUserIdField});
         authConfig.setSearchScope(SearchScope.ONELEVEL);
         authConfig.setSearchResultHandlers(new SearchResultHandler[] {new FqdnSearchResultHandler(),
                 new EntryDnSearchResultHandler(),});
 
         final LdapConfig ldapConfig = new LdapConfig(ldapUrl, ldapBaseDN);
-        ldapConfig.setBatchSize(1);
         ldapConfig.setSearchScope(SearchScope.ONELEVEL);
         ldapConfig.setSearchResultHandlers(new SearchResultHandler[] {new FqdnSearchResultHandler(),
                 new EntryDnSearchResultHandler(),});
@@ -404,9 +402,12 @@
         log.debug("DN for user {} is {}", userid, userDn);
 
         final String shaPassword = "{SHA}" + new SHA1().digest(Convert.toBytes(newPassword), new Base64Converter());
-        ldap.modifyAttributes(userDn, AttributeModification.REPLACE,
-                AttributesFactory.createAttributes("userPassword", shaPassword));
-
+        try {
+            ldap.modifyAttributes(userDn, AttributeModification.REPLACE,
+                    AttributesFactory.createAttributes("userPassword", shaPassword));
+        } finally {
+            ldap.close();
+        }
     }
 
     /**