Merge commit 'origin/master'

This commit is contained in:
Ondrej Zajicek 2012-04-15 15:15:05 +02:00
commit ae8b300164

View file

@ -269,7 +269,7 @@ cmd_reconfig(char *name, int type)
if (!unix_read_config(&conf, name))
{
if (conf->err_msg)
cli_msg(8002, "%s, line %d: %s", name, conf->err_lino, conf->err_msg);
cli_msg(8002, "%s, line %d: %s", conf->err_file_name, conf->err_lino, conf->err_msg);
else
cli_msg(8002, "%s: %m", name);
config_free(conf);