diff --git a/src/config.c b/src/config.c index 14d844e5..0ba4c29d 100644 --- a/src/config.c +++ b/src/config.c @@ -127,7 +127,7 @@ unsigned j; READ_NUMERIC("cookie-validity", config->cookie_validity, 1); READ_NUMERIC("auth-timeout", config->auth_timeout, 0); - READ_STRING("cookie-db", config->db_file, 1); + READ_STRING("cookie-db", config->cookie_db, 1); READ_NUMERIC("max-clients", config->max_clients, 0); val = optionGetValue(pov, "run-as-user"); \ diff --git a/src/cookies.c b/src/cookies.c index a4f86eb8..d48a8bd3 100644 --- a/src/cookies.c +++ b/src/cookies.c @@ -46,9 +46,9 @@ datum key; datum data; int ret; - dbf = gdbm_open((char*)config->db_file, 0, GDBM_WRCREAT, S_IRUSR|S_IWUSR, NULL); + dbf = gdbm_open((char*)config->cookie_db, 0, GDBM_WRCREAT, S_IRUSR|S_IWUSR, NULL); if (dbf == NULL) { - syslog(LOG_ERR, "Cannot open cookie database: %s", config->db_file); + syslog(LOG_ERR, "Cannot open cookie database: %s", config->cookie_db); return -1; } @@ -78,9 +78,9 @@ datum key; datum data; int ret; - dbf = gdbm_open((char*)config->db_file, 0, GDBM_READER, 0, NULL); + dbf = gdbm_open((char*)config->cookie_db, 0, GDBM_READER, 0, NULL); if (dbf == NULL) { - syslog(LOG_ERR, "Cannot open cookie database: %s", config->db_file); + syslog(LOG_ERR, "Cannot open cookie database: %s", config->cookie_db); return -1; } @@ -113,7 +113,7 @@ int deleted = 0; struct stored_cookie_st sc; time_t now = time(0); - dbf = gdbm_open((char*)cfg->db_file, 0, GDBM_WRITER, 0, NULL); + dbf = gdbm_open((char*)cfg->cookie_db, 0, GDBM_WRITER, 0, NULL); if (dbf == NULL) return; diff --git a/src/vpn.h b/src/vpn.h index 86695566..2f35b782 100644 --- a/src/vpn.h +++ b/src/vpn.h @@ -57,7 +57,7 @@ struct cfg_st { time_t cookie_validity; /* in seconds */ unsigned auth_timeout; /* timeout of HTTP auth */ unsigned keepalive; - const char *db_file; + const char *cookie_db; unsigned foreground; unsigned max_clients;