Fix unintended restart of template siblings

Consider the case where [email protected] is an available template. When creating a [email protected] it will share the same base .conf as an existing [email protected], but we do not expect to restart bar just because foo is instantiated. Up until this change, all template siblings were considered "dirty" if a new one was created or updated. Skipping realpath() for all files that have a '@' works around the problem. Signed-off-by: Joachim Wiberg <[email protected]>
troglobit · Nov 28, 2024 · 465bc17 · 465bc17
1 parent d4889b4
commit 465bc17
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/conf.c b/src/conf.c
@@ -1432,16 +1432,22 @@ static int conf_change_act(char *dir, char *name, uint32_t mask)
 		strlcpy(fn, dir, sizeof(fn));
 	dbg("path: %s mask: %08x", fn, mask);
 
-	/* Handle disabling/removal of service */
-	rp = realpath(fn, NULL);
-	if (!rp) {
-		if (errno != ENOENT)
-			goto fail;
+	if (strchr(name, '@')) {
+		/* Skip realpath for templates */
 		rp = strdup(fn);
-		if (!rp)
-			goto fail;
+	} else {
+		/* Handle disabling/removal of service */
+		rp = realpath(fn, NULL);
+		if (!rp) {
+			if (errno != ENOENT)
+				goto fail;
+			rp = strdup(fn);
+		}
 	}
 
+	if (!rp)
+		goto fail;
+
 	node = conf_find(rp);
 	if (node) {
 		dbg("event already registered for %s ...", name);