From 687f05edcac561618470eefb3767830950656016 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 26 Aug 2011 14:40:30 -0400 Subject: [PATCH 1/2] vc10: removed asio, made cflags consistent the release configurations of nfsd and libtirpc were missing NO_CB_4_KRB5P Signed-off-by: Casey Bodley --- build.vc10/daemon.vcxproj | 4 ++-- build.vc10/libtirpc.vcxproj | 6 +++--- build.vc10/ms-nfs41-client.sln | 10 ---------- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/build.vc10/daemon.vcxproj b/build.vc10/daemon.vcxproj index 21e6935..3bf3c50 100644 --- a/build.vc10/daemon.vcxproj +++ b/build.vc10/daemon.vcxproj @@ -143,7 +143,7 @@ MaxSpeed true ..\sys;..\xdr;..\dll;..\libtirpc\tirpc;%(AdditionalIncludeDirectories) - WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + WIN32_LEAN_AND_MEAN;NO_CB_4_KRB5P;%(PreprocessorDefinitions) MultiThreadedDLL @@ -171,7 +171,7 @@ MaxSpeed true ..\sys;..\xdr;..\dll;..\libtirpc\tirpc;%(AdditionalIncludeDirectories) - WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + WIN32_LEAN_AND_MEAN;NO_CB_4_KRB5P;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build.vc10/libtirpc.vcxproj b/build.vc10/libtirpc.vcxproj index 6d53ec9..a845f96 100644 --- a/build.vc10/libtirpc.vcxproj +++ b/build.vc10/libtirpc.vcxproj @@ -91,7 +91,7 @@ Disabled ..\libtirpc\tirpc;%(AdditionalIncludeDirectories) - INET6;FD_SETSIZE=128;PORTMAP;%(PreprocessorDefinitions) + INET6;FD_SETSIZE=128;PORTMAP;NO_CB_4_KRB5P;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -139,7 +139,7 @@ MaxSpeed true ..\libtirpc\tirpc;%(AdditionalIncludeDirectories) - INET6;FD_SETSIZE=128;PORTMAP;%(PreprocessorDefinitions) + INET6;FD_SETSIZE=128;PORTMAP;NO_CB_4_KRB5P;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -165,7 +165,7 @@ MaxSpeed true ..\libtirpc\tirpc;%(AdditionalIncludeDirectories) - INET6;FD_SETSIZE=128;PORTMAP;%(PreprocessorDefinitions) + INET6;FD_SETSIZE=128;PORTMAP;NO_CB_4_KRB5P;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/build.vc10/ms-nfs41-client.sln b/build.vc10/ms-nfs41-client.sln index a93f4d2..e8cef65 100644 --- a/build.vc10/ms-nfs41-client.sln +++ b/build.vc10/ms-nfs41-client.sln @@ -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 From 6c3bb06ecac68526c07e37b0464a541213ce456c Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 26 Aug 2011 15:03:25 -0400 Subject: [PATCH 2/2] callback: fix for nfs41_callback_session_init() Signed-off-by: Casey Bodley --- daemon/callback_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/callback_server.c b/daemon/callback_server.c index a49ad45..3c80475 100644 --- a/daemon/callback_server.c +++ b/daemon/callback_server.c @@ -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;