diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-05-29 12:19:50 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-05-29 12:19:50 +0000 |
| commit | 1af69e4b46054b7b2efca2b3d834e59caeab36f5 (patch) | |
| tree | 9e7829d61b54f230e1e9d81ecaca42f11faaa13f /src/zabbix_agent | |
| parent | cbe396976c682e6534f8f42e497e41f2942371d6 (diff) | |
| download | zabbix-1af69e4b46054b7b2efca2b3d834e59caeab36f5.tar.gz zabbix-1af69e4b46054b7b2efca2b3d834e59caeab36f5.tar.xz zabbix-1af69e4b46054b7b2efca2b3d834e59caeab36f5.zip | |
- improved "system.run[]" key, added <wait>|<nowait> mode for Linux (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@2915 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_agent')
| -rw-r--r-- | src/zabbix_agent/active.c | 2 | ||||
| -rw-r--r-- | src/zabbix_agent/zabbix_agent.c | 2 | ||||
| -rw-r--r-- | src/zabbix_agent/zabbix_agentd.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c index 895cde43..0b9cf597 100644 --- a/src/zabbix_agent/active.c +++ b/src/zabbix_agent/active.c @@ -479,6 +479,8 @@ int process_active_checks(char *server, int port) snprintf(value, MAX_STRING_LEN-1, ZBX_FS_UI64, result.ui64); else if(result.type & AR_STRING) snprintf(value, MAX_STRING_LEN-1, "%s", result.str); + else if(result.type & AR_TEXT) + snprintf(value, MAX_STRING_LEN-1, "%s", result.text); else if(result.type & AR_MESSAGE) snprintf(value, MAX_STRING_LEN-1, "%s", result.msg); free_result(&result); diff --git a/src/zabbix_agent/zabbix_agent.c b/src/zabbix_agent/zabbix_agent.c index 7205310c..4524f4c3 100644 --- a/src/zabbix_agent/zabbix_agent.c +++ b/src/zabbix_agent/zabbix_agent.c @@ -201,6 +201,8 @@ int main(int argc, char **argv) snprintf(value, MAX_STRING_LEN-1, ZBX_FS_UI64, result.ui64); else if(result.type & AR_STRING) snprintf(value, MAX_STRING_LEN-1, "%s", result.str); + else if(result.type & AR_TEXT) + snprintf(value, MAX_STRING_LEN-1, "%s", result.text); else if(result.type & AR_MESSAGE) snprintf(value, MAX_STRING_LEN-1, "%s", result.msg); free_result(&result); diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index de3cc0bc..ecf8d24d 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -379,6 +379,8 @@ void process_child(int sockfd) snprintf(value, MAX_STRING_LEN-1, ZBX_FS_UI64, result.ui64); else if(result.type & AR_STRING) snprintf(value, MAX_STRING_LEN-1, "%s", result.str); + else if(result.type & AR_TEXT) + snprintf(value, MAX_STRING_LEN-1, "%s", result.text); else if(result.type & AR_MESSAGE) snprintf(value, MAX_STRING_LEN-1, "%s", result.msg); free_result(&result); |