From 29da65708aea27a1a5a3542af95b63a89495360b Mon Sep 17 00:00:00 2001
From: Gary Spencer <gary.spencer@alfresco.com>
Date: Tue, 24 Jan 2006 13:51:00 +0000
Subject: [PATCH] Added defaulting of domain/workgroup name to 'WORKGROUP' when
 the domain cannot be resolved via network broadcast. Also outputs a message
 to indicate the domain was defaulted and possible causes (firewall
 settings/broadcast mask). Added hint message to check the broadcast mask when
 the host announcer fails with an IOException.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2185 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../server/config/ServerConfiguration.java    | 21 +++++++++++++++----
 .../filesys/smb/mailslot/HostAnnouncer.java   | 14 ++++++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java b/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
index dc0046cdc8..90def79969 100644
--- a/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
+++ b/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
@@ -590,7 +590,23 @@ public class ServerConfiguration
         {
             // Get the local domain/workgroup name
 
-            setDomainName(getLocalDomainName());
+            String localDomain = getLocalDomainName();
+            
+            if ( localDomain == null && getPlatformType() != PlatformType.WINDOWS)
+            {
+                // Use a default domain/workgroup name
+                
+                localDomain = "WORKGROUP";
+                
+                // Output a warning
+                
+                logger.error("Failed to get local domain/workgroup name, using default of " + localDomain);
+                logger.error("(This may be due to firewall settings or incorrect <broadcast> setting)");
+            }
+            
+            // Set the local domain/workgroup that the CIFS server belongs to
+            
+            setDomainName( localDomain);
         }
 
         // Check for a server comment
@@ -2251,12 +2267,9 @@ public class ServerConfiguration
 
                 if (nbName != null)
                     domainName = nbName.getName();
-                else
-                    throw new AlfrescoRuntimeException("Failed to find local domain/workgroup name");
             }
             catch (IOException ex)
             {
-                throw new AlfrescoRuntimeException("Failed to determine local domain/workgroup");
             }
         }
 
diff --git a/source/java/org/alfresco/filesys/smb/mailslot/HostAnnouncer.java b/source/java/org/alfresco/filesys/smb/mailslot/HostAnnouncer.java
index 73243fa2ed..117cc44a20 100644
--- a/source/java/org/alfresco/filesys/smb/mailslot/HostAnnouncer.java
+++ b/source/java/org/alfresco/filesys/smb/mailslot/HostAnnouncer.java
@@ -16,6 +16,8 @@
  */
 package org.alfresco.filesys.smb.mailslot;
 
+import java.io.IOException;
+
 import org.alfresco.filesys.netbios.NetBIOSName;
 import org.alfresco.filesys.smb.ServerType;
 import org.alfresco.filesys.smb.TransactionNames;
@@ -321,9 +323,19 @@ public abstract class HostAnnouncer extends Thread
                         sleepTime = sleepNormal;
                 }
             }
+            catch ( IOException ex)
+            {
+                // Debug
+
+                if (m_shutdown == false)
+                {
+                    logger.error("HostAnnouncer error", ex);
+                    logger.error(" Check <broadcast> setting in file-servers.xml");
+                }
+                m_shutdown = true;
+            }
             catch (Exception ex)
             {
-
                 // Debug
 
                 if (m_shutdown == false)