diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-02-09 05:32:28 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-02-09 05:32:28 +0000 |
| commit | 455a64dfe19d7700fa1fe10edecb1ea82fa5dcce (patch) | |
| tree | 07c83461db6bef569ad09ad2e09536bc91354465 /src/zabbix_server | |
| parent | c9ac957849a908ec53b9c410916fb8f690c4c576 (diff) | |
| download | zabbix-455a64dfe19d7700fa1fe10edecb1ea82fa5dcce.tar.gz zabbix-455a64dfe19d7700fa1fe10edecb1ea82fa5dcce.tar.xz zabbix-455a64dfe19d7700fa1fe10edecb1ea82fa5dcce.zip | |
- fixed evaluation of {IPADDRESS} (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@2630 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_server')
| -rw-r--r-- | src/zabbix_server/expression.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/zabbix_server/expression.c b/src/zabbix_server/expression.c index 5f94fc16..61109f2f 100644 --- a/src/zabbix_server/expression.c +++ b/src/zabbix_server/expression.c @@ -703,7 +703,7 @@ void substitute_simple_macros(DB_TRIGGER *trigger, DB_ACTION *action, char *data } else if( (s = strstr(str,"{IPADDRESS}")) != NULL ) { - snprintf(sql,sizeof(sql)-1,"select distinct h.ip from triggers t, functions f,items i, hosts h where t.triggerid=%d and f.triggerid=t.triggerid and f.itemid=i.itemid and h.hostid=i.hostid and i.useip=1", trigger->triggerid); + snprintf(sql,sizeof(sql)-1,"select distinct h.ip from triggers t, functions f,items i, hosts h where t.triggerid=%d and f.triggerid=t.triggerid and f.itemid=i.itemid and h.hostid=i.hostid and h.useip=1", trigger->triggerid); result = DBselect(sql); if(DBnum_rows(result) == 0) |