GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-10-14 02:22:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make pid-file an array to avoid issues with memory allocation.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-05-21 14:16:00 +02:00
parent 7eb80a3c01
commit fbdcaa82ca
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config.c
+11 -10
View File
@@ -42,7 +42,7 @@
#define OLD_DEFAULT_CFG_FILE "/etc/ocserv.conf" #define OLD_DEFAULT_CFG_FILE "/etc/ocserv.conf"
#define DEFAULT_CFG_FILE "/etc/ocserv/ocserv.conf" #define DEFAULT_CFG_FILE "/etc/ocserv/ocserv.conf"
static const char* pid_file = NULL; static char pid_file[_POSIX_PATH_MAX] = "";
static const char* cfg_file = DEFAULT_CFG_FILE; static const char* cfg_file = DEFAULT_CFG_FILE;
struct cfg_options { struct cfg_options {
@@ -317,7 +317,7 @@ static char *get_brackets_string(void *pool, const char *str)
return talloc_strndup(pool, p, len); return talloc_strndup(pool, p, len);
} }
static void parse_cfg_file(const char* file, struct cfg_st *config) static void parse_cfg_file(const char* file, struct cfg_st *config, unsigned reload)
{ {
tOptionValue const * pov; tOptionValue const * pov;
const tOptionValue* val, *prev; const tOptionValue* val, *prev;
@@ -427,8 +427,8 @@ unsigned force_cert_auth;
READ_STRING("connect-script", config->connect_script); READ_STRING("connect-script", config->connect_script);
READ_STRING("disconnect-script", config->disconnect_script); READ_STRING("disconnect-script", config->disconnect_script);
if (pid_file == NULL) if (reload == 0 && pid_file[0] == 0)
READ_STRING("pid-file", pid_file); READ_STATIC_STRING("pid-file", pid_file);
READ_STRING("socket-file", config->socket_file_prefix); READ_STRING("socket-file", config->socket_file_prefix);
READ_STRING("occtl-socket-file", config->occtl_socket_file); READ_STRING("occtl-socket-file", config->occtl_socket_file);
@@ -689,8 +689,9 @@ int cmd_parser (void *pool, int argc, char **argv, struct cfg_st** config)
if (HAVE_OPT(FOREGROUND)) if (HAVE_OPT(FOREGROUND))
(*config)->foreground = 1; (*config)->foreground = 1;
if (HAVE_OPT(PID_FILE)) if (HAVE_OPT(PID_FILE)) {
pid_file = OPT_ARG(PID_FILE); snprintf(pid_file, sizeof(pid_file), "%s", OPT_ARG(PID_FILE));
}
if (HAVE_OPT(DEBUG)) if (HAVE_OPT(DEBUG))
(*config)->debug = OPT_VALUE_DEBUG; (*config)->debug = OPT_VALUE_DEBUG;
@@ -702,7 +703,7 @@ int cmd_parser (void *pool, int argc, char **argv, struct cfg_st** config)
exit(1); exit(1);
} }
parse_cfg_file(cfg_file, *config); parse_cfg_file(cfg_file, *config, 0);
check_cfg(*config); check_cfg(*config);
@@ -786,7 +787,7 @@ void reload_cfg_file(void *pool, struct cfg_st* config)
clear_cfg_file(config); clear_cfg_file(config);
memset(config, 0, sizeof(*config)); memset(config, 0, sizeof(*config));
parse_cfg_file(cfg_file, config); parse_cfg_file(cfg_file, config, 1);
check_cfg(config); check_cfg(config);
@@ -797,7 +798,7 @@ void write_pid_file(void)
{ {
FILE* fp; FILE* fp;
if (pid_file==NULL) if (pid_file[0]==0)
return; return;
fp = fopen(pid_file, "w"); fp = fopen(pid_file, "w");
@@ -812,7 +813,7 @@ FILE* fp;
void remove_pid_file(void) void remove_pid_file(void)
{ {
if (pid_file==NULL) if (pid_file[0]==0)
return; return;
remove(pid_file); remove(pid_file);