Commit Diff

Commit:
1f1500d02d7af72fec3e47773d106a4650c7f22c
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
send global auth config to children just once
Actions:
Patch | Tree
commit - b6f078d8ec4fb6e2634be812086143fd9e43fb27
commit + 1f1500d02d7af72fec3e47773d106a4650c7f22c
blob - 62b0be194a7612e91344d7579426bb773cfe3f78
blob + b62716ce1e8a2f3653daefcdb42db84353da659c
--- gotwebd/gotwebd.c
+++ gotwebd/gotwebd.c
@@ -792,22 +792,6 @@ gotwebd_configure(struct gotwebd *env, uid_t uid, gid_
 		if (main_compose_gotweb(env, GOTWEBD_IMSG_CFG_SRV,
 		    -1, srv, sizeof(*srv)) == -1)
 			fatal("main_compose_gotweb GOTWEBD_IMSG_CFG_SRV");
-		if (main_compose_gotweb(env, GOTWEBD_IMSG_AUTH_CONF, -1,
-		    &env->auth_config, sizeof(env->auth_config)) == -1)
-			fatal("main_compose_login GOTWEB_IMSG_AUTH_CONF");
-		if (main_compose_gotweb(env, GOTWEBD_IMSG_WWW_UID, -1,
-		    &env->www_uid, sizeof(env->www_uid)) == -1)
-			fatal("main_compose_login GOTWEB_IMSG_WWW_UID");
-
-		if (main_compose_login(env, GOTWEBD_IMSG_AUTH_SECRET, -1,
-		    auth_token_secret, sizeof(auth_token_secret)) == -1)
-			fatal("main_compose_login GOTWEB_IMSG_AUTH_SECRET");
-		if (main_compose_login(env, GOTWEBD_IMSG_AUTH_CONF, -1,
-		    &env->auth_config, sizeof(env->auth_config)) == -1)
-			fatal("main_compose_login GOTWEB_IMSG_AUTH_CONF");
-		if (main_compose_login(env, GOTWEBD_IMSG_WWW_UID, -1,
-		    &env->www_uid, sizeof(env->www_uid)) == -1)
-			fatal("main_compose_login GOTWEB_IMSG_WWW_UID");
 	}
 
 	/* send our sockets */
@@ -816,6 +800,23 @@ gotwebd_configure(struct gotwebd *env, uid_t uid, gid_
 			fatalx("%s: send socket error", __func__);
 	}
 
+	if (main_compose_login(env, GOTWEBD_IMSG_AUTH_CONF, -1,
+	    &env->auth_config, sizeof(env->auth_config)) == -1)
+		fatal("main_compose_login GOTWEB_IMSG_AUTH_CONF");
+	if (main_compose_gotweb(env, GOTWEBD_IMSG_AUTH_CONF, -1,
+	    &env->auth_config, sizeof(env->auth_config)) == -1)
+		fatal("main_compose_login GOTWEB_IMSG_AUTH_CONF");
+
+	if (main_compose_login(env, GOTWEBD_IMSG_WWW_UID, -1,
+	    &env->www_uid, sizeof(env->www_uid)) == -1)
+		fatal("main_compose_login GOTWEB_IMSG_WWW_UID");
+	if (main_compose_gotweb(env, GOTWEBD_IMSG_WWW_UID, -1,
+	    &env->www_uid, sizeof(env->www_uid)) == -1)
+		fatal("main_compose_login GOTWEB_IMSG_WWW_UID");
+
+	if (main_compose_login(env, GOTWEBD_IMSG_AUTH_SECRET, -1,
+	    auth_token_secret, sizeof(auth_token_secret)) == -1)
+		fatal("main_compose_login GOTWEB_IMSG_AUTH_SECRET");
 	if (main_compose_auth(env, GOTWEBD_IMSG_AUTH_SECRET, -1,
 	    auth_token_secret, sizeof(auth_token_secret)) == -1)
 		fatal("main_compose_gotweb GOTWEB_IMSG_AUTH_SECRET");