evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of ssh://screamer.citi.umich.edu/home/projects/ms-nfs41-client-dev

Browse source
This commit is contained in:
unknown 2011-08-26 16:31:24 -04:00
commit c5878eb662
4 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.vc10/daemon.vcxproj
View file

@ -143,7 +143,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\sys;..\xdr;..\dll;..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NO_CB_4_KRB5P;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -171,7 +171,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\sys;..\xdr;..\dll;..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NO_CB_4_KRB5P;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

6
build.vc10/libtirpc.vcxproj
View file

@ -91,7 +91,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>INET6;FD_SETSIZE=128;PORTMAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>INET6;FD_SETSIZE=128;PORTMAP;NO_CB_4_KRB5P;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -139,7 +139,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>INET6;FD_SETSIZE=128;PORTMAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>INET6;FD_SETSIZE=128;PORTMAP;NO_CB_4_KRB5P;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
@ -165,7 +165,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>INET6;FD_SETSIZE=128;PORTMAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>INET6;FD_SETSIZE=128;PORTMAP;NO_CB_4_KRB5P;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>

10
build.vc10/ms-nfs41-client.sln
View file

@ -13,8 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtirpc", "libtirpc.vcxpro
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nfs_install", "nfs_install.vcxproj", "{A453DC17-BE6B-4271-A020-66E054AB5908}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asio", "asio.vcxproj", "{F08DE7DF-7B11-4ECF-9E6E-DD8C7DB40B27}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -71,14 +69,6 @@ Global
{A453DC17-BE6B-4271-A020-66E054AB5908}.Release|Win32.Build.0 = Release|Win32
{A453DC17-BE6B-4271-A020-66E054AB5908}.Release|x64.ActiveCfg = Release|x64
{A453DC17-BE6B-4271-A020-66E054AB5908}.Release|x64.Build.0 = Release|x64
{F08DE7DF-7B11-4ECF-9E6E-DD8C7DB40B27}.Debug|Win32.ActiveCfg = Debug|Win32
{F08DE7DF-7B11-4ECF-9E6E-DD8C7DB40B27}.Debug|Win32.Build.0 = Debug|Win32
{F08DE7DF-7B11-4ECF-9E6E-DD8C7DB40B27}.Debug|x64.ActiveCfg = Debug|x64
{F08DE7DF-7B11-4ECF-9E6E-DD8C7DB40B27}.Debug|x64.Build.0 = Debug|x64
{F08DE7DF-7B11-4ECF-9E6E-DD8C7DB40B27}.Release|Win32.ActiveCfg = Release|Win32
{F08DE7DF-7B11-4ECF-9E6E-DD8C7DB40B27}.Release|Win32.Build.0 = Release|Win32
{F08DE7DF-7B11-4ECF-9E6E-DD8C7DB40B27}.Release|x64.ActiveCfg = Release|x64
{F08DE7DF-7B11-4ECF-9E6E-DD8C7DB40B27}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
daemon/callback_server.c
View file

@ -49,7 +49,7 @@ void nfs41_callback_session_init(
IN nfs41_session *session)
{
/* initialize the replay cache with status NFS4ERR_SEQ_MISORDERED */
struct cb_compound_res res;
struct cb_compound_res res = { 0 };
StringCchCopyA(res.tag.str, CB_COMPOUND_MAX_TAG, g_server_tag);
res.tag.len = sizeof(g_server_tag);
res.status = NFS4ERR_SEQ_MISORDERED;