zeroconf: fail if avahi service name is invalid

If the configured avahi service name is invalid, abort MPD. Don't fall back to the default service name.

zeroconf: fail if avahi service name is invalid
bbed3582 · Max Kellermann · e9a3c4ce · bbed3582
Commit bbed3582 authored Dec 30, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

zeroconf.c src/zeroconf.c +4 -8

No files found.
--- a/src/zeroconf.c
+++ b/src/zeroconf.c
@@ -448,14 +448,10 @@ static void init_avahi(const char *serviceName)
 	int error;
 	g_debug("Avahi: Initializing interface");

-	if (avahi_is_valid_service_name(serviceName)) {
-		avahiName = avahi_strdup(serviceName);
-	} else {
-		g_warning("Invalid zeroconf_name \"%s\", defaulting to "
-			  "\"%s\" instead.",
-			  serviceName, SERVICE_NAME);
-		avahiName = avahi_strdup(SERVICE_NAME);
-	}
+	if (!avahi_is_valid_service_name(serviceName))
+		g_error("Invalid zeroconf_name \"%s\"", serviceName);
+
+	avahiName = avahi_strdup(serviceName);

 	avahiRunning = 1;