Fix memory leaks triggered by integration tests.

[tinc] / src / names.c

diff --git a/src/names.c b/src/names.c
index 6db364e..4f543c9 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -1,7 +1,7 @@
 /*
     names.c -- generate commonly used (file)names
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2017 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2018 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -50,6 +50,8 @@ void make_names(bool daemon) {
                logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
        }
 
+       free(identname);
+
        if(netname) {
                xasprintf(&identname, "tinc.%s", netname);
        } else {
@@ -93,6 +95,7 @@ void make_names(bool daemon) {
        }
 
 #ifdef HAVE_MINGW
+       (void)daemon;
 
        if(!logfilename) {
                xasprintf(&logfilename, "%s" SLASH "log", confbase);