fix logic of AVAHI_SERVER_REGISTERING state handling. Many clients assumed that

[catta] / avahi-utils / avahi-publish.c

diff --git a/avahi-utils/avahi-publish.c b/avahi-utils/avahi-publish.c
index 9ca2df21a38db473adc73aec9a729a3caf580851..77dc42276bb2f038630c4b4e8d1df64c59091b23 100644 (file)
--- a/avahi-utils/avahi-publish.c
+++ b/avahi-utils/avahi-publish.c
@@ -189,7 +189,11 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN
 
             if (config->verbose)
                 fprintf(stderr, "Host name conflict\n");
+
+            /* Fall through */
             
+        case AVAHI_CLIENT_S_REGISTERING:
+
             if (entry_group) {
                 avahi_entry_group_free(entry_group);
                 entry_group = NULL;
@@ -200,9 +204,9 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN
             
             if (config->verbose)
                 fprintf(stderr, "Waiting for daemon ...\n");
+            
             break;
             
-        case AVAHI_CLIENT_S_REGISTERING:
             ;
     }
 }