mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merge 3.1 to HEAD
13777: Fix NTLM filter cannot resolve server name when CIFS is disabled. ETHREEOH-1751. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13779 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -176,6 +176,8 @@ public abstract class BaseSSOAuthenticationFilter implements DependencyInjectedF
|
|||||||
if (serverConfigurationBean != null)
|
if (serverConfigurationBean != null)
|
||||||
{
|
{
|
||||||
m_srvName = serverConfigurationBean.getServerName();
|
m_srvName = serverConfigurationBean.getServerName();
|
||||||
|
if ( m_srvName.length() == 0)
|
||||||
|
m_srvName = null;
|
||||||
|
|
||||||
if (m_srvName != null)
|
if (m_srvName != null)
|
||||||
{
|
{
|
||||||
@@ -204,6 +206,11 @@ public abstract class BaseSSOAuthenticationFilter implements DependencyInjectedF
|
|||||||
|
|
||||||
// DEBUG
|
// DEBUG
|
||||||
|
|
||||||
|
if ( getLogger().isInfoEnabled())
|
||||||
|
getLogger().info("NTLM filter using server name " + m_srvName);
|
||||||
|
|
||||||
|
// DEBUG
|
||||||
|
|
||||||
if ( getLogger().isInfoEnabled())
|
if ( getLogger().isInfoEnabled())
|
||||||
getLogger().info("NTLM filter using server name " + m_srvName);
|
getLogger().info("NTLM filter using server name " + m_srvName);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user