diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2010-09-20 01:09:07 +0400 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2010-09-20 01:09:34 +0400 |
| commit | b96fbc3f966b012720d2b74b1dfd2a0ab95086cf (patch) | |
| tree | 606750874faf65029f756dc0b401ee40cc4da89f /accel-pptpd/main.c | |
| parent | d860a4beaf5f99d5045d03b931b4829426a2f7b0 (diff) | |
| download | accel-ppp-b96fbc3f966b012720d2b74b1dfd2a0ab95086cf.tar.gz accel-ppp-b96fbc3f966b012720d2b74b1dfd2a0ab95086cf.zip | |
fixed many bugs and memory leaks
Diffstat (limited to 'accel-pptpd/main.c')
| -rw-r--r-- | accel-pptpd/main.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/accel-pptpd/main.c b/accel-pptpd/main.c index c60d35fb..147c248c 100644 --- a/accel-pptpd/main.c +++ b/accel-pptpd/main.c @@ -8,6 +8,8 @@ #include "triton/triton.h" +#include "memdebug.h" + static int goto_daemon; static char *pid_file; static char *conf_file; @@ -29,7 +31,7 @@ static int parse_cmdline(char ***argv) _exit(EXIT_FAILURE); } - *argv = malloc(ARG_MAX * sizeof(void *)); + *argv = _malloc(ARG_MAX * sizeof(void *)); memset(*argv, 0, ARG_MAX * sizeof(void *)); for(i = 0; i < ARG_MAX; i++) { @@ -69,7 +71,7 @@ static void __init __main(void) if (!conf_file) goto usage; - if (triton_init(conf_file, "modules")) + if (triton_init(conf_file)) _exit(EXIT_FAILURE); return; @@ -86,6 +88,9 @@ int main(int argc, char **argv) { sigset_t set; + if (triton_load_modules("modules")) + return EXIT_FAILURE; + if (goto_daemon) { pid_t pid = fork(); if (pid > 0) @@ -121,6 +126,7 @@ int main(int argc, char **argv) triton_run(); sigfillset(&set); + sigdelset(&set, SIGINT); sigdelset(&set, SIGTERM); sigdelset(&set, SIGSEGV); sigdelset(&set, SIGILL); |