60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
From d14e2604b04f1b6b28eaa281f7760c89b2d2b4eb Mon Sep 17 00:00:00 2001
|
|
From: Cathy Avery <cavery@redhat.com>
|
|
Date: Thu, 25 Jul 2019 12:32:38 +0200
|
|
Subject: [PATCH 15/16] Fix a Coverity issue reported in
|
|
vgauth/serviceImpl/verify.c
|
|
|
|
RH-Author: Cathy Avery <cavery@redhat.com>
|
|
Message-id: <20190725123239.18274-16-cavery@redhat.com>
|
|
Patchwork-id: 89718
|
|
O-Subject: [RHEL8.1 open-vm-tools PATCH 15/16] Fix a Coverity issue reported in vgauth/serviceImpl/verify.c
|
|
Bugzilla: 1602648
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
|
commit 0c6ad5edceca60dc05eb9f3b1ee6ac42dc0455ef
|
|
Author: Oliver Kurth <okurth@vmware.com>
|
|
Date: Wed Jul 3 14:28:56 2019 -0700
|
|
|
|
Fix a Coverity issue reported in vgauth/serviceImpl/verify.c
|
|
|
|
Signed-off-by: Cathy Avery <cavery@redhat.com>
|
|
|
|
Conflicts: Minor copyright change
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
open-vm-tools/vgauth/serviceImpl/verify.c | 10 ++--------
|
|
1 file changed, 2 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/vgauth/serviceImpl/verify.c b/vgauth/serviceImpl/verify.c
|
|
index e9a7531..9f90a79 100644
|
|
--- a/vgauth/serviceImpl/verify.c
|
|
+++ b/vgauth/serviceImpl/verify.c
|
|
@@ -1,5 +1,5 @@
|
|
/*********************************************************
|
|
- * Copyright (C) 2011-2017 VMware, Inc. All rights reserved.
|
|
+ * Copyright (C) 2011-2019 VMware, Inc. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU Lesser General Public License as published
|
|
@@ -42,15 +42,9 @@
|
|
VGAuthError
|
|
ServiceInitVerify(void)
|
|
{
|
|
- VGAuthError err;
|
|
|
|
CertVerify_Init();
|
|
- err = SAML_Init();
|
|
- if (err != VGAUTH_E_OK) {
|
|
- goto done;
|
|
- }
|
|
-done:
|
|
- return err;
|
|
+ return SAML_Init();
|
|
}
|
|
|
|
|
|
--
|
|
1.8.3.1
|
|
|