pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Patch for nfs4 UNC path prefix+build config misc, 2024-02-03
Posted by Anonymous on Sat 3rd Feb 2024 13:01
raw | new post

  1. From 78deb146beb8841011ce66acfe8078a51ee9aed8 Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Sat, 3 Feb 2024 10:36:28 +0100
  4. Subject: [PATCH 1/3] nfs41_np,mount: Let nfs_mount do the \nfs4 UNC path
  5.  prefix instead of nfs41_np
  6.  
  7. Let nfs_mount.exe do the \nfs4 UNC path prefix instead of nfs41_np.dll.
  8.  
  9. As side-effect both normal and Windows UNC paths
  10. always have \nfs4 in them (e.g. \\derfwnb4966_ipv4@2049\nfs4\bigdisk
  11. (Windows UNC) and //derfwnb4966_ipv4@2049/nfs4/bigdisk (Cygwin UNC)
  12. instead of just the the Cygwin UNC paths, which constantly confused
  13. users madly.
  14.  
  15. This patch adds a |NFS41_DRIVER_MOUNT_DOES_NFS4_PREFIX| config
  16. option (enabled by default) to "nfs41_build_features.h" for now, until
  17. we now the change is safe&OK.
  18.  
  19. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  20. ---
  21. dll/nfs41_np.c             | 13 +++++++++++++
  22.  mount/enum.c               |  6 +++++-
  23.  mount/mount.c              | 16 ++++------------
  24.  sys/nfs41_build_features.h | 11 +++++++++++
  25.  4 files changed, 33 insertions(+), 13 deletions(-)
  26.  
  27. diff --git a/dll/nfs41_np.c b/dll/nfs41_np.c
  28. index 7af92ce..80cc3a1 100644
  29. --- a/dll/nfs41_np.c
  30. +++ b/dll/nfs41_np.c
  31. @@ -28,6 +28,7 @@
  32.  #include <devioctl.h>
  33.  #include <strsafe.h>
  34.  
  35. +#include "nfs41_build_features.h"
  36.  #include "nfs41_driver.h"
  37.  #include "nfs41_np.h"
  38.  #include "options.h"
  39. @@ -477,10 +478,13 @@ NPAddConnection3(
  40.          i++;
  41.      }
  42.      ServerName[i] = L'\0';
  43. +
  44.      StringCchCatW( ConnectionName, NFS41_SYS_MAX_PATH_LEN, ServerName);
  45. +#ifndef NFS41_DRIVER_MOUNT_DOES_NFS4_PREFIX
  46.      /* insert the "nfs4" in between the server name and the path,
  47.       * just to make sure all calls to our driver come thru this */
  48.      StringCchCatW( ConnectionName, NFS41_SYS_MAX_PATH_LEN, L"\\nfs4" );
  49. +#endif /* NFS41_DRIVER_MOUNT_DOES_NFS4_PREFIX */
  50.  
  51.  #ifdef CONVERT_2_UNIX_SLASHES
  52.      /* convert all windows slashes to unix slashes */
  53. @@ -505,6 +509,15 @@ NPAddConnection3(
  54.          }
  55.      }
  56.  #endif
  57. +
  58. +#ifdef NFS41_DRIVER_MOUNT_DOES_NFS4_PREFIX
  59. +    if (wcsncmp(&p[i], L"\\nfs4", 5) != 0) {
  60. +        DbgP(( L"[nfs41_np] Connection name '%s' not prefixed with '\\nfs41'\n", &p[i]));
  61. +        Status = WN_BAD_NETNAME;
  62. +        goto out;
  63. +    }
  64. +#endif /* NFS41_DRIVER_MOUNT_DOES_NFS4_PREFIX */
  65. +
  66.      StringCchCatW( ConnectionName, NFS41_SYS_MAX_PATH_LEN, &p[i]);
  67.      DbgP(( L"[aglo] Full Connect Name: %s\n", ConnectionName ));
  68.      DbgP(( L"[aglo] Full Connect Name Length: %d %d\n",
  69. diff --git a/mount/enum.c b/mount/enum.c
  70. index 22b2878..c22f79f 100644
  71. --- a/mount/enum.c
  72. +++ b/mount/enum.c
  73. @@ -39,16 +39,20 @@ void PrintMountLine(
  74.      TCHAR *b = cygwin_unc_buffer;
  75.      LPCTSTR s = remote;
  76.      TCHAR sc;
  77. +#ifndef NFS41_DRIVER_MOUNT_DOES_NFS4_PREFIX
  78.      unsigned int backslash_counter = 0;
  79. +#endif
  80.  
  81.      while((sc = *s++) != TEXT('\0')) {
  82.          switch(sc) {
  83.              case TEXT('\\'):
  84.                  *b++ = TEXT('/');
  85. +#ifndef NFS41_DRIVER_MOUNT_DOES_NFS4_PREFIX
  86.                  if (backslash_counter++ == 2) {
  87.                      (void)wcscpy_s(b, 6, TEXT("nfs4/"));
  88.                      b+=5;
  89.                  }
  90. +#endif
  91.                  break;
  92.              default:
  93.                  *b++ = sc;
  94. @@ -56,7 +60,7 @@ void PrintMountLine(
  95.          }
  96.      }
  97.      *b = TEXT('\0');
  98. -
  99. +// FIXME: We should print the URL
  100.      _tprintf(TEXT("%-8s\t%-40s\t%s\n"), local, remote, cygwin_unc_buffer);
  101.  }
  102.  
  103. diff --git a/mount/mount.c b/mount/mount.c
  104. index 2671163..df8d040 100644
  105. --- a/mount/mount.c
  106. +++ b/mount/mount.c
  107. @@ -32,6 +32,7 @@
  108.  #include <stdlib.h>
  109.  #include <stdio.h>
  110.  
  111. +#include "nfs41_build_features.h"
  112.  #include "nfs41_driver.h" /* NFS41_PROVIDER_NAME_A */
  113.  #include "options.h"
  114.  #include "urlparser1.h"
  115. @@ -573,20 +574,11 @@ static DWORD ParseRemoteName(
  116.      result = StringCbCat(pConnectionName, cchConnectionLen, srvname);
  117.      if (FAILED(result))
  118.          goto out;
  119. -#ifdef FIXME_NOT_WORKING_YET
  120. -    /*
  121. -     * gisurn: fixme: why does this not work ?
  122. -     *
  123. -     * nfs_mount.exe should list UNC paths with \nfs4\ to distinguish
  124. -     * them from default SMB UNC paths
  125. -     *
  126. -     * $ nfs_mount.exe -o sec=sys,port=2049 Z 'derfwpc5131:/export/home/rmainz'
  127. -     * WNetUseConnection(Z:, \nfs4\export\home\rmainz) failed with error code 67.
  128. -     */
  129. -    result = StringCchCopy(pConnectionName, cchConnectionLen, TEXT("\\nfs4"));
  130. +#ifdef NFS41_DRIVER_MOUNT_DOES_NFS4_PREFIX
  131. +    result = StringCbCat(pConnectionName, cchConnectionLen, TEXT("\\nfs4"));
  132.      if (FAILED(result))
  133.          goto out;
  134. -#endif /* FIXME_NOT_WORKING_YET */
  135. +#endif /* NFS41_DRIVER_MOUNT_DOES_NFS4_PREFIX */
  136.      if (*pEnd)
  137.          result = StringCchCat(pConnectionName, cchConnectionLen, pEnd);
  138.  
  139. diff --git a/sys/nfs41_build_features.h b/sys/nfs41_build_features.h
  140. index 04e5d8f..3fdbe05 100644
  141. --- a/sys/nfs41_build_features.h
  142. +++ b/sys/nfs41_build_features.h
  143. @@ -53,4 +53,15 @@
  144.   */
  145.  #define NFS41_DRIVER_STABILITY_HACKS 1
  146.  
  147. +/*
  148. + * NFS41_DRIVER_MOUNT_DOES_NFS4_PREFIX - nfs_mount.exe and
  149. + * not nfs41_np does the \nfs4 prefix between servername and path
  150. + * in UNC paths. As side-effect both normal and Windows UNC paths
  151. + * always have \nfs4 in them (e.g. \\derfwnb4966_ipv4@2049\nfs4\bigdisk
  152. + * (Windows UNC) and //derfwnb4966_ipv4@2049/nfs4/bigdisk (Cygwin UNC)
  153. + * instead of just the the Cygwin UNC paths, which constantly confuses
  154. + * users madly.
  155. + */
  156. +#define NFS41_DRIVER_MOUNT_DOES_NFS4_PREFIX 1
  157. +
  158.  #endif /* !_NFS41_DRIVER_BUILDFEATURES_ */
  159. --
  160. 2.43.0
  161.  
  162. From be8f99a46376ec6d8e4e1dcfa095e5927222f878 Mon Sep 17 00:00:00 2001
  163. From: Roland Mainz <roland.mainz@nrubsig.org>
  164. Date: Sat, 3 Feb 2024 11:15:33 +0100
  165. Subject: [PATCH 2/3] Move sys/nfs41_build_features.h to src root
  166.  
  167. Move sys/nfs41_build_features.h to nfs41_build_features.h, as all
  168. build projects now use it.
  169.  
  170. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  171. ---
  172. build.vc19/nfs41_driver/nfs41_driver.vcxproj     | 16 ++++++++--------
  173.  build.vc19/nfs41_np/nfs41_np.vcxproj             |  8 ++++----
  174.  build.vc19/nfs_mount/nfs_mount.vcxproj           |  8 ++++----
  175.  build.vc19/nfsd/nfsd.vcxproj                     |  8 ++++----
  176.  ...41_build_features.h => nfs41_build_features.h |  0
  177.  5 files changed, 20 insertions(+), 20 deletions(-)
  178.  rename sys/nfs41_build_features.h => nfs41_build_features.h (100%)
  179.  
  180. diff --git a/build.vc19/nfs41_driver/nfs41_driver.vcxproj b/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  181. index 00deb5d..72f4c7c 100644
  182. --- a/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  183. +++ b/build.vc19/nfs41_driver/nfs41_driver.vcxproj
  184. @@ -135,7 +135,7 @@
  185.    </PropertyGroup>
  186.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
  187.      <ClCompile>
  188. -      <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  189. +      <AdditionalIncludeDirectories>..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  190.        <WarningLevel>Level3</WarningLevel>
  191.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  192.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  193. @@ -147,7 +147,7 @@
  194.    </ItemDefinitionGroup>
  195.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
  196.      <ClCompile>
  197. -      <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  198. +      <AdditionalIncludeDirectories>..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  199.        <WarningLevel>Level3</WarningLevel>
  200.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  201.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  202. @@ -159,7 +159,7 @@
  203.    </ItemDefinitionGroup>
  204.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
  205.      <ClCompile>
  206. -      <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  207. +      <AdditionalIncludeDirectories>..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  208.        <WarningLevel>Level3</WarningLevel>
  209.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  210.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  211. @@ -171,7 +171,7 @@
  212.    </ItemDefinitionGroup>
  213.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
  214.      <ClCompile>
  215. -      <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  216. +      <AdditionalIncludeDirectories>..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  217.        <WarningLevel>Level3</WarningLevel>
  218.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  219.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  220. @@ -183,7 +183,7 @@
  221.    </ItemDefinitionGroup>
  222.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
  223.      <ClCompile>
  224. -      <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  225. +      <AdditionalIncludeDirectories>..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  226.        <WarningLevel>Level3</WarningLevel>
  227.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  228.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  229. @@ -195,7 +195,7 @@
  230.    </ItemDefinitionGroup>
  231.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
  232.      <ClCompile>
  233. -      <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  234. +      <AdditionalIncludeDirectories>..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  235.        <WarningLevel>Level3</WarningLevel>
  236.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  237.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  238. @@ -207,7 +207,7 @@
  239.    </ItemDefinitionGroup>
  240.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  241.      <ClCompile>
  242. -      <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  243. +      <AdditionalIncludeDirectories>..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  244.        <WarningLevel>Level3</WarningLevel>
  245.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  246.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  247. @@ -219,7 +219,7 @@
  248.    </ItemDefinitionGroup>
  249.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  250.      <ClCompile>
  251. -      <AdditionalIncludeDirectories>..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  252. +      <AdditionalIncludeDirectories>..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  253.        <WarningLevel>Level3</WarningLevel>
  254.        <PreprocessorDefinitions>EXPLODE_POOLTAGS;MONOLITHIC_MINIRDR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  255.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  256. diff --git a/build.vc19/nfs41_np/nfs41_np.vcxproj b/build.vc19/nfs41_np/nfs41_np.vcxproj
  257. index f1bbdb7..2ed321b 100644
  258. --- a/build.vc19/nfs41_np/nfs41_np.vcxproj
  259. +++ b/build.vc19/nfs41_np/nfs41_np.vcxproj
  260. @@ -88,7 +88,7 @@
  261.        <WarningLevel>Level3</WarningLevel>
  262.        <Optimization>Disabled</Optimization>
  263.        <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  264. -      <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  265. +      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  266.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  267.        <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  268.      </ClCompile>
  269. @@ -105,7 +105,7 @@
  270.        <WarningLevel>Level3</WarningLevel>
  271.        <Optimization>Disabled</Optimization>
  272.        <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  273. -      <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  274. +      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  275.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  276.        <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  277.      </ClCompile>
  278. @@ -124,7 +124,7 @@
  279.        <FunctionLevelLinking>true</FunctionLevelLinking>
  280.        <IntrinsicFunctions>true</IntrinsicFunctions>
  281.        <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  282. -      <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  283. +      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  284.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  285.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  286.      </ClCompile>
  287. @@ -145,7 +145,7 @@
  288.        <FunctionLevelLinking>true</FunctionLevelLinking>
  289.        <IntrinsicFunctions>true</IntrinsicFunctions>
  290.        <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;NDEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  291. -      <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  292. +      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  293.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  294.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  295.      </ClCompile>
  296. diff --git a/build.vc19/nfs_mount/nfs_mount.vcxproj b/build.vc19/nfs_mount/nfs_mount.vcxproj
  297. index 039e1b5..c7354bf 100644
  298. --- a/build.vc19/nfs_mount/nfs_mount.vcxproj
  299. +++ b/build.vc19/nfs_mount/nfs_mount.vcxproj
  300. @@ -88,7 +88,7 @@
  301.        <WarningLevel>Level3</WarningLevel>
  302.        <Optimization>Disabled</Optimization>
  303.        <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  304. -      <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  305. +      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  306.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  307.        <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  308.      </ClCompile>
  309. @@ -105,7 +105,7 @@
  310.        <WarningLevel>Level3</WarningLevel>
  311.        <Optimization>Disabled</Optimization>
  312.        <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  313. -      <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  314. +      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  315.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  316.        <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  317.      </ClCompile>
  318. @@ -124,7 +124,7 @@
  319.        <FunctionLevelLinking>true</FunctionLevelLinking>
  320.        <IntrinsicFunctions>true</IntrinsicFunctions>
  321.        <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  322. -      <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  323. +      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  324.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  325.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  326.      </ClCompile>
  327. @@ -145,7 +145,7 @@
  328.        <FunctionLevelLinking>true</FunctionLevelLinking>
  329.        <IntrinsicFunctions>true</IntrinsicFunctions>
  330.        <PreprocessorDefinitions>WIN32;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  331. -      <AdditionalIncludeDirectories>..\..\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  332. +      <AdditionalIncludeDirectories>..\..\sys;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  333.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  334.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  335.      </ClCompile>
  336. diff --git a/build.vc19/nfsd/nfsd.vcxproj b/build.vc19/nfsd/nfsd.vcxproj
  337. index 909c623..0a050de 100644
  338. --- a/build.vc19/nfsd/nfsd.vcxproj
  339. +++ b/build.vc19/nfsd/nfsd.vcxproj
  340. @@ -88,7 +88,7 @@
  341.        <WarningLevel>Level3</WarningLevel>
  342.        <Optimization>Disabled</Optimization>
  343.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  344. -      <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  345. +      <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  346.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  347.        <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  348.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  349. @@ -108,7 +108,7 @@
  350.        <WarningLevel>Level3</WarningLevel>
  351.        <Optimization>Disabled</Optimization>
  352.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;STANDALONE_NFSD;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;UNICODE;_UNICODE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  353. -      <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  354. +      <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  355.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  356.        <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  357.        <BasicRuntimeChecks>Default</BasicRuntimeChecks>
  358. @@ -130,7 +130,7 @@
  359.        <FunctionLevelLinking>true</FunctionLevelLinking>
  360.        <IntrinsicFunctions>true</IntrinsicFunctions>
  361.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  362. -      <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  363. +      <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  364.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  365.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  366.        <BufferSecurityCheck>false</BufferSecurityCheck>
  367. @@ -153,7 +153,7 @@
  368.        <FunctionLevelLinking>true</FunctionLevelLinking>
  369.        <IntrinsicFunctions>true</IntrinsicFunctions>
  370.        <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;UNICODE;_UNICODE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  371. -      <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  372. +      <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;..\..\sys;..\..\dll;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  373.        <LanguageStandard_C>stdc17</LanguageStandard_C>
  374.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  375.        <BufferSecurityCheck>false</BufferSecurityCheck>
  376. diff --git a/sys/nfs41_build_features.h b/nfs41_build_features.h
  377. similarity index 100%
  378. rename from sys/nfs41_build_features.h
  379. rename to nfs41_build_features.h
  380. --
  381. 2.43.0
  382.  
  383. From fb17cdd82ee8255970bab2528c33baf9bee8da20 Mon Sep 17 00:00:00 2001
  384. From: Roland Mainz <roland.mainz@nrubsig.org>
  385. Date: Sat, 3 Feb 2024 11:17:34 +0100
  386. Subject: [PATCH 3/3] nfs41_np,mount: Let nfs_mount do the \nfs4 UNC path
  387.  prefix instead of nfs41_np (refix)
  388.  
  389. Refix, add missing include "nfs41_build_features.h" to mount/enum.c
  390.  
  391. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  392. ---
  393. mount/enum.c | 1 +
  394.  1 file changed, 1 insertion(+)
  395.  
  396. diff --git a/mount/enum.c b/mount/enum.c
  397. index c22f79f..6229370 100644
  398. --- a/mount/enum.c
  399. +++ b/mount/enum.c
  400. @@ -24,6 +24,7 @@
  401.  #include <stdio.h>
  402.  #include <malloc.h>
  403.  
  404. +#include "nfs41_build_features.h"
  405.  #include "nfs41_driver.h" /* NFS41_PROVIDER_NAME_A */
  406.  
  407.  
  408. --
  409. 2.43.0

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting:

To highlight particular lines, prefix each line with {%HIGHLIGHT}




All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at