moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-14 11:42:23 -05:00
Code Issues Releases Wiki Activity

Fix from audit

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@777 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-10-12 20:27:50 +00:00
parent 60a24e5a64
commit 636eaeafd7
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/davmail/BundleMessage.java
View File

@ -24,13 +24,14 @@ import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.io.Serializable;
/** /**
* Internationalization message. * Internationalization message.
*/ */
public class BundleMessage { public class BundleMessage implements Serializable {
/** /**
* Root locale to get english messages for logging. * Root locale to get english messages for logging.
*/ */
public static final Locale ROOT_LOCALE = new Locale("", ""); public static final Locale ROOT_LOCALE = new Locale("", "");
protected static final String MESSAGE_BUNDLE_NAME = "davmailmessages"; protected static final String MESSAGE_BUNDLE_NAME = "davmailmessages";

12
src/java/davmail/ldap/LdapConnection.java
View File

@ -575,8 +575,6 @@ public class LdapConnection extends AbstractConnection {
// append personal contacts first // append personal contacts first
String filter = ldapFilter.getContactSearchFilter(); String filter = ldapFilter.getContactSearchFilter();
DavGatewayTray.debug(new BundleMessage("LOG_LDAP_REQ_SEARCH", currentMessageId, dn, scope, sizeLimit, timelimit, filter, returningAttributes));
for (Map<String, String> person : session.contactFind(filter).values()) { for (Map<String, String> person : session.contactFind(filter).values()) {
persons.put(person.get("uid"), person); persons.put(person.get("uid"), person);
@ -974,15 +972,15 @@ public class LdapConnection extends AbstractConnection {
} }
static interface LdapFilter { static interface LdapFilter {
public String getContactSearchFilter(); String getContactSearchFilter();
public Map<String, Map<String, String>> findInGAL(ExchangeSession session) throws IOException; Map<String, Map<String, String>> findInGAL(ExchangeSession session) throws IOException;
public void add(LdapFilter filter); void add(LdapFilter filter);
public boolean isFullSearch(); boolean isFullSearch();
public boolean isMatch(Map<String, String> person); boolean isMatch(Map<String, String> person);
} }
static class CompoundFilter implements LdapFilter { static class CompoundFilter implements LdapFilter {