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

Reload the configuration of the security module as well, on main process reload.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-06-10 15:46:19 +02:00
parent 9e4be33533
commit cfa74a4e29
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.c
View File

@@ -754,6 +754,7 @@ unsigned total = 10;
reload_cfg_file(s->main_pool, s->config); reload_cfg_file(s->main_pool, s->config);
tls_reload_crl(s, s->creds); tls_reload_crl(s, s->creds);
reload_conf = 0; reload_conf = 0;
kill(s->sec_mod_pid, SIGHUP);
} }
if (need_children_cleanup != 0) { if (need_children_cleanup != 0) {

14
src/sec-mod.c
View File

@@ -49,6 +49,7 @@
#define MAINTAINANCE_TIME 300 #define MAINTAINANCE_TIME 300
static int need_maintainance = 0; static int need_maintainance = 0;
static int need_reload = 0;
static int need_exit = 0; static int need_exit = 0;
struct pin_st { struct pin_st {
@@ -327,6 +328,11 @@ static void handle_alarm(int signo)
need_maintainance = 1; need_maintainance = 1;
} }
static void handle_sighup(int signo)
{
need_reload = 1;
}
static void handle_sigterm(int signo) static void handle_sigterm(int signo)
{ {
need_exit = 1; need_exit = 1;
@@ -347,6 +353,12 @@ static void check_other_work(sec_mod_st *sec)
exit(0); exit(0);
} }
if (need_reload) {
seclog(LOG_DEBUG, "reloading configuration");
reload_cfg_file(sec, sec->config);
need_reload = 0;
}
if (need_maintainance) { if (need_maintainance) {
seclog(LOG_DEBUG, "performing maintenance"); seclog(LOG_DEBUG, "performing maintenance");
cleanup_client_entries(sec->client_db); cleanup_client_entries(sec->client_db);
@@ -433,7 +445,7 @@ void sec_mod_server(void *main_pool, struct cfg_st *config, const char *socket_f
/* we no longer need the main pool after this point. */ /* we no longer need the main pool after this point. */
talloc_free(main_pool); talloc_free(main_pool);
ocsignal(SIGHUP, SIG_IGN); ocsignal(SIGHUP, handle_sighup);
ocsignal(SIGINT, handle_sigterm); ocsignal(SIGINT, handle_sigterm);
ocsignal(SIGTERM, handle_sigterm); ocsignal(SIGTERM, handle_sigterm);
ocsignal(SIGALRM, handle_alarm); ocsignal(SIGALRM, handle_alarm);