Enabling the open-vm-tools VGAuth Host Verification feature.

The Host Verified SAML token work is complete. Adding the new code to the
open-vm-tools source.

diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 2d60c725bf52db0a21f4b1503c3342d2efdbf874..4ec1ea97fe0e03195d420b923b546b7c24421b5e 100644 (file)
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -1944,12 +1944,6 @@ AC_CONFIG_FILES([                      \
 
 
 
-AM_CONDITIONAL([VMTOOLS_FS_VGAUTH_HOST_VERIFICATION],[true])
-if test "$enable_vgauth" = "yes"; then
-   echo "Enabling vgauth host verification"
-   CPPFLAGS="$CPPFLAGS -DVMTOOLS_FS_VGAUTH_HOST_VERIFICATION"
-fi
-
 
 ###
 ### Output

diff --git a/open-vm-tools/services/plugins/vix/vixToolsInt.h b/open-vm-tools/services/plugins/vix/vixToolsInt.h
index 19685edbb2b8ce285e33ddd89abe4ddfb19a2db5..007db51156689b7b4d8fa8dfd35dc16d8b5cc2f4 100644 (file)
--- a/open-vm-tools/services/plugins/vix/vixToolsInt.h
+++ b/open-vm-tools/services/plugins/vix/vixToolsInt.h
@@ -204,9 +204,7 @@ 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

diff --git a/open-vm-tools/vgauth/common/VGAuthProto.h b/open-vm-tools/vgauth/common/VGAuthProto.h
index f7bcae12f0f8a0418a9facb10773785a3c797a8c..58a84a1c4e728af3aad60fddfd4f5518c571915f 100644 (file)
--- a/open-vm-tools/vgauth/common/VGAuthProto.h
+++ b/open-vm-tools/vgauth/common/VGAuthProto.h
@@ -622,7 +622,6 @@
 
 #define VGAUTH_REQUESTVALIDATESAMLBEARERTOKEN_ELEMENT_NAME "ValidateSamlBToken"
 
-
 #define VGAUTH_VALIDATESAMLBEARERTOKEN_REQUEST_FORMAT \
    VGAUTH_REQUEST_FORMAT_START \
       "<"VGAUTH_REQUESTNAME_ELEMENT_NAME">"VGAUTH_REQUESTVALIDATESAMLBEARERTOKEN_ELEMENT_NAME"</"VGAUTH_REQUESTNAME_ELEMENT_NAME">" \
@@ -632,7 +631,6 @@
       "<"VGAUTH_HOST_VERIFIED_ELEMENT_NAME">%s</"VGAUTH_HOST_VERIFIED_ELEMENT_NAME">" \
    VGAUTH_REQUEST_FORMAT_END
 
-
 #define VGAUTH_VALIDATESAMLBEARERTOKEN_REPLY_FORMAT_START \
    VGAUTH_REPLY_FORMAT_START \
        "<"VGAUTH_USERNAME_ELEMENT_NAME">%s</"VGAUTH_USERNAME_ELEMENT_NAME">" \

diff --git a/open-vm-tools/vgauth/public/VGAuthAuthentication.h b/open-vm-tools/vgauth/public/VGAuthAuthentication.h
index 0d6565af1b13b061ca680dc7f94327e6ab6881bc..e19fe476485db3c2f7a5590189336bffb644dccf 100644 (file)
--- a/open-vm-tools/vgauth/public/VGAuthAuthentication.h
+++ b/open-vm-tools/vgauth/public/VGAuthAuthentication.h
@@ -198,7 +198,7 @@ VGAuthError VGAuth_ValidateSSPIResponse(VGAuthContext *ctx,
 
 #define  VGAUTH_PARAM_VALIDATE_INFO_ONLY  "validateInfoOnly"
 
-#   define VGAUTH_PARAM_SAML_HOST_VERIFIED "hostVerified"
+#define  VGAUTH_PARAM_SAML_HOST_VERIFIED "hostVerified"
 
 VGAuthError VGAuth_ValidateSamlBearerToken(VGAuthContext *ctx,
                                            const char *samlToken,