Commit Diff


commit - 7a9137341fef189728dee52b6f14da510331e2449f37653a78f3621df31fbcea
commit + 48b4a683ef6d6981aeaa304c8927fec2a73c1381867fb5abdc6f45728c155af7
blob - 437888bd5a135f2d8dfe0bba47977c2de7316a83c3b5d3a3ce45f843fdf2aaf9
blob + b3544cc94c55dc33841cd3cd84e715c4c17d9718b934d05b806b9d36b3d7676d
--- gotwebd/config.c	
+++ gotwebd/config.c	
@@ -53,7 +53,6 @@ config_init(struct gotwebd *env)
 	strlcpy(env->httpd_chroot, D_HTTPD_CHROOT, sizeof(env->httpd_chroot));
 
 	env->prefork = GOTWEBD_NUMPROC;
-	env->server_cnt = 0;
 	TAILQ_INIT(&env->servers);
 	TAILQ_INIT(&env->sockets);
 	TAILQ_INIT(&env->addresses);
blob - e808ed443783e8346b26700312f4f212a2ca4fbcf5dce7badfd497178d1c881f
blob + f56f2b67936035a96dcf090b0339a67951a4864eb09d4531e0c369cc141e175a
--- gotwebd/gotwebd.c	
+++ gotwebd/gotwebd.c	
@@ -369,13 +369,8 @@ spawn_process(struct gotwebd *env, const char *argv0, 
 		argv[argc++] = "-F";
 		argv[argc++] = username;
 	} else if (proc_type == GOTWEBD_PROC_GOTWEB) {
-		char *s;
-
 		argv[argc++] = "-G";
 		argv[argc++] = username;
-		if (asprintf(&s, "-G%d", env->server_cnt) == -1)
-			fatal("asprintf");
-		argv[argc++] = s;
 	}
 	if (strcmp(env->gotwebd_conffile, GOTWEBD_CONF) != 0) {
 		argv[argc++] = "-f";
@@ -448,11 +443,7 @@ main(int argc, char **argv)
 			break;
 		case 'G':
 			proc_type = GOTWEBD_PROC_GOTWEB;
-			i = strtonum(optarg, 1, INT_MAX, &errstr);
-			if (errstr)
-				gotwebd_username = optarg;
-			else
-				env->server_cnt = i;
+			gotwebd_username = optarg;
 			break;
 		case 'f':
 			conffile = optarg;
blob - 4e15932d943b44cc7638ed03137b1d3277f047d18aef3ccdf33212f2fe4c1463
blob + 13ed57ef88d4c8724159b75a5eafbbba27a87d8edd819c1dc9c33a95c417e2b6
--- gotwebd/gotwebd.h	
+++ gotwebd/gotwebd.h	
@@ -422,8 +422,6 @@ struct gotwebd {
 	int		 gotweb_cur;
 	int		 *worker_load;
 
-	int		 server_cnt;
-
 	char		 httpd_chroot[PATH_MAX];
 };
 
blob - 87ab613a9db07f3d6f562ba54724c592f9a7476c66da6bc1ac5fd3a102fd9248
blob + f0467a85a7a175b93083123e65e38c8ce42477a559ca88b60f0270e1c11db871
--- gotwebd/parse.y	
+++ gotwebd/parse.y	
@@ -843,7 +843,7 @@ parse_config(const char *filename, struct gotwebd *env
 	}
 
 	/* just add default server if no config specified */
-	if (gotwebd->server_cnt == 0)
+	if (TAILQ_EMPTY(&gotwebd->servers))
 		add_default_server();
 
 	/* add the implicit listen on socket */
@@ -929,7 +929,6 @@ conf_new_server(const char *name)
 	srv->summary_tags_display = D_MAXSLTAGDISP;
 
 	TAILQ_INSERT_TAIL(&gotwebd->servers, srv, entry);
-	gotwebd->server_cnt++;
 
 	return srv;
 };