From: Katy Feng <fkaty@vmware.com>
Date: Fri, 25 Aug 2023 18:58:47 +0000 (-0700)
Subject: Changes to common source files not applicable to open-vm-tools.
X-Git-Tag: stable-12.3.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fdd875b81dded9d33b844ad1fcb2e5d0bd67c65;p=thirdparty%2Fopen-vm-tools.git

Changes to common source files not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
index 8f231acc6..75149b7a7 100644
--- a/open-vm-tools/services/plugins/vix/vixTools.c
+++ b/open-vm-tools/services/plugins/vix/vixTools.c
@@ -11954,6 +11954,7 @@ GuestAuthSAMLAuthenticateAndImpersonate(
                                        token,
                                        username,
                                        gCurrentUsername,
+                                       hostVerified,
                                        userToken,
                                        &currentUserHandle);
       goto done;
diff --git a/open-vm-tools/services/plugins/vix/vixToolsInt.h b/open-vm-tools/services/plugins/vix/vixToolsInt.h
index 5893562cc..19685edbb 100644
--- a/open-vm-tools/services/plugins/vix/vixToolsInt.h
+++ b/open-vm-tools/services/plugins/vix/vixToolsInt.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (c) 2010-2020 VMware, Inc. All rights reserved.
+ * Copyright (c) 2010-2020,2023 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
@@ -204,6 +204,9 @@ VixError VixToolsCheckSAMLForSystem(VGAuthContext *ctx,
                                     const char *token,
                                     const char *username,
                                     char *serviceUsername,
+#ifdef VMTOOLS_FS_VGAUTH_HOST_VERIFICATION
+                                    Bool hostVerified,
+#endif
                                     void **userToken,
                                     VGAuthUserHandle **curUserHandle);
 #endif // _WIN32