diff options
| author | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-01-07 15:15:17 +0300 |
|---|---|---|
| committer | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-01-07 15:15:34 +0300 |
| commit | e6a8cfe908ca959aacf4ff0047afe3775a97fe21 (patch) | |
| tree | c232b7d083b4cb55d4a56fef45af8dc83ab5b0a4 /src/zabbix_proxy | |
| parent | 699d5de37657962a9bcd4a7b8d1d1d795b0855ad (diff) | |
........S. [ZBXNEXT-2485] refactored config validation
Diffstat (limited to 'src/zabbix_proxy')
| -rw-r--r-- | src/zabbix_proxy/proxy.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c index 68dc6276332..cd3aead421c 100644 --- a/src/zabbix_proxy/proxy.c +++ b/src/zabbix_proxy/proxy.c @@ -671,6 +671,10 @@ static void zbx_validate_config(ZBX_TASK_EX *task) err |= (FAIL == check_cfg_feature_int("StartIPMIPollers", CONFIG_IPMIPOLLER_FORKS, "IPMI support")); #endif +#if !defined(HAVE_UNIXODBC) + err |= (FAIL == check_cfg_feature_int("StartODBCPollers", CONFIG_ODBCPOLLER_FORKS, "ODBC support")); +#endif + err |= (FAIL == zbx_db_validate_config_features()); if (0 != err) @@ -1306,14 +1310,6 @@ int MAIN_ZABBIX_ENTRY(int flags) } } -#ifndef HAVE_UNIXODBC - if (0 < CONFIG_ODBCPOLLER_FORKS) - { - zabbix_log(LOG_LEVEL_ERR, "ODBC support is not compiled in, but ODBC polling is enabled."); - return FAIL; - } -#endif - #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) zbx_tls_init_parent(); #endif |