Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index e0e0388..95872c3 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -48,14 +48,11 @@
 #endif
 
 #include "conf.h"
-#include "control.h"
 #include "crypto.h"
-#include "device.h"
 #include "event.h"
 #include "logger.h"
 #include "names.h"
 #include "net.h"
-#include "netutl.h"
 #include "process.h"
 #include "protocol.h"
 #include "utils.h"
@@ -297,7 +294,7 @@ static bool parse_options(int argc, char **argv) {
 
 exit_fail:
        free_names();
-       free(cmdline_conf);
+       list_delete_list(cmdline_conf);
        cmdline_conf = NULL;
        return false;
 }
@@ -316,7 +313,9 @@ static bool drop_privs(void) {
 
                uid = pw->pw_uid;
 
-               if(initgroups(switchuser, pw->pw_gid) != 0 ||
+               // The second parameter to initgroups on macOS requires int,
+               // but __gid_t is unsigned int. There's not much we can do here.
+               if(initgroups(switchuser, pw->pw_gid) != 0 || // NOLINT(bugprone-narrowing-conversions)
                                setgid(pw->pw_gid) != 0) {
                        logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s",
                               "initgroups", strerror(errno));
@@ -387,7 +386,7 @@ static void cleanup() {
                exit_configuration(&config_tree);
        }
 
-       free(cmdline_conf);
+       list_delete_list(cmdline_conf);
        free_names();
 }
 
@@ -504,12 +503,16 @@ int main(int argc, char **argv) {
        srand(now.tv_sec + now.tv_usec);
        crypto_init();
 
-       if(!read_server_config()) {
+       if(!read_server_config(config_tree)) {
                return 1;
        }
 
-       if(!debug_level) {
-               get_config_int(lookup_config(config_tree, "LogLevel"), &debug_level);
+       if(debug_level == DEBUG_NOTHING) {
+               int level = 0;
+
+               if(get_config_int(lookup_config(config_tree, "LogLevel"), &level)) {
+                       debug_level = level;
+               }
        }
 
 #ifdef HAVE_LZO