Commit Diff

Commit:
46ed2a07cb70f0048a077607cbd491a4ab038cfb
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
fix gotd reload when /etc/gotd-secrets.conf is used When sending the configuration to the newly reloaded gotd process we must send the path to the secrets file if it is being used. Otherwise, the new process will die with "unexpected amount of data received in imsg" errors. Test coverage will be added later as part of some new gotsysd tests which I have in progress.
Actions:
Patch | Tree
commit - 5400b2df83f1447d73ff30ed10d04cf1d2a78b1e
commit + 46ed2a07cb70f0048a077607cbd491a4ab038cfb
blob - 70889e25ecfc220858913785552e9a1c82bae160
blob + b128ca300c38f9d014778d91eb2808924ccfd47f
--- gotd/gotd.c
+++ gotd/gotd.c
@@ -609,7 +609,10 @@ send_reload_config(struct gotd_imsgev *iev)
 	}
 
 	if (imsg_compose(&iev->ibuf, GOTD_IMSG_RELOAD_SECRETS,
-	    GOTD_PROC_GOTD, gotd.pid, gotd_reload_secrets_fd, NULL, 0) == -1) {
+	    GOTD_PROC_GOTD, gotd.pid, gotd_reload_secrets_fd,
+	    gotd_reload_secrets_path ? gotd_reload_secrets_path : NULL,
+	    gotd_reload_secrets_path ? strlen(gotd_reload_secrets_path) : 0)
+	    == -1) {
 		err = got_error_from_errno("imsg compose RELOAD_SECRETS");
 		goto done;
 	}