/* This service group is already registered in the server */
return;
- if (!g->chosen_name) {
+ if (!g->chosen_name || (g->replace_wildcards && strstr(g->name, "%h"))) {
+
+ avahi_free(g->chosen_name);
if (g->replace_wildcards)
g->chosen_name = replacestr(g->name, "%h", avahi_server_get_host_name(avahi_server));
void static_service_load(int in_chroot) {
StaticServiceGroup *g, *n;
glob_t globbuf;
+ int globret;
char **p;
for (g = groups; g; g = n) {
}
memset(&globbuf, 0, sizeof(globbuf));
- if (glob(in_chroot ? "/services/*.service" : AVAHI_SERVICE_DIR "/*.service", GLOB_ERR, NULL, &globbuf) != 0)
- avahi_log_error("Failed to read service directory.");
+
+ if ((globret = glob(in_chroot ? "/services/*.service" : AVAHI_SERVICE_DIR "/*.service", GLOB_ERR, NULL, &globbuf)) != 0)
+
+ switch (globret) {
+#ifdef GLOB_NOSPACE
+ case GLOB_NOSPACE:
+ avahi_log_error("Not enough memory to read service directory "AVAHI_SERVICE_DIR".");
+ break;
+#endif
+#ifdef GLOB_NOMATCH
+ case GLOB_NOMATCH:
+ avahi_log_info("No service file found in "AVAHI_SERVICE_DIR".");
+ break;
+#endif
+ default:
+ avahi_log_error("Failed to read "AVAHI_SERVICE_DIR".");
+ break;
+ }
+
else {
for (p = globbuf.gl_pathv; *p; p++)
load_file(*p);