#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"
exit_fail:
free_names();
- free(cmdline_conf);
+ list_delete_list(cmdline_conf);
cmdline_conf = NULL;
return false;
}
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));
exit_configuration(&config_tree);
}
- free(cmdline_conf);
+ list_delete_list(cmdline_conf);
free_names();
}
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