Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Veksler <Mihails.Vekslers@zabbix.com>2022-06-17 17:22:36 +0300
committerMichael Veksler <Mihails.Vekslers@zabbix.com>2022-06-17 17:46:07 +0300
commitf057201f4b0a94e6ef7ebf84304774e29c1ae17e (patch)
tree3947f98e3188a171cf58dea53f4b082b68f3694a
parent3573378524e109799d9c6f24509381594951f0eb (diff)
.......PS. [ZBX-21123] fixed crash when vmware vc was not available at the first moment when starting zabbix_server
* commit '3dfa5f1c6c4fda530964cfdd3b8db42369ef81de': .......PS. [ZBX-21123] fixed crash when vmware vc was not available at the first moment when starting zabbix_server (cherry picked from commit 9d94766b71bc32b72b80ba95c656d4fc6473eed1) (cherry picked from commit b3770030e8ed2163513570649cf190bd6be34e4a)
-rw-r--r--ChangeLog.d/bugfix/ZBX-211231
-rw-r--r--src/zabbix_server/vmware/vmware.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-21123 b/ChangeLog.d/bugfix/ZBX-21123
new file mode 100644
index 00000000000..711750b1a3f
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-21123
@@ -0,0 +1 @@
+.......PS. [ZBX-21123] fixed crash when vmware vc was not available at the first moment when starting zabbix_server (MVekslers)
diff --git a/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c
index e51133cba3a..703e39ce66d 100644
--- a/src/zabbix_server/vmware/vmware.c
+++ b/src/zabbix_server/vmware/vmware.c
@@ -5321,7 +5321,7 @@ static int vmware_service_initialize(zbx_vmware_service_t *service, CURL *easyha
if (SUCCEED != vmware_service_get_contents(easyhandle, &version, &fullname, error))
goto out;
- if (0 == (service->state & ZBX_VMWARE_STATE_NEW) && 0 == strcmp(service->version, version))
+ if (0 != (service->state & ZBX_VMWARE_STATE_READY) && 0 == strcmp(service->version, version))
{
ret = SUCCEED;
goto out;