Allow CIFS server to be disabled by removing the configuration section

from file-servers.xml.
Fixed check for disabling FTP server if config section is not available.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2149 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2006-01-19 15:36:08 +00:00
parent 5ce4763360
commit e7a04ebff4

View File

@@ -507,6 +507,14 @@ public class ServerConfiguration
*/ */
private final void processCIFSServerConfig(Config config) private final void processCIFSServerConfig(Config config)
{ {
// If the configuration section is not valid then CIFS is disabled
if ( config == null || config.getConfigElements().isEmpty())
{
setSMBServerEnabled(false);
return;
}
// Get the network broadcast address // Get the network broadcast address
// //
// Note: We need to set this first as the call to getLocalDomainName() may use a NetBIOS // Note: We need to set this first as the call to getLocalDomainName() may use a NetBIOS
@@ -1072,7 +1080,7 @@ public class ServerConfiguration
{ {
// If the configuration section is not valid then FTP is disabled // If the configuration section is not valid then FTP is disabled
if ( config == null) if ( config == null || config.getConfigElements().isEmpty())
{ {
setFTPServerEnabled(false); setFTPServerEnabled(false);
return; return;