mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
If Winsock based NetBIOS code is selected on 64bit Windows then switch it back to the older
Netbios() API code and output a warning. Remove unused import in X64. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2628 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -72,6 +72,7 @@ import org.alfresco.filesys.smb.Dialect;
|
|||||||
import org.alfresco.filesys.smb.DialectSelector;
|
import org.alfresco.filesys.smb.DialectSelector;
|
||||||
import org.alfresco.filesys.smb.ServerType;
|
import org.alfresco.filesys.smb.ServerType;
|
||||||
import org.alfresco.filesys.util.IPAddress;
|
import org.alfresco.filesys.util.IPAddress;
|
||||||
|
import org.alfresco.filesys.util.X64;
|
||||||
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
||||||
import org.alfresco.repo.security.authentication.NTLMMode;
|
import org.alfresco.repo.security.authentication.NTLMMode;
|
||||||
import org.alfresco.service.cmr.repository.NodeService;
|
import org.alfresco.service.cmr.repository.NodeService;
|
||||||
@@ -974,6 +975,19 @@ public class ServerConfiguration implements ApplicationListener
|
|||||||
setWin32WinsockNetBIOS( useWinsock);
|
setWin32WinsockNetBIOS( useWinsock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Force the older NetBIOS API code to be used on 64Bit Windows
|
||||||
|
|
||||||
|
if ( useWinsockNetBIOS() == true && X64.isWindows64())
|
||||||
|
{
|
||||||
|
// Log a warning
|
||||||
|
|
||||||
|
logger.warn("Using older Netbios() API code");
|
||||||
|
|
||||||
|
// Use the older NetBIOS API code
|
||||||
|
|
||||||
|
setWin32WinsockNetBIOS( false);
|
||||||
|
}
|
||||||
|
|
||||||
// Check if the current operating system is supported by the Win32
|
// Check if the current operating system is supported by the Win32
|
||||||
// NetBIOS handler
|
// NetBIOS handler
|
||||||
|
|
||||||
|
@@ -17,8 +17,6 @@
|
|||||||
|
|
||||||
package org.alfresco.filesys.util;
|
package org.alfresco.filesys.util;
|
||||||
|
|
||||||
import java.util.Properties;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* X64 Class
|
* X64 Class
|
||||||
*
|
*
|
||||||
|
Reference in New Issue
Block a user