Commit d1c8a977 authored by Derek DeMoro's avatar Derek DeMoro Committed by derek

Updating for release.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@8550 b35dd754-fafc-0310-a699-88a17e54d16e
parent 1975b748
...@@ -285,7 +285,7 @@ public class XMPPServer { ...@@ -285,7 +285,7 @@ public class XMPPServer {
name = JiveGlobals.getProperty("xmpp.domain", "127.0.0.1").toLowerCase(); name = JiveGlobals.getProperty("xmpp.domain", "127.0.0.1").toLowerCase();
version = new Version(3, 3, 1, Version.ReleaseStatus.Release, 1); version = new Version(3, 3, 2, Version.ReleaseStatus.Release, 1);
if ("true".equals(JiveGlobals.getXMLProperty("setup"))) { if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
setupMode = false; setupMode = false;
} }
......
...@@ -72,7 +72,7 @@ public class GSSAPIAuthorizationProvider implements AuthorizationPolicy { ...@@ -72,7 +72,7 @@ public class GSSAPIAuthorizationProvider implements AuthorizationPolicy {
// Handle authorization policy // Handle authorization policy
if (currentPolicy == AuthPolicy.strict) { if (currentPolicy == AuthPolicy.strict) {
String serverName = XMPPServer.getInstance().getServerInfo().getName(); String serverName = XMPPServer.getInstance().getServerInfo().getName();
return (principal.equals(username) || principal.equals(username + "@" + serverName)); return (principal.equals(username) || principal.equals(username + "@" + serverName.toUpperCase()));
} }
else if (currentPolicy == AuthPolicy.loose) { else if (currentPolicy == AuthPolicy.loose) {
return (principal.startsWith(username + "@")); return (principal.startsWith(username + "@"));
......
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