summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/zabbix_agent/zabbix_agent.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7526eb64..5f26589b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ Changes for 1.3:
Integrated from 1.1.x
1.1.4
+
+ - fixed default config name for zabbix_agent (Alexei)
- fixed swapped system CPU and nice CPU stats in ZABBIX agent (Alexei)
- fixed processing of item calculated as delta speed per second (Alexei)
diff --git a/src/zabbix_agent/zabbix_agent.c b/src/zabbix_agent/zabbix_agent.c
index 0e0c8a6a..e115a889 100644
--- a/src/zabbix_agent/zabbix_agent.c
+++ b/src/zabbix_agent/zabbix_agent.c
@@ -105,7 +105,7 @@ void init_config(void)
if(CONFIG_FILE == NULL)
{
- CONFIG_FILE = strdup("/etc/zabbix/zabbix_agentd.conf");
+ CONFIG_FILE = strdup("/etc/zabbix/zabbix_agent.conf");
}
parse_cfg_file(CONFIG_FILE,cfg);