WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-09-28 12:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Only strdup rpz_log_name when configured

Browse Source
This commit is contained in:
Ralph Dolmans
2019-06-05 14:26:57 +02:00
parent a77c35ef50
commit 3021e320dd
3 changed files with 559 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/rpz.c
+2 -1
View File
@@ -367,7 +367,8 @@ rpz_create(struct config_auth* p)
}
}
r->log = p->rpz_log;
r->log_name = strdup(p->rpz_log_name);
if(p->rpz_log_name)
r->log_name = strdup(p->rpz_log_name);
return r;
}
util/configparser.c
+557 -563
View File
File diff suppressed because it is too large Load Diff
util/configparser.y
-6
View File
@@ -387,9 +387,6 @@ rpz_action_override: VAR_RPZ_ACTION_OVERRIDE STRING_ARG
rpz_cname_override: VAR_RPZ_CNAME_OVERRIDE STRING_ARG
{
OUTYY(("P(rpz_cname_override:%s)\n", $2));
if(cfg_parser->cfg->auths->rpz_cname)
yyerror("there can only be one CNAME override per "
"RPZ");
free(cfg_parser->cfg->auths->rpz_cname);
cfg_parser->cfg->auths->rpz_cname = $2;
}
@@ -408,9 +405,6 @@ rpz_log: VAR_RPZ_LOG STRING_ARG
rpz_log_name: VAR_RPZ_LOG_NAME STRING_ARG
{
OUTYY(("P(rpz_log_name:%s)\n", $2));
if(cfg_parser->cfg->auths->rpz_log_name)
yyerror("RPZ log name, there can only be one "
"rpz-log-name per rpz");
free(cfg_parser->cfg->auths->rpz_log_name);
cfg_parser->cfg->auths->rpz_log_name = $2;
}