Bugfix for the welcome message.

diff --git a/components/discovery/discoverycomponent.cpp b/components/discovery/discoverycomponent.cpp
index bd1f3e1bf2b67989ac0051cc6b612358a2c9d4ce..7d42b0221ce46cd86b227fad216f954966b0ba86 100644 (file)
--- a/components/discovery/discoverycomponent.cpp
+++ b/components/discovery/discoverycomponent.cpp
@@ -484,7 +484,9 @@ void DiscoveryComponent::ProcessDiscoveryMessage(string identity, DiscoveryMessa
        if (IsBroker())
                SendDiscoveryMessage("discovery::NewComponent", identity, Endpoint::Ptr());
 
-       if (endpoint)
+       /* don't send a welcome message for discovery::RegisterComponent
+          messages unless we're a broker */
+       if (endpoint && (trusted || IsBroker()))
                FinishDiscoverySetup(endpoint);
 }