Fixed fix path issue in CasaAuthToken c-sharp library.

This commit is contained in:
Juan Carlos Luciani 2006-12-04 05:03:49 +00:00
parent 8adb445805
commit 11f501db43
4 changed files with 172 additions and 136 deletions

View File

@ -33,7 +33,7 @@ namespace Novell.Casa.Client.Auth
/// </summary> /// </summary>
public class Authtoken public class Authtoken
{ {
private const string AUTH_LIBRARY = "C:\\Program Files\\Novell\\CASA\\lib\\authtoken"; private const string AUTH_LIBRARY = "casa_authtoken";
private const int BUFFER_OVERFLOW = 6; private const int BUFFER_OVERFLOW = 6;
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
@ -126,10 +126,11 @@ namespace Novell.Casa.Client.Auth
SSCS_EXT_T ext = new SSCS_EXT_T(); SSCS_EXT_T ext = new SSCS_EXT_T();
LUID sluid;
if ((luid != null) && (luid.GetHighPart() != 0) || (luid.GetLowPart() != 0)) if ((luid != null) && (luid.GetHighPart() != 0) || (luid.GetLowPart() != 0))
{ {
// allocate a structure to marshal // allocate a structure to marshal
LUID sluid = new LUID(); sluid = new LUID();
sluid.luidHigh = luid.GetHighPart(); sluid.luidHigh = luid.GetHighPart();
sluid.luidLow = luid.GetLowPart(); sluid.luidLow = luid.GetLowPart();

View File

@ -4,6 +4,7 @@
Version="8.00" Version="8.00"
Name="test" Name="test"
ProjectGUID="{6034EBF1-0838-45C4-A538-A41A31EC8F46}" ProjectGUID="{6034EBF1-0838-45C4-A538-A41A31EC8F46}"
RootNamespace="test"
Keyword="Win32Proj" Keyword="Win32Proj"
> >
<Platforms> <Platforms>
@ -62,10 +63,10 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="authtoken.lib ws2_32.lib" AdditionalDependencies="casa_authtoken.lib ws2_32.lib"
OutputFile="$(OutDir)/test.exe" OutputFile="$(OutDir)/test.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;C:\Program Files\novell\CASA\lib&quot;" AdditionalLibraryDirectories="&quot;C:\Program Files\novell\CASA\lib&quot;;&quot;C:\Dev\casa\CASA-auth-token\client\lib\windows&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/test.pdb" ProgramDatabaseFile="$(OutDir)/test.pdb"
SubSystem="1" SubSystem="1"
@ -94,7 +95,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="copy ..\..\windows\debug\authtoken.dll debug\authtoken.dll" CommandLine="copy ..\..\windows\debug\casa_authtoken.dll debug\casa_authtoken.dll"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
@ -142,7 +143,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="authtoken.lib ws2_32.lib" AdditionalDependencies="casa_authtoken.lib ws2_32.lib"
OutputFile="$(OutDir)/test.exe" OutputFile="$(OutDir)/test.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;C:\Program Files\novell\CASA\lib&quot;" AdditionalLibraryDirectories="&quot;C:\Program Files\novell\CASA\lib&quot;"

View File

@ -67,7 +67,7 @@
IgnoreImportLibrary="false" IgnoreImportLibrary="false"
AdditionalOptions="/EXPORT:ObtainAuthToken /EXPORT:ObtainAuthTokenEx" AdditionalOptions="/EXPORT:ObtainAuthToken /EXPORT:ObtainAuthTokenEx"
AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib" AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib"
OutputFile="$(OutDir)/authtoken.dll" OutputFile="$(OutDir)/casa_authtoken.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;C:\Dev\Expat-2.0.0\StaticLibs&quot;" AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;C:\Dev\Expat-2.0.0\StaticLibs&quot;"
IgnoreAllDefaultLibraries="false" IgnoreAllDefaultLibraries="false"
@ -151,7 +151,7 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/EXPORT:ObtainAuthToken /EXPORT:ObtainAuthTokenEx" AdditionalOptions="/EXPORT:ObtainAuthToken /EXPORT:ObtainAuthTokenEx"
AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib" AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib"
OutputFile="$(OutDir)/authtoken.dll" OutputFile="$(OutDir)/casa_authtoken.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;C:\Dev\Expat-2.0.0\StaticLibs&quot;" AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;C:\Dev\Expat-2.0.0\StaticLibs&quot;"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"

View File

@ -34,13 +34,19 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A" "MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A"
"OwnerKey" = "8:_C1C37E2154994C29B02FDD9C90635B26" "OwnerKey" = "8:_8E623C85FD4143F3B09460457E8ED6CA"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A" "MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A"
"OwnerKey" = "8:_8E623C85FD4143F3B09460457E8ED6CA" "OwnerKey" = "8:_C1C37E2154994C29B02FDD9C90635B26"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_75519C9025D94CC496F276E698CE3AF8"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
@ -487,6 +493,34 @@
{ {
} }
} }
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_75519C9025D94CC496F276E698CE3AF8"
{
"SourcePath" = "8:..\\..\\..\\lib\\windows\\Debug\\casa_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"
{
}
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8E623C85FD4143F3B09460457E8ED6CA" "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8E623C85FD4143F3B09460457E8ED6CA"
{ {
"SourcePath" = "8:..\\..\\..\\lib\\mechanisms\\pwd\\windows\\Debug\\pwmech.dll" "SourcePath" = "8:..\\..\\..\\lib\\mechanisms\\pwd\\windows\\Debug\\pwmech.dll"
@ -517,7 +551,7 @@
} }
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1C37E2154994C29B02FDD9C90635B26" "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1C37E2154994C29B02FDD9C90635B26"
{ {
"SourcePath" = "8:..\\..\\..\\lib\\windows\\Debug\\authtoken.dll" "SourcePath" = "8:..\\..\\..\\lib\\windows\\Debug\\casa_authtoken.dll"
"TargetName" = "8:" "TargetName" = "8:"
"Tag" = "8:" "Tag" = "8:"
"Folder" = "8:_01897726E7804A3B875B67A1C2692147" "Folder" = "8:_01897726E7804A3B875B67A1C2692147"