diff options
Diffstat (limited to 'src/knot/conf/cf-parse.y')
| -rw-r--r-- | src/knot/conf/cf-parse.y | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/knot/conf/cf-parse.y b/src/knot/conf/cf-parse.y index 663adad..9b277ab 100644 --- a/src/knot/conf/cf-parse.y +++ b/src/knot/conf/cf-parse.y @@ -531,11 +531,7 @@ system: | system NSID TEXT ';' { new_config->nsid = $3.t; new_config->nsid_len = strlen(new_config->nsid); } | system STORAGE TEXT ';' { new_config->storage = $3.t; } | system RUNDIR TEXT ';' { new_config->rundir = $3.t; } - | system PIDFILE TEXT ';' { - fprintf(stderr, "warning: Config option 'system.pidfile' is deprecated " - "and has no effect. Use 'rundir' instead.\n"); - free($3.t); - } + | system PIDFILE TEXT ';' { new_config->pidfile = $3.t; } | system KEY TSIG_ALGO_NAME TEXT ';' { fprintf(stderr, "warning: Config option 'system.key' is deprecated " "and has no effect.\n"); @@ -989,7 +985,8 @@ log_start: | log_start log_file '{' log_src '}' ; -log: LOG '{' log_start log_end; +log: LOG { new_config->logs_count = 0; } '{' log_start log_end + ; ctl_listen_start: LISTEN_ON { conf_init_iface(scanner, NULL, -1); } |