From 591b03bd3cfd52b33a5e8512fef466494cf329f6 Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Fri, 26 Jun 2020 16:09:04 +0200 Subject: Properly cleanup and free struct cfg and servers --- minecctl/minecctl-rcon.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'minecctl/minecctl-rcon.c') diff --git a/minecctl/minecctl-rcon.c b/minecctl/minecctl-rcon.c index 27c586c..96d3522 100644 --- a/minecctl/minecctl-rcon.c +++ b/minecctl/minecctl-rcon.c @@ -133,11 +133,8 @@ rcon_login(struct cfg *cfg, struct server *server) send_msg(fd, buf, sizeof(buf), RCON_PACKET_LOGIN, server->rcon_password, &rtype, &reply); - /* An rcon password isn't exactly super-secret, but can't hurt */ explicit_bzero(buf, sizeof(buf)); - explicit_bzero(server->rcon_password, strlen(server->rcon_password)); - xfree(server->rcon_password); - server->rcon_password = NULL; + free_password(&server->rcon_password); if (rtype == RCON_PACKET_LOGIN_OK) verbose("%s: login ok", server->name); @@ -236,20 +233,6 @@ get_one_status(int fd, char *buf, size_t len, const char *cmd, return false; } -static struct server * -get_default_server(struct cfg *cfg) -{ - struct server *server; - - server = list_first_entry_or_null(&cfg->servers, struct server, list); - if (!server) - die("No servers defined"); - - read_server_config(server); - - return server; -} - void do_status(struct cfg *cfg) { char buf[4096]; -- cgit v1.2.3