From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 24 Apr 2018 00:08:17 +0000 (-0700)
Subject: Common source file changes that are not directly related to open-vm-tools.
X-Git-Tag: stable-10.3.0~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce1ed002f5e05f09678e15b4021bac8155edb1eb;p=thirdparty%2Fopen-vm-tools.git

Common source file changes that are not directly related to open-vm-tools.

Build vmtools and vgauth for Windows with xmlsec instead of
xml-security-c.  It will still be possible to build with xml-security-c
either by commenting out the definition of USE_XMLSEC_FOR_WINDOWS in
bora-vmsoft/vgauth/make/inc/defs.mk or adding a make command line
argument of USE_XMLSEC_FOR_WINDOWS=0.
---

diff --git a/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c b/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
index 82530276a..a394c0ea7 100644
--- a/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
+++ b/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2016-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2016-2018 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
@@ -17,7 +17,7 @@
  *********************************************************/
 
 /**
- * @file saml-xmlsec1.cpp
+ * @file saml-xmlsec1.c
  *
  * Code for authenticating users based on SAML tokens.
  */
@@ -174,8 +174,8 @@ LoadCatalogAndSchema(void)
        * check in ../ in case we're in a dev environment.
        */
       schemaDir = g_build_filename(gInstallDir, "schemas", NULL);
-      if (!(g_file_test(dir, G_FILE_TEST_EXISTS) &&
-            g_file_test(dir, G_FILE_TEST_IS_DIR))) {
+      if (!(g_file_test(schemaDir, G_FILE_TEST_EXISTS) &&
+            g_file_test(schemaDir, G_FILE_TEST_IS_DIR))) {
 
          gchar *newDir = g_build_filename(gInstallDir, "..", "schemas", NULL);
 
@@ -1331,7 +1331,7 @@ VerifySAMLToken(const gchar *token,
                            strlen(token),
                            NULL, NULL, 0);
 #else
-   doc = xmlParseMemory(token, strlen(token));
+   doc = xmlParseMemory(token, (int)strlen(token));
 #endif
    if ((NULL == doc) || (xmlDocGetRootElement(doc) == NULL)) {
       g_warning("Failed to parse document\n");