point readme to the latest release always, enable some debug logging

Zimbra-Community · Jul 3, 2019 · d39fa3b · d39fa3b
1 parent 4f0f3d7
commit d39fa3b
Show file tree

Hide file tree

Showing 5 changed files with 137 additions and 28 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ You can get any ldaps ssl certificate by using OpenSSL: openssl s_client -connec
 Review your LDAP configuration in the commands below and then copy-paste them:
 
       mkdir -p /opt/zimbra/lib/ext/adpassword
-      wget https://github.com/Zimbra-Community/ADPassword/releases/download/0.0.4/ADPassword.jar -O /opt/zimbra/lib/ext/adpassword/adPassword.jar 
+      wget https://github.com/Zimbra-Community/ADPassword/raw/master/out/artifacts/ADPassword_jar/ADPassword.jar -O /opt/zimbra/lib/ext/adpassword/adPassword.jar 
       su zimbra
       zmprov md domain.ext zimbraAuthLdapBindDn "%[email protected]"
       zmprov md domain.ext zimbraAuthLdapSearchBase "CN=Users,DC=DOMAIN,DC=EXT"

diff --git a/out/artifacts/ADPassword_jar/ADPassword.jar b/out/artifacts/ADPassword_jar/ADPassword.jar
diff --git a/out/production/ADPassword/it/iknowconsulting/adpassword/ADConnection.class b/out/production/ADPassword/it/iknowconsulting/adpassword/ADConnection.class
diff --git a/src/it/iknowconsulting/adpassword/ADConnection.java b/src/it/iknowconsulting/adpassword/ADConnection.java
@@ -81,7 +81,10 @@ public void updatePassword(Account acct, String password) throws NamingException
         }
         else
         {
-            ldapContext.modifyAttributes(fetchUser(username), mods);                                
+            System.out.print("ADPassword->ADConnection->updatePassword->username: "+ username);
+            System.out.print("ADPassword->ADConnection->updatePassword->fetchUser(username): "+ fetchUser(username));
+            System.out.print("ADPassword->ADConnection->updatePassword->mods: "+ mods);
+            ldapContext.modifyAttributes(fetchUser(username), mods);
         }
     }
 
@@ -91,9 +94,11 @@ String fetchUser(String username) throws NamingException {
         searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
         searchControls.setReturningAttributes(returnedAttrs);
         String searchFilter = authLdapSearchFilter.replace("%u",username);
+        System.out.print("ADPassword->ADConnection->fetchUser->searchFilter: "+ searchFilter);
         NamingEnumeration results = ldapContext.search(authLdapSearchBase, searchFilter, searchControls);
 
-        SearchResult sr = (SearchResult) results.next();           
+        SearchResult sr = (SearchResult) results.next();
+        System.out.print("ADPassword->ADConnection->fetchUser->getNameInNamespace: "+ sr.getNameInNamespace());
         return sr.getNameInNamespace();              
     }
 }