Commit ae8b3001 authored by Ondrej Zajicek's avatar Ondrej Zajicek
Browse files

Merge commit 'origin/master'

parents d360f129 ed7c4b0c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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);