Commit Diff


commit - ba2b4eb52af4540e3b17c7b4ed198215ec6a8d49d3e04b688e75ad1a5e893fd3
commit + bdb4cc63d8f0fa38b367a99beaa48250d23ab557baa02bf39a4ab85df46ef80c
blob - b0403892324355ac8cac355e767062f6f4d3bbb165ff343bcea9818a9daaae57
blob + 2277906a75b307d6e8f3a9e1fd343833c5fe7957ec0c5ac48156d5223c92985e
--- gotwebd/auth.c	
+++ gotwebd/auth.c	
@@ -54,6 +54,28 @@ auth_shutdown(void)
 	free(env->iev_parent);
 	free(env->iev_sockets);
 	free(env->iev_gotweb);
+
+	config_free_access_rules(&gotwebd_env->access_rules);
+
+	while (!TAILQ_EMPTY(&gotwebd_env->servers)) {
+		struct server *srv;
+
+		srv = TAILQ_FIRST(&gotwebd_env->servers);
+		TAILQ_REMOVE(&gotwebd_env->servers, srv, entry);
+
+		config_free_access_rules(&srv->access_rules);
+		config_free_repos(&srv->repos);
+		free(srv);
+	}
+
+	while (!TAILQ_EMPTY(&gotwebd_env->sockets)) {
+		struct socket *sock;
+
+		sock = TAILQ_FIRST(&gotwebd_env->sockets);
+		TAILQ_REMOVE(&gotwebd_env->sockets, sock, entry);
+		free(sock);
+	}
+
 	free(env);
 
 	exit(0);
blob - ce2ebb7c64210c0d091f19e07ccc0dc85b7fbfc3b3b1c18a90069077c715de96
blob + bf70b2ae0b794faab100f8f41d701aa19da360d376110c49a1d8802642341a32
--- gotwebd/config.c	
+++ gotwebd/config.c	
@@ -257,6 +257,31 @@ config_get_access_rule(struct gotwebd_access_rule_list
 }
 
 void
+config_free_access_rules(struct gotwebd_access_rule_list *rules)
+{
+	struct gotwebd_access_rule *rule;
+
+	while (!STAILQ_EMPTY(rules)) {
+		rule = STAILQ_FIRST(rules);
+		STAILQ_REMOVE(rules, rule, gotwebd_access_rule, entry);
+		free(rule);
+	}
+}
+
+void
+config_free_repos(struct gotwebd_repolist *repos)
+{
+	struct gotwebd_repo *repo;
+
+	while (!TAILQ_EMPTY(repos)) {
+		repo = TAILQ_FIRST(repos);
+		TAILQ_REMOVE(repos, repo, entry);
+		config_free_access_rules(&repo->access_rules);
+		free(repo);
+	}
+}
+
+void
 config_set_repository(struct imsgev *iev, struct gotwebd_repo *repo)
 {
 	if (imsg_compose_event(iev,
blob - 419f4fa82ff02963acd4d7eb1c52dd7b4c5f6106f71f8a22afd28e95042c06c7
blob + 2ee3dfdb80347c3504b81c8f0b37fc4b422ecf3e19dd10168aaffc473ef48cef
--- gotwebd/gotweb.c	
+++ gotwebd/gotweb.c	
@@ -1270,11 +1270,16 @@ gotweb_shutdown(void)
 	imsgbuf_clear(&gotwebd_env->iev_auth->ibuf);
 	free(gotwebd_env->iev_auth);
 
+	config_free_access_rules(&gotwebd_env->access_rules);
+
 	while (!TAILQ_EMPTY(&gotwebd_env->servers)) {
 		struct server *srv;
 
 		srv = TAILQ_FIRST(&gotwebd_env->servers);
 		TAILQ_REMOVE(&gotwebd_env->servers, srv, entry);
+
+		config_free_access_rules(&srv->access_rules);
+		config_free_repos(&srv->repos);
 		free(srv);
 	}
 
@@ -1286,6 +1291,14 @@ gotweb_shutdown(void)
 		free(sock);
 	}
 
+	while (!TAILQ_EMPTY(&gotwebd_env->addresses)) {
+		struct address *h;
+
+		h = TAILQ_FIRST(&gotwebd_env->addresses);
+		TAILQ_REMOVE(&gotwebd_env->addresses, h, entry);
+		free(h);
+	}
+
 	free(gotwebd_env);
 
 	exit(0);
blob - 7a4bcc64fee1ddcbd24784d4d1de666171a44ca835a74efadbfe221200bb7d64
blob + 0c0f16b319cec8a70a41fbde3956ee28c716b0ac9c5fe3107280b688186c7e4a
--- gotwebd/gotwebd.h	
+++ gotwebd/gotwebd.h	
@@ -640,6 +640,8 @@ int config_getcfg(struct gotwebd *, struct imsg *);
 void config_set_access_rules(struct imsgev *,
     struct gotwebd_access_rule_list *);
 void config_get_access_rule(struct gotwebd_access_rule_list *, struct imsg *);
+void config_free_access_rules(struct gotwebd_access_rule_list *);
 void config_set_repository(struct imsgev *, struct gotwebd_repo *);
 void config_get_repository(struct gotwebd_repolist *, struct imsg *);
+void config_free_repos(struct gotwebd_repolist *);
 int config_init(struct gotwebd *);
blob - 967d00206858dbdc190384cd24bb3f5e683b5595a379018c52ce8a9642979a23
blob + 76eabeab6aa06cee8d3c928224ef8329bdf7a95823d2a7c869b6c21ae270a7da
--- gotwebd/login.c	
+++ gotwebd/login.c	
@@ -382,6 +382,26 @@ login_shutdown(void)
 		imsgbuf_clear(&env->iev_gotsh->ibuf);
 		free(env->iev_gotsh);
 	}
+
+	config_free_access_rules(&env->access_rules);
+
+	while (!TAILQ_EMPTY(&gotwebd_env->sockets)) {
+		struct socket *sock;
+
+		sock = TAILQ_FIRST(&gotwebd_env->sockets);
+		TAILQ_REMOVE(&gotwebd_env->sockets, sock, entry);
+		free(sock);
+	}
+	while (!TAILQ_EMPTY(&gotwebd_env->servers)) {
+		struct server *srv;
+
+		srv = TAILQ_FIRST(&gotwebd_env->servers);
+		TAILQ_REMOVE(&gotwebd_env->servers, srv, entry);
+
+		config_free_access_rules(&srv->access_rules);
+		config_free_repos(&srv->repos);
+		free(srv);
+	}
 	free(env);
 
 	exit(0);