#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"
int option_index = 0;
int lineno = 0;
- cmdline_conf = list_alloc((list_action_t)free_config);
-
while((r = getopt_long(argc, argv, "c:DLd::n:so:RU:", long_options, &option_index)) != EOF) {
switch(r) {
case 0: /* long option */
break;
case 'c': /* config file */
+ free(confbase);
confbase = xstrdup(optarg);
break;
case 'L': /* no detach */
#ifndef HAVE_MLOCKALL
logger(DEBUG_ALWAYS, LOG_ERR, "The %s option is not supported on this platform.", argv[optind - 1]);
- return false;
+ goto exit_fail;
#else
do_mlock = true;
break;
break;
case 'n': /* net name given */
+ free(netname);
netname = xstrdup(optarg);
break;
cfg = parse_config_line(optarg, NULL, ++lineno);
if(!cfg) {
- return false;
+ goto exit_fail;
}
- list_insert_tail(cmdline_conf, cfg);
+ list_insert_tail(&cmdline_conf, cfg);
break;
#ifdef HAVE_MINGW
case 'R':
case 'U':
logger(DEBUG_ALWAYS, LOG_ERR, "The %s option is not supported on this platform.", argv[optind - 1]);
- return false;
+ goto exit_fail;
#else
case 'R': /* chroot to NETNAME dir */
}
if(optarg) {
+ free(logfilename);
logfilename = xstrdup(optarg);
}
break;
case 5: /* open control socket here */
+ free(pidfilename);
pidfilename = xstrdup(optarg);
break;
case '?': /* wrong options */
usage(true);
- return false;
+ goto exit_fail;
default:
break;
if(optind < argc) {
fprintf(stderr, "%s: unrecognized argument '%s'\n", argv[0], argv[optind]);
usage(true);
- return false;
+ goto exit_fail;
}
if(!netname && (netname = getenv("NETNAME"))) {
if(netname && !check_netname(netname, false)) {
fprintf(stderr, "Invalid character in netname!\n");
- return false;
+ goto exit_fail;
}
if(netname && !check_netname(netname, true)) {
}
return true;
+
+exit_fail:
+ free_names();
+ list_empty_list(&cmdline_conf);
+ return false;
}
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));
# define setpriority(level) (setpriority(PRIO_PROCESS, 0, (level)))
#endif
+static void cleanup() {
+ splay_empty_tree(&config_tree);
+ list_empty_list(&cmdline_conf);
+ free_names();
+}
+
int main(int argc, char **argv) {
program_name = argv[0];
}
make_names(true);
+ atexit(cleanup);
+
chdir(confbase);
#ifdef HAVE_MINGW
unsetenv("LISTEN_PID");
#endif
- init_configuration(&config_tree);
-
/* Slllluuuuuuurrrrp! */
- gettimeofday(&now, NULL);
- 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
#endif
char *priority = NULL;
+ gettimeofday(&now, NULL);
+ srand(now.tv_sec + now.tv_usec);
+
if(!detach()) {
return 1;
}
/* Change process priority */
- if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &priority)) {
+ if(get_config_string(lookup_config(&config_tree, "ProcessPriority"), &priority)) {
if(!strcasecmp(priority, "Normal")) {
if(setpriority(NORMAL_PRIORITY_CLASS) != 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "setpriority", strerror(errno));
crypto_exit();
- exit_configuration(&config_tree);
- free(cmdline_conf);
- free_names();
-
return status;
}