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

prevent accounting methods from switching on reload

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2015-02-25 09:31:17 +01:00
parent 3a9617845e
commit 43f3807e3b
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config.c
+15 -9
View File
@@ -1189,12 +1189,14 @@ void print_version(tOptions *opts, tOptDesc *desc)
void reload_cfg_file(void *pool, struct cfg_st* config) void reload_cfg_file(void *pool, struct cfg_st* config)
{ {
auth_struct_st bak[MAX_AUTH_METHODS]; auth_struct_st auth_bak[MAX_AUTH_METHODS];
unsigned bak_size, i; acct_struct_st acct_bak;
unsigned auth_bak_size, i;
/* authentication methods can't change on reload */ /* authentication and accounting methods can't change on reload */
memcpy(bak, config->auth, sizeof(config->auth)); memcpy(auth_bak, config->auth, sizeof(config->auth));
bak_size = config->auth_methods; memcpy(&acct_bak, &config->acct, sizeof(config->acct));
auth_bak_size = config->auth_methods;
clear_cfg_file(config); clear_cfg_file(config);
@@ -1203,16 +1205,20 @@ void reload_cfg_file(void *pool, struct cfg_st* config)
parse_cfg_file(cfg_file, config, 1); parse_cfg_file(cfg_file, config, 1);
/* check if the authentication methods remained the same */ /* check if the authentication methods remained the same */
if (config->auth_methods != bak_size) { if (config->acct.amod != acct_bak.amod) {
goto auth_fail;
}
if (config->auth_methods != auth_bak_size) {
goto auth_fail; goto auth_fail;
} }
for (i=0;i<config->auth_methods;i++) { for (i=0;i<config->auth_methods;i++) {
if (config->auth[i].enabled != bak[i].enabled) { if (config->auth[i].enabled != auth_bak[i].enabled) {
goto auth_fail; goto auth_fail;
} }
if (config->auth[i].type != bak[i].type) { if (config->auth[i].type != auth_bak[i].type) {
goto auth_fail; goto auth_fail;
} }
} }
@@ -1221,7 +1227,7 @@ void reload_cfg_file(void *pool, struct cfg_st* config)
return; return;
auth_fail: auth_fail:
syslog(LOG_ERR, "you cannot switch authentication methods on reload"); syslog(LOG_ERR, "you cannot switch authentication or accounting methods on reload");
exit(1); exit(1);
} }