Continued changes adjusting Windows client for Linux port.

CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj

@@ -15,13 +15,7 @@
     {
         "Entry"
         {
-        "MsmKey" = "8:_0C000CB7C5FA4E2BB6A6CB1C204EABA6"
+        "MsmKey" = "8:_0552261655FA4B0392E67071CCC090F0"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_0C0B5ECE6E9C47F1A1F13B58141B5DC8"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -33,26 +27,20 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_14879C6DA33C4224AD56983018EDC817"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_1ED6B3F7C91A4BBE875FC4621FC3CD97"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_313DE095D13281AF91A64E3F3D472413"
+        "MsmKey" = "8:_2EEDD0C5BE8546CBA62A0852850DB473"
-        "OwnerKey" = "8:_409269C4EABE4CC18045A808B7B1C104"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_409269C4EABE4CC18045A808B7B1C104"
+        "MsmKey" = "8:_313DE095D13281AF91A64E3F3D472413"
-        "OwnerKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_2EEDD0C5BE8546CBA62A0852850DB473"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -69,52 +57,28 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A"
-        "OwnerKey" = "8:_0C0B5ECE6E9C47F1A1F13B58141B5DC8"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A"
-        "OwnerKey" = "8:_FBCAB4866DF34F0C8E00056A526C0A9A"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A"
-        "OwnerKey" = "8:_14879C6DA33C4224AD56983018EDC817"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_8292EFFD84EF46C6BD2F1F3E20808684"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_86C4F126961F4D628A361FE9B9B8B329"
+        "MsmKey" = "8:_92336612AC7D083F97ED302BB7674A2D"
+        "OwnerKey" = "8:_EE2A593B866F43FD8D97250E1457988A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_AFBDE40E9A784962B750ECA4C15ADD85"
         "OwnerKey" = "8:_8292EFFD84EF46C6BD2F1F3E20808684"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_FBCAB4866DF34F0C8E00056A526C0A9A"
+        "MsmKey" = "8:_EE2A593B866F43FD8D97250E1457988A"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
-        "Entry"
-        {
-        "MsmKey" = "8:_FE85A5D48B5A23F3077871E9FD2378DE"
-        "OwnerKey" = "8:_0C0B5ECE6E9C47F1A1F13B58141B5DC8"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_FE85A5D48B5A23F3077871E9FD2378DE"
-        "OwnerKey" = "8:_14879C6DA33C4224AD56983018EDC817"
-        "MsmSig" = "8:_UNDEFINED"
-        }
     }
     "Configurations"
     {
@@ -164,9 +128,9 @@
         }
         "File"
         {
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_0C000CB7C5FA4E2BB6A6CB1C204EABA6"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_0552261655FA4B0392E67071CCC090F0"
             {
-            "SourcePath" = "8:..\\mechanisms\\pwd\\PwdAuthenticate.conf"
+            "SourcePath" = "8:..\\mechanisms\\pwd\\windows\\PwdAuthenticate.conf"
             "TargetName" = "8:PwdAuthenticate.conf"
             "Tag" = "8:"
             "Folder" = "8:_DEA051CA331E4FEA83D99711FB584664"
@@ -284,12 +248,12 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_71C343EBC4935F8914C3145115EDEC4A"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_92336612AC7D083F97ED302BB7674A2D"
             {
             "SourcePath" = "8:micasa.dll"
             "TargetName" = "8:micasa.dll"
             "Tag" = "8:"
-            "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
+            "Folder" = "8:_F5F5F604B81645F8B6463F7A7D6A53AD"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -300,27 +264,7 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:TRUE"
+            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_FE85A5D48B5A23F3077871E9FD2378DE"
-            {
-            "SourcePath" = "8:WINHTTP.dll"
-            "TargetName" = "8:WINHTTP.dll"
-            "Tag" = "8:"
-            "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:TRUE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
@@ -460,7 +404,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_86C4F126961F4D628A361FE9B9B8B329"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_AFBDE40E9A784962B750ECA4C15ADD85"
             {
             "UseDynamicProperties" = "11:FALSE"
             "IsDependency" = "11:TRUE"
@@ -486,65 +430,9 @@
         }
         "ProjectOutput"
         {
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0C0B5ECE6E9C47F1A1F13B58141B5DC8"
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_2EEDD0C5BE8546CBA62A0852850DB473"
             {
-            "SourcePath" = "8:..\\windows\\Debug\\authtoken.dll"
+            "SourcePath" = "8:..\\mechanisms\\krb5\\windows\\Release\\krb5mech.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            "ProjectOutputGroupRegister" = "3:1"
-            "OutputConfiguration" = "8:"
-            "OutputGroupCanonicalName" = "8:Built"
-            "OutputProjectGuid" = "8:{7BD9A5DB-DE7D-40B7-A397-04182DC2F632}"
-            "ShowKeyOutput" = "11:FALSE"
-                "ExcludeFilters"
-                {
-                }
-            }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_14879C6DA33C4224AD56983018EDC817"
-            {
-            "SourcePath" = "8:..\\windows\\Debug\\authtoken.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_E092F841E4D04920B053C3F6A5151BA2"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            "ProjectOutputGroupRegister" = "3:1"
-            "OutputConfiguration" = "8:"
-            "OutputGroupCanonicalName" = "8:Built"
-            "OutputProjectGuid" = "8:{7BD9A5DB-DE7D-40B7-A397-04182DC2F632}"
-            "ShowKeyOutput" = "11:TRUE"
-                "ExcludeFilters"
-                {
-                }
-            }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_409269C4EABE4CC18045A808B7B1C104"
-            {
-            "SourcePath" = "8:..\\mechanisms\\krb5\\windows\\Debug\\krb5mech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F5F5F604B81645F8B6463F7A7D6A53AD"
@@ -572,7 +460,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8292EFFD84EF46C6BD2F1F3E20808684"
             {
-            "SourcePath" = "8:..\\csharp\\Novell.Casa.Authtoken\\obj\\Debug\\Novell.Casa.Client.Auth.dll"
+            "SourcePath" = "8:..\\csharp\\Novell.Casa.Authtoken\\obj\\Release\\Novell.Casa.Client.Auth.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8E0BBDD021EA45308BD98380F28EB7F6"
@@ -598,9 +486,9 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_FBCAB4866DF34F0C8E00056A526C0A9A"
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EE2A593B866F43FD8D97250E1457988A"
             {
-            "SourcePath" = "8:..\\mechanisms\\pwd\\windows\\Debug\\pwmech.dll"
+            "SourcePath" = "8:..\\mechanisms\\pwd\\windows\\Release\\pwmech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F5F5F604B81645F8B6463F7A7D6A53AD"

CASA-auth-token/non-java/client/mechanisms/pwd/windows/pwd.vcproj

@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="windows;.;..\..;&quot;..\..\..\include&quot;;&quot;C:\Program Files\novell\CASA\include&quot;"
+				AdditionalIncludeDirectories=".;&quot;C:\Dev\casa\CASA-auth-token\non-java\client\mechanisms\pwd\windows&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\client\mechanisms\pwd&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\client&quot;;&quot;C:\Program Files\novell\CASA\include&quot;;&quot;C:\Dev\Expat-2.0.0\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -79,7 +79,7 @@ copy $(OutDir)\pwmech.dll \&quot;Program Files&quot;\novell\casa\lib\pwmech.dll
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="windows;.;..\..;&quot;..\..\..\include&quot;;&quot;C:\Program Files\novell\CASA\include&quot;"
+				AdditionalIncludeDirectories=".;&quot;C:\Dev\casa\CASA-auth-token\non-java\client\mechanisms\pwd\windows&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\client\mechanisms\pwd&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\client&quot;;&quot;C:\Program Files\novell\CASA\include&quot;;&quot;C:\Dev\Expat-2.0.0\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
@@ -139,26 +139,25 @@ copy $(OutDir)\pwmech.dll \&quot;Program Files&quot;\novell\casa\lib\pwmech.dll
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\windows\dllsup.c">
+				RelativePath=".\dllsup.c">
 			</File>
 			<File
-				RelativePath=".\get.c">
+				RelativePath="..\get.c">
 			</File>
 			<File
-				RelativePath=".\interface.c">
+				RelativePath="..\interface.c">
 			</File>
 			<File
-				RelativePath=".\windows\platform.c">
+				RelativePath=".\platform.c">
 			</File>
 			<File
-				RelativePath=".\PwdAuthenticate.conf"
+				RelativePath=".\PwdAuthenticate.conf">
-				DeploymentContent="TRUE">
 			</File>
 			<File
-				RelativePath=".\windows\pwmech.def">
+				RelativePath=".\pwmech.def">
 			</File>
 			<File
-				RelativePath=".\util.c">
+				RelativePath="..\util.c">
 			</File>
 		</Filter>
 		<Filter
@@ -166,10 +165,10 @@ copy $(OutDir)\pwmech.dll \&quot;Program Files&quot;\novell\casa\lib\pwmech.dll
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
 			<File
-				RelativePath=".\internal.h">
+				RelativePath="..\internal.h">
 			</File>
 			<File
-				RelativePath=".\windows\platform.h">
+				RelativePath=".\platform.h">
 			</File>
 		</Filter>
 		<Filter

CASA-auth-token/non-java/client/windows/client.vcproj

@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D "XML_STATIC""
 				Optimization="0"
-				AdditionalIncludeDirectories=".;.\windows;..\include;"\Program Files\novell\casa\include";"C:\Dev\Expat-2.0.0\Source\lib""
+				AdditionalIncludeDirectories=".;..\;..\..\include;"\Program Files\novell\casa\include";"C:\Dev\Expat-2.0.0\Source\lib""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -39,7 +39,7 @@
 				AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib"
 				OutputFile="$(OutDir)/authtoken.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories=""\Program Files\Novell\CASA\lib";"..\..\..\..\Expat-2.0.0\StaticLibs""
+				AdditionalLibraryDirectories=""\Program Files\Novell\CASA\lib";"C:\Dev\Expat-2.0.0\StaticLibs""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/client.pdb"
 				SubSystem="0"
@@ -81,7 +81,7 @@ copy $(SolutionDir)client\windows\authtoken.lib \"Program Files"\novel
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;XML_STATIC&quot;"
-				AdditionalIncludeDirectories=".;.\windows;..\include;&quot;\Program Files\novell\casa\include&quot;;&quot;C:\Dev\Expat-2.0.0\Source\lib&quot;"
+				AdditionalIncludeDirectories=".;..\;..\..\include;&quot;\Program Files\novell\casa\include&quot;;&quot;C:\Dev\Expat-2.0.0\Source\lib&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
@@ -96,7 +96,7 @@ copy $(SolutionDir)client\windows\authtoken.lib \&quot;Program Files&quot;\novel
 				AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib"
 				OutputFile="$(OutDir)/authtoken.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\Expat-2.0.0\StaticLibs&quot;"
+				AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;&quot;C:\Dev\Expat-2.0.0\StaticLibs&quot;"
 				GenerateDebugInformation="TRUE"
 				SubSystem="0"
 				OptimizeReferences="2"
@@ -139,58 +139,46 @@ copy $(SolutionDir)client\windows\authtoken.lib \&quot;Program Files&quot;\novel
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\authmech.c">
+				RelativePath="..\authmech.c">
 			</File>
 			<File
-				RelativePath=".\authmsg.c">
+				RelativePath="..\authmsg.c">
 			</File>
 			<File
-				RelativePath=".\authpolicy.c">
+				RelativePath="..\authpolicy.c">
 			</File>
 			<File
 				RelativePath=".\win32\authtoken.def">
 			</File>
 			<File
-				RelativePath=".\cache.c">
+				RelativePath="..\cache.c">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\client.conf">
+				RelativePath="..\client.conf">
 			</File>
 			<File
-				RelativePath=".\config.c">
+				RelativePath="..\config.c">
 			</File>
 			<File
-				RelativePath=".\windows\dllsup.c">
+				RelativePath=".\dllsup.c">
 			</File>
 			<File
-				RelativePath=".\engine.c">
+				RelativePath="..\engine.c">
 			</File>
 			<File
-				RelativePath=".\getpolicymsg.c">
+				RelativePath="..\getpolicymsg.c">
 			</File>
 			<File
-				RelativePath=".\gettokenmsg.c">
+				RelativePath="..\gettokenmsg.c">
 			</File>
 			<File
-				RelativePath=".\windows\platform.c">
+				RelativePath=".\platform.c">
 			</File>
 			<File
-				RelativePath=".\windows\rpc.c">
+				RelativePath=".\rpc.c">
 			</File>
 			<File
-				RelativePath=".\util.c">
+				RelativePath="..\util.c">
 			</File>
 		</Filter>
 		<Filter
@@ -198,19 +186,25 @@ copy $(SolutionDir)client\windows\authtoken.lib \&quot;Program Files&quot;\novel
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
 			<File
-				RelativePath=".\internal.h">
+				RelativePath="..\..\include\casa_c_authtoken.h">
 			</File>
 			<File
-				RelativePath="..\include\list_entry.h">
+				RelativePath="..\config_if.h">
 			</File>
 			<File
-				RelativePath=".\mech_if.h">
+				RelativePath="..\internal.h">
 			</File>
 			<File
-				RelativePath=".\windows\platform.h">
+				RelativePath="..\..\include\list_entry.h">
 			</File>
 			<File
-				RelativePath="..\include\proto.h">
+				RelativePath="..\mech_if.h">
+			</File>
+			<File
+				RelativePath=".\platform.h">
+			</File>
+			<File
+				RelativePath="..\..\include\proto.h">
 			</File>
 		</Filter>
 		<Filter