Commit c7d55150 authored by Tom Evans's avatar Tom Evans

OF-779: Escape LDAP principal name for JID

Applied patch provided by StanK.
parent 20035851
...@@ -55,6 +55,7 @@ import org.jivesoftware.util.JiveGlobals; ...@@ -55,6 +55,7 @@ import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.JiveInitialLdapContext; import org.jivesoftware.util.JiveInitialLdapContext;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.xmpp.packet.JID;
/** /**
* Centralized administration of LDAP connections. The {@link #getInstance()} method * Centralized administration of LDAP connections. The {@link #getInstance()} method
...@@ -1920,7 +1921,7 @@ public class LdapManager { ...@@ -1920,7 +1921,7 @@ public class LdapManager {
result = result.substring(0,result.length()-suffixToTrim.length()); result = result.substring(0,result.length()-suffixToTrim.length());
} }
// Add this to the result. // Add this to the result.
results.add(result); results.add(JID.escapeNode(result));
} }
// Examine the paged results control response // Examine the paged results control response
Control[] controls = ctx.getResponseControls(); Control[] controls = ctx.getResponseControls();
...@@ -1977,7 +1978,7 @@ public class LdapManager { ...@@ -1977,7 +1978,7 @@ public class LdapManager {
result = result.substring(0,result.length()-suffixToTrim.length()); result = result.substring(0,result.length()-suffixToTrim.length());
} }
// Add this to the result. // Add this to the result.
results.add(result); results.add(JID.escapeNode(result));
} }
// Examine the paged results control response // Examine the paged results control response
Control[] controls = ctx2.getResponseControls(); Control[] controls = ctx2.getResponseControls();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment