pastebin - collaborative debugging tool
rovema.kpaste.net RSS


msnfs41client: Patches for UNC-path-only mounts, cleanup+misc, 2024-10-04
Posted by Anonymous on Fri 4th Oct 2024 16:45
raw | new post

  1. From 5bda5090408e41fb51fe364a3f1802934c533841 Mon Sep 17 00:00:00 2001
  2. From: Roland Mainz <roland.mainz@nrubsig.org>
  3. Date: Wed, 2 Oct 2024 14:41:59 +0200
  4. Subject: [PATCH 1/5] tests: Add "drmemory on NFS filesystem" to manual tests
  5.  
  6. Add "drmemory on NFS filesystem" to manual tests
  7.  
  8. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  9. ---
  10. tests/manual_testing.txt | 8 ++++++++
  11.  1 file changed, 8 insertions(+)
  12.  
  13. diff --git a/tests/manual_testing.txt b/tests/manual_testing.txt
  14. index b0d6098..883f722 100644
  15. --- a/tests/manual_testing.txt
  16. +++ b/tests/manual_testing.txt
  17. @@ -402,4 +402,12 @@ svn checkout https://svn.FreeBSD.org/base/head/share/man
  18.  cd /cygdrive/n/xxx/
  19.  time ksh93 $msnfs41clientgitroot/tests/fstest_make_numtree1/fstest_make_numtree1.ksh93 all
  20.  
  21. +
  22. +#
  23. +# Run DrMemory with log dir on NFSv4.1 filesystem
  24. +#
  25. +cd /cygdrive/n/xxx/
  26. +drmemory -batch -check_uninit_all -strict_bitops -logdir "$(cygpath -w "$PWD")" -- "$(cygpath -w /sbin/nfs_mount)"
  27. +
  28. +
  29.  # EOF.
  30. --
  31. 2.45.1
  32.  
  33. From e92bb6d4fe713603233a8b833a4ae26050ad919b Mon Sep 17 00:00:00 2001
  34. From: Roland Mainz <roland.mainz@nrubsig.org>
  35. Date: Wed, 2 Oct 2024 15:12:53 +0200
  36. Subject: [PATCH 2/5] sys: Remove some NOP-debug code from hot codepaths+remove
  37.  unused |xidLock|
  38.  
  39. Remove some NOP-debug code from hot codepaths+remove unused |xidLock|
  40.  
  41. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  42. ---
  43. sys/nfs41_debug.c  | 26 ++++++++++----------------
  44.  sys/nfs41_debug.h  | 14 +++++++-------
  45.  sys/nfs41_driver.c | 34 ++++++++++++++++++----------------
  46.  3 files changed, 35 insertions(+), 39 deletions(-)
  47.  
  48. diff --git a/sys/nfs41_debug.c b/sys/nfs41_debug.c
  49. index 4bd6692..854cdf4 100644
  50. --- a/sys/nfs41_debug.c
  51. +++ b/sys/nfs41_debug.c
  52. @@ -95,14 +95,12 @@ ULONG __cdecl print_error(IN PCCH fmt, ...)
  53.      return 0;
  54.  }
  55.  
  56. -void print_hexbuf(int on, unsigned char *title, unsigned char *buf, int len)
  57. +void print_hexbuf(const char *title, unsigned char *buf, int len)
  58.  {
  59.      int j, k;
  60.      LARGE_INTEGER timestamp, local_time;
  61.      TIME_FIELDS time_fields;
  62.  
  63. -    if (!on) return;
  64. -
  65.      KeQuerySystemTime(&timestamp);
  66.      ExSystemTimeToLocalTime(&timestamp,&local_time);
  67.      RtlTimeToTimeFields(&local_time, &time_fields);
  68. @@ -120,9 +118,8 @@ void print_hexbuf(int on, unsigned char *title, unsigned char *buf, int len)
  69.      DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, "\n");
  70.  }
  71.  
  72. -void print_ioctl(int on, int op)
  73. +void print_ioctl(int op)
  74.  {
  75. -    if(!on) return;
  76.      switch(op) {
  77.          case IRP_MJ_FILE_SYSTEM_CONTROL:
  78.              DbgP("IRP_MJ_FILE_SYSTEM_CONTROL\n");
  79. @@ -138,9 +135,8 @@ void print_ioctl(int on, int op)
  80.      };
  81.  }
  82.  
  83. -void print_fs_ioctl(int on, int op)
  84. +void print_fs_ioctl(int op)
  85.  {
  86. -    if(!on) return;
  87.      switch(op) {
  88.          case IOCTL_NFS41_INVALCACHE:
  89.              DbgP("IOCTL_NFS41_INVALCACHE\n");
  90. @@ -209,16 +205,17 @@ void print_std_info(int on, PFILE_STANDARD_INFORMATION info)
  91.          info->DeletePending);
  92.  }
  93.  
  94. -void print_ea_info(int on, PFILE_FULL_EA_INFORMATION info)
  95. +void print_ea_info(PFILE_FULL_EA_INFORMATION info)
  96.  {
  97. -    if (!on) return;
  98.      DbgP("FULL_EA_INFO: NextOffset=%d Flags=%x EaNameLength=%d "
  99.          "ExValueLength=%x EaName=%s\n", info->NextEntryOffset, info->Flags,
  100.          info->EaNameLength, info->EaValueLength, info->EaName);
  101. +#if DEBUG_EAINFO_DETAILS
  102.      if (info->EaValueLength)
  103. -        print_hexbuf(0, (unsigned char *)"eavalue",
  104. +        print_hexbuf("eavalue",
  105.              (unsigned char *)info->EaName + info->EaNameLength + 1,
  106.              info->EaValueLength);
  107. +#endif /* DEBUG_EAINFO_DETAILS */
  108.  }
  109.  
  110.  void print_get_ea(int on, PFILE_GET_EA_INFORMATION info)
  111. @@ -228,9 +225,8 @@ void print_get_ea(int on, PFILE_GET_EA_INFORMATION info)
  112.          info->NextEntryOffset, info->EaNameLength, info->EaName);
  113.  }
  114.  
  115. -VOID print_srv_call(int on, IN PMRX_SRV_CALL p)
  116. +VOID print_srv_call(IN PMRX_SRV_CALL p)
  117.  {
  118. -    if (!on) return;
  119.      DbgP("PMRX_SRV_CALL %p\n", p);
  120.  #if 0
  121.      DbgP("\tNodeReferenceCount %ld\n", p->NodeReferenceCount);
  122. @@ -246,9 +242,8 @@ VOID print_srv_call(int on, IN PMRX_SRV_CALL p)
  123.  #endif
  124.  }
  125.  
  126. -VOID print_net_root(int on, IN PMRX_NET_ROOT p)
  127. +VOID print_net_root(IN PMRX_NET_ROOT p)
  128.  {
  129. -    if (!on) return;
  130.      DbgP("PMRX_NET_ROOT %p\n", p);
  131.  #if 0
  132.      DbgP("\tNodeReferenceCount %ld\n", p->NodeReferenceCount);
  133. @@ -267,9 +262,8 @@ VOID print_net_root(int on, IN PMRX_NET_ROOT p)
  134.  #endif
  135.  }
  136.  
  137. -VOID print_v_net_root(int on, IN PMRX_V_NET_ROOT p)
  138. +VOID print_v_net_root(IN PMRX_V_NET_ROOT p)
  139.  {
  140. -    if (!on) return;
  141.      DbgP("PMRX_V_NET_ROOT %p\n", p);
  142.  #if 0
  143.      DbgP("\tNodeReferenceCount %ld\n", p->NodeReferenceCount);
  144. diff --git a/sys/nfs41_debug.h b/sys/nfs41_debug.h
  145. index 45cf457..6fcaf27 100644
  146. --- a/sys/nfs41_debug.h
  147. +++ b/sys/nfs41_debug.h
  148. @@ -28,9 +28,9 @@
  149.  ULONG __cdecl DbgP(IN PCCH fmt, ...);
  150.  ULONG __cdecl print_error(IN PCCH fmt, ...);
  151.  VOID print_fo_all(int on, IN PRX_CONTEXT c);
  152. -VOID print_srv_call(int on, IN PMRX_SRV_CALL p);
  153. -VOID print_net_root(int on, IN PMRX_NET_ROOT p);
  154. -VOID print_v_net_root(int on, IN PMRX_V_NET_ROOT p);
  155. +VOID print_srv_call(IN PMRX_SRV_CALL p);
  156. +VOID print_net_root(IN PMRX_NET_ROOT p);
  157. +VOID print_v_net_root(IN PMRX_V_NET_ROOT p);
  158.  VOID print_fcb(int on, IN PMRX_FCB p);
  159.  VOID print_srv_open(int on, IN PMRX_SRV_OPEN p);
  160.  VOID print_fobx(int on, IN PMRX_FOBX p);
  161. @@ -39,14 +39,14 @@ VOID print_irps_flags(int on, PIO_STACK_LOCATION irps);
  162.  void print_nt_create_params(int on, NT_CREATE_PARAMETERS params);
  163.  unsigned char *print_file_information_class(int InfoClass);
  164.  unsigned char *print_fs_information_class(int InfoClass);
  165. -void print_hexbuf(int on, unsigned char *title, unsigned char *buf, int len);
  166. -void print_ioctl(int on, int op);
  167. -void print_fs_ioctl(int on, int op);
  168. +void print_hexbuf(const char *title, unsigned char *buf, int len);
  169. +void print_ioctl(int op);
  170. +void print_fs_ioctl(int op);
  171.  void print_driver_state(int state);
  172.  void print_file_object(int on, PFILE_OBJECT file);
  173.  void print_basic_info(int on, PFILE_BASIC_INFORMATION info);
  174.  void print_std_info(int on, PFILE_STANDARD_INFORMATION info);
  175. -void print_ea_info(int on, PFILE_FULL_EA_INFORMATION info);
  176. +void print_ea_info(PFILE_FULL_EA_INFORMATION info);
  177.  void print_get_ea(int on, PFILE_GET_EA_INFORMATION info);
  178.  void print_caching_level(int on, ULONG flag, PUNICODE_STRING s);
  179.  const char *opcode2string(int opcode);
  180. diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c
  181. index 8143840..2f2038c 100644
  182. --- a/sys/nfs41_driver.c
  183. +++ b/sys/nfs41_driver.c
  184. @@ -109,7 +109,6 @@ PRDBSS_DEVICE_OBJECT nfs41_dev;
  185.  
  186.  KEVENT upcallEvent;
  187.  FAST_MUTEX upcallLock, downcallLock, fcblistLock;
  188. -FAST_MUTEX xidLock;
  189.  FAST_MUTEX openOwnerLock;
  190.  
  191.  LONGLONG xid = 0;
  192. @@ -1591,8 +1590,8 @@ static NTSTATUS handle_upcall(
  193.          print_error("Unknown nfs41 ops %d\n", entry->opcode);
  194.      }
  195.  
  196. -    if (status == STATUS_SUCCESS)
  197. -        print_hexbuf(0, (unsigned char *)"upcall buffer", pbOut, *len);
  198. +    // if (status == STATUS_SUCCESS)
  199. +    //     print_hexbuf("upcall buffer", pbOut, *len);
  200.  
  201.  out:
  202.      return status;
  203. @@ -2090,13 +2089,17 @@ static NTSTATUS nfs41_downcall(
  204.  {
  205.      NTSTATUS status = STATUS_SUCCESS;
  206.      PLOWIO_CONTEXT LowIoContext = &RxContext->LowIoContext;
  207. +#ifdef DEBUG_PRINT_DOWNCALL_HEXBUF
  208.      ULONG in_len = LowIoContext->ParamsFor.IoCtl.InputBufferLength;
  209. +#endif /* DEBUG_PRINT_DOWNCALL_HEXBUF */
  210.      unsigned char *buf = LowIoContext->ParamsFor.IoCtl.pInputBuffer;
  211.      PLIST_ENTRY pEntry;
  212.      nfs41_updowncall_entry *tmp, *cur= NULL;
  213.      BOOLEAN found = 0;
  214.  
  215. -    print_hexbuf(0, (unsigned char *)"downcall buffer", buf, in_len);
  216. +#ifdef DEBUG_PRINT_DOWNCALL_HEXBUF
  217. +    print_hexbuf("downcall buffer", buf, in_len);
  218. +#endif /* DEBUG_PRINT_DOWNCALL_HEXBUF */
  219.  
  220.      tmp = RxAllocatePoolWithTag(NonPagedPoolNx, sizeof(nfs41_updowncall_entry),
  221.              NFS41_MM_POOLTAG_DOWN);
  222. @@ -2605,14 +2608,14 @@ static NTSTATUS nfs41_DevFcbXXXControlFile(
  223.  
  224.      //DbgEn();
  225.  
  226. -    print_ioctl(0, op);
  227. +    //print_ioctl(op);
  228.      switch(op) {
  229.      case IRP_MJ_FILE_SYSTEM_CONTROL:
  230.          status = STATUS_INVALID_DEVICE_REQUEST;
  231.          break;
  232.      case IRP_MJ_DEVICE_CONTROL:
  233.      case IRP_MJ_INTERNAL_DEVICE_CONTROL:
  234. -        print_fs_ioctl(0, fsop);
  235. +        //print_fs_ioctl(fsop);
  236.          switch (fsop) {
  237.          case IOCTL_NFS41_INVALCACHE:
  238.              status = nfs41_invalidate_cache(RxContext);
  239. @@ -2744,7 +2747,7 @@ static NTSTATUS _nfs41_CreateSrvCall(
  240.  
  241.      ASSERT( pSrvCall );
  242.      ASSERT( NodeType(pSrvCall) == RDBSS_NTC_SRVCALL );
  243. -    print_srv_call(0, pSrvCall);
  244. +    // print_srv_call(pSrvCall);
  245.  
  246.      // validate the server name with the test name of 'pnfs'
  247.  #ifdef DEBUG_MOUNT
  248. @@ -3402,9 +3405,9 @@ static NTSTATUS nfs41_CreateVNetRoot(
  249.  
  250.  #ifdef DEBUG_MOUNT
  251.      DbgEn();
  252. -    print_srv_call(0, pSrvCall);
  253. -    print_net_root(0, pNetRoot);
  254. -    print_v_net_root(0, pVNetRoot);
  255. +    // print_srv_call(pSrvCall);
  256. +    // print_net_root(pNetRoot);
  257. +    // print_v_net_root(pVNetRoot);
  258.  
  259.      DbgP("pVNetRoot=0x%p pNetRoot=0x%p pSrvCall=0x%p\n", pVNetRoot, pNetRoot, pSrvCall);
  260.      DbgP("pNetRoot='%wZ' Type=%d pSrvCallName='%wZ' VirtualNetRootStatus=0x%x "
  261. @@ -3825,7 +3828,7 @@ static NTSTATUS nfs41_FinalizeSrvCall(
  262.  #ifdef DEBUG_MOUNT
  263.      DbgEn();
  264.  #endif
  265. -    print_srv_call(0, pSrvCall);
  266. +    // print_srv_call(pSrvCall);
  267.  
  268.      if (pSrvCall->Context == NULL)
  269.          goto out;
  270. @@ -3854,7 +3857,7 @@ static NTSTATUS nfs41_FinalizeNetRoot(
  271.      
  272.  #ifdef DEBUG_MOUNT
  273.      DbgEn();
  274. -    print_net_root(1, pNetRoot);
  275. +    print_net_root(pNetRoot);
  276.  #endif
  277.  
  278.      if (pNetRoot->Type != NET_ROOT_DISK && pNetRoot->Type != NET_ROOT_WILD) {
  279. @@ -3954,7 +3957,7 @@ static NTSTATUS nfs41_FinalizeVNetRoot(
  280.      NTSTATUS status = STATUS_SUCCESS;
  281.  #ifdef DEBUG_MOUNT
  282.      DbgEn();
  283. -    print_v_net_root(1, pVNetRoot);
  284. +    print_v_net_root(pVNetRoot);
  285.  #endif
  286.      if (pVNetRoot->pNetRoot->Type != NET_ROOT_DISK &&
  287.              pVNetRoot->pNetRoot->Type != NET_ROOT_WILD)
  288. @@ -4251,7 +4254,7 @@ static NTSTATUS nfs41_Create(
  289.      DbgEn();
  290.      print_debug_header(RxContext);
  291.      print_nt_create_params(1, RxContext->Create.NtCreateParameters);
  292. -    if (ea) print_ea_info(0, ea);
  293. +    // if (ea) print_ea_info(ea);
  294.  #endif
  295.  
  296.      status = check_nfs41_create_args(RxContext);
  297. @@ -5376,7 +5379,7 @@ static NTSTATUS nfs41_SetEaInformation(
  298.  #ifdef DEBUG_EA_SET
  299.      DbgEn();
  300.      print_debug_header(RxContext);
  301. -    print_ea_info(1, eainfo);
  302. +    print_ea_info(eainfo);
  303.  #endif
  304.  
  305.      status = check_nfs41_setea_args(RxContext);
  306. @@ -7871,7 +7874,6 @@ NTSTATUS DriverEntry(
  307.      KeInitializeEvent(&upcallEvent, SynchronizationEvent, FALSE );
  308.      ExInitializeFastMutex(&upcallLock);
  309.      ExInitializeFastMutex(&downcallLock);
  310. -    ExInitializeFastMutex(&xidLock);
  311.      ExInitializeFastMutex(&openOwnerLock);
  312.      ExInitializeFastMutex(&fcblistLock);
  313.      InitializeListHead(&upcall.head);
  314. --
  315. 2.45.1
  316.  
  317. From b5965962642d9e4967ef3e25a83b74e5b2010580 Mon Sep 17 00:00:00 2001
  318. From: Roland Mainz <roland.mainz@nrubsig.org>
  319. Date: Wed, 2 Oct 2024 15:43:21 +0200
  320. Subject: [PATCH 3/5] daemon: Fix incomplete initalisation in |nfs41_link()|
  321.  
  322. Fix incomplete initalisation in |nfs41_link()|.
  323.  
  324. Reported-by: Dan Shelton <dan.f.shelton@gmail.com>
  325. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  326. ---
  327. daemon/nfs41_ops.c | 9 ++++++---
  328.  1 file changed, 6 insertions(+), 3 deletions(-)
  329.  
  330. diff --git a/daemon/nfs41_ops.c b/daemon/nfs41_ops.c
  331. index 5e99522..878f34b 100644
  332. --- a/daemon/nfs41_ops.c
  333. +++ b/daemon/nfs41_ops.c
  334. @@ -44,10 +44,8 @@
  335.   * uninitalised memory issues with DrMemory
  336.   */
  337.  #define NDSH(x) x
  338. -#define NDSH2(x,y) x,y
  339.  #else
  340.  #define NDSH(x)
  341. -#define NDSH2(x,y)
  342.  #endif /* NFS41_DRIVER_STABILITY_HACKS */
  343.  
  344.  int nfs41_exchange_id(
  345. @@ -1512,10 +1510,15 @@ int nfs41_link(
  346.      nfs41_lookup_res lookup_res;
  347.      nfs41_getfh_res getfh_res;
  348.      nfs41_getattr_args getattr_args[2];
  349. -    nfs41_getattr_res getattr_res[2] NDSH2(= { 0, 0 });
  350. +    nfs41_getattr_res getattr_res[2];
  351.      nfs41_file_info info = { 0 };
  352.      nfs41_path_fh file;
  353.  
  354. +#ifdef NFS41_DRIVER_STABILITY_HACKS
  355. +    /* gisburn: fixme, see comment about |NDSH| above */
  356. +    (void)memset(getattr_res, 0, sizeof(getattr_res));
  357. +#endif /* NFS41_DRIVER_STABILITY_HACKS */
  358. +
  359.      nfs41_superblock_getattr_mask(src->fh.superblock, &info.attrmask);
  360.      nfs41_superblock_getattr_mask(dst_dir->fh.superblock, &cinfo->attrmask);
  361.      cinfo->attrmask.arr[0] |= FATTR4_WORD0_FSID;
  362. --
  363. 2.45.1
  364.  
  365. From 5a9536cb66349dddfa11d15e5c5876246aa40e19 Mon Sep 17 00:00:00 2001
  366. From: Roland Mainz <roland.mainz@nrubsig.org>
  367. Date: Fri, 4 Oct 2024 16:06:38 +0200
  368. Subject: [PATCH 4/5] cygwin,dll,mount: Implement UNC-path-only nfs_mounts
  369.  
  370. Implement UNC-path-only nfs_mounts.
  371. This allows nfs_mount.exe and nfs_umount.exe to mount/umount
  372. NFS paths without assigning a DOS drive.
  373.  
  374. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  375. ---
  376. cygwin/README.bintarball.txt |  27 +++-
  377.  dll/nfs41_np.c               | 271 +++++++++++++++++++++++++++++------
  378.  mount/mount.c                | 162 +++++++++++----------
  379.  3 files changed, 342 insertions(+), 118 deletions(-)
  380.  
  381. diff --git a/cygwin/README.bintarball.txt b/cygwin/README.bintarball.txt
  382. index 92f32f3..8fb6966 100644
  383. --- a/cygwin/README.bintarball.txt
  384. +++ b/cygwin/README.bintarball.txt
  385. @@ -43,6 +43,7 @@ NFSv4.1 filesystem driver for Windows 10/11&Windows Server 2019
  386.        characters in the mount path, independent of current locale.
  387.  
  388.  - UNC paths
  389. +    - Mounting UNC paths without DOS driver letter
  390.      - IPv6 support in UNC paths
  391.      - /sbin/nfs_mount prints UNC paths in Win32+Cygwin formats
  392.      - Cygwin bash+ksh93 support UNC paths, e.g.
  393. @@ -246,9 +247,9 @@ $ sc config ms-nfs41-client-service start=disabled
  394.  # - requires separate terminal
  395.  $ /sbin/msnfs41client run_daemon
  396.  
  397. -# Mount a filesystem and use it
  398. -$ /sbin/nfs_mount -o rw N 10.49.20.110:/net_tmpfs2
  399. -Successfully mounted '10.49.20.110@2049' to drive 'N:'
  400. +# Mount a filesystem to drive N: and use it
  401. +$ /sbin/nfs_mount -o rw N 10.49.202.230:/net_tmpfs2
  402. +Successfully mounted '10.49.202.230@2049' to drive 'N:'
  403.  $ cd /cygdrive/n/
  404.  $ ls -la
  405.  total 4
  406. @@ -264,6 +265,26 @@ $ cd ~ && /sbin/nfs_umount N:
  407.  $ cd ~
  408.  $ net use N: /delete
  409.  
  410. +# Mount a filesystem WITHOUT a dos drive assigned and use it via UNC path
  411. +$ /sbin/nfs_mount -o rw 10.49.202.230:/net_tmpfs2
  412. +Successfully mounted '10.49.202.230@2049' to drive '\0.49.202.230@2049\nfs4\net_tmpfs2'
  413. +$ cygpath -u '\0.49.202.230@2049\nfs4\net_tmpfs2'
  414. +//10.49.202.230@2049/nfs4/net_tmpfs2
  415. +$ cd '//10.49.202.230@2049/nfs4/net_tmpfs2'
  416. +$ ls -la
  417. +total 4
  418. +drwxrwxrwt 5 Unix_User+0      Unix_Group+0      100 Dec  7 14:17 .
  419. +dr-xr-xr-x 1 roland_mainz     Kein                0 Dec 14 13:48 ..
  420. +drwxr-xr-x 3 Unix_User+197608 Unix_Group+197121  80 Dec 12 16:24 10492030
  421. +drwxr-xr-x 3 Unix_User+197608 Unix_Group+197121  60 Dec 13 17:58 directory_t
  422. +drwxr-xr-x 3 Unix_User+197608 Unix_Group+197121  60 Dec  7 11:01 test2
  423. +
  424. +# Unmount filesystem:
  425. +$ cd ~ && /sbin/nfs_umount '\0.49.202.230@2049\nfs4\net_tmpfs2'
  426. +# OR
  427. +$ cd ~
  428. +$ net use '\0.49.202.230@2049\nfs4\net_tmpfs2' /delete
  429. +
  430.  # List mounted NFSv4.1 filesystems:
  431.  $ /sbin/nfs_mount
  432.  
  433. diff --git a/dll/nfs41_np.c b/dll/nfs41_np.c
  434. index 5a89134..490c0fa 100644
  435. --- a/dll/nfs41_np.c
  436. +++ b/dll/nfs41_np.c
  437. @@ -52,6 +52,13 @@
  438.  const LUID SystemLuid = SYSTEM_LUID;
  439.  #endif /* NFS41_DRIVER_SYSTEM_LUID_MOUNTS_ARE_GLOBAL */
  440.  
  441. +/* Internal marker for UNC entries in NFS41_USER_SHARED_MEMORY_NAME */
  442. +#define NFS41NP_LOCALNAME_UNC_MARKER L"_:"
  443. +
  444. +/* Local prototypes */
  445. +static DWORD is_unc_path_mounted(__in LPWSTR lpRemoteName);
  446. +
  447. +
  448.  ULONG _cdecl NFS41DbgPrint(__in LPTSTR fmt, ...)
  449.  {
  450.      ULONG rc = 0;
  451. @@ -517,14 +524,21 @@ NPAddConnection3(
  452.      WCHAR ServerName[NFS41_SYS_MAX_PATH_LEN];
  453.      PWCHAR p;
  454.      DWORD i;
  455. +    LPWSTR  lpLocalName = lpNetResource->lpLocalName;
  456.  
  457.      DbgP((L"-->  NPAddConnection3(lpNetResource->lpLocalName='%s', "
  458.          L"lpNetResource->lpRemoteName='%s', "
  459.          L"username='%s', passwd='%s')\n",
  460. -        lpNetResource->lpLocalName,
  461. +        lpLocalName,
  462.          lpNetResource->lpRemoteName,lpUserName,
  463.          lpPassword));
  464.  
  465. +    if (lpLocalName == NULL) {
  466. +        lpLocalName = NFS41NP_LOCALNAME_UNC_MARKER;
  467. +        DbgP((L"lpLocalName==NULL, "
  468. +            "changed to " NFS41NP_LOCALNAME_UNC_MARKER L"\n"));
  469. +    }
  470. +
  471.      Status = InitializeConnectionInfo(&Connection,
  472.          (PMOUNT_OPTION_BUFFER)lpNetResource->lpComment,
  473.          &ConnectionName);
  474. @@ -536,16 +550,16 @@ NPAddConnection3(
  475.      //  \device\miniredirector\;<DriveLetter>:\Server\Share
  476.  
  477.      // local name, must start with "X:"
  478. -    if (lstrlen(lpNetResource->lpLocalName) < 2 ||
  479. -        lpNetResource->lpLocalName[1] != L':') {
  480. -        DbgP((L"lpNetResource->lpLocalName(='%s') "
  481. +    if (lstrlen(lpLocalName) < 2 ||
  482. +        lpLocalName[1] != L':') {
  483. +        DbgP((L"lpLocalName(='%s') "
  484.              "is not a device letter\n",
  485. -            lpNetResource->lpLocalName));
  486. +            lpLocalName));
  487.          Status = WN_BAD_LOCALNAME;
  488.          goto out;
  489.      }
  490.  
  491. -    LocalName[0] = towupper(lpNetResource->lpLocalName[0]);
  492. +    LocalName[0] = towupper(lpLocalName[0]);
  493.      LocalName[1] = L':';
  494.      LocalName[2] = L'\0';
  495.      (void)StringCchCopyW(ConnectionName,
  496. @@ -659,15 +673,38 @@ NPAddConnection3(
  497.          (wcslen(ConnectionName) + 1) * sizeof(WCHAR),
  498.          (lstrlen(ConnectionName) + 1) * sizeof(WCHAR)));
  499.  
  500. -    wszScratch[0] = L'\0';
  501. -    Status = QueryDosDevice(LocalName, wszScratch, 1024);
  502. -    DbgP((L"QueryDosDevice(lpDeviceName='%s',lpTargetPath='%s') "
  503. -        L"returned %d/GetLastError()=%d\n",
  504. -        LocalName, wszScratch, Status, (int)GetLastError()));
  505. -
  506. -    if (Status || (GetLastError() != ERROR_FILE_NOT_FOUND)) {
  507. -        Status = WN_ALREADY_CONNECTED;
  508. -        goto out;
  509. +    if (lpNetResource->lpLocalName == NULL) {
  510. +        DWORD gc_status;
  511. +
  512. +        gc_status = is_unc_path_mounted(lpNetResource->lpRemoteName);
  513. +        DbgP((L"lpNetResource->lpLocalName == NULL, "
  514. +            "is_unc_path_mounted(lpNetResource->lpRemoteName='%s') "
  515. +            "returned gc_status=%d\n",
  516. +            lpNetResource->lpRemoteName,
  517. +            (int)gc_status));
  518. +
  519. +        if (gc_status == WN_SUCCESS) {
  520. +            /*
  521. +             * Do not return |WN_ALREADY_CONNECTED| here, as UNC
  522. +             * paths are reused
  523. +             * We explicitly use this to skip |StoreConnectionInfo()|
  524. +             * below, so we only have one stored UNC connection
  525. +             */
  526. +            Status = WN_SUCCESS;
  527. +            goto out;
  528. +        }
  529. +    }
  530. +    else {
  531. +        wszScratch[0] = L'\0';
  532. +        Status = QueryDosDevice(LocalName, wszScratch, 1024);
  533. +        DbgP((L"QueryDosDevice(lpDeviceName='%s',lpTargetPath='%s') "
  534. +            L"returned %d/GetLastError()=%d\n",
  535. +            LocalName, wszScratch, Status, (int)GetLastError()));
  536. +
  537. +        if (Status || (GetLastError() != ERROR_FILE_NOT_FOUND)) {
  538. +            Status = WN_ALREADY_CONNECTED;
  539. +            goto out;
  540. +        }
  541.      }
  542.  
  543.      MarshalConnectionInfo(&Connection);
  544. @@ -680,18 +717,20 @@ NPAddConnection3(
  545.          goto out;
  546.      }
  547.  
  548. -    DbgP((L"DefineDosDevice(lpNetResource->lpLocalName='%s', "
  549. -        L"ConnectionName='%s')\n",
  550. -        lpNetResource->lpLocalName, ConnectionName));
  551. -    if (!DefineDosDevice(DDD_RAW_TARGET_PATH |
  552. -        DDD_NO_BROADCAST_SYSTEM,
  553. -        lpNetResource->lpLocalName,
  554. -        ConnectionName)) {
  555. -        Status = GetLastError();
  556. -        DbgP((L"DefineDosDevice(lpNetResource->lpLocalName='%s',"
  557. -            L"ConnectionName='%s') failed with %d\n",
  558. -            lpNetResource->lpLocalName, ConnectionName, Status));
  559. -        goto out_delconn;
  560. +    if (lpNetResource->lpLocalName != NULL) {
  561. +        DbgP((L"DefineDosDevice(lpLocalName='%s', "
  562. +            L"ConnectionName='%s')\n",
  563. +            lpLocalName, ConnectionName));
  564. +        if (!DefineDosDevice(DDD_RAW_TARGET_PATH |
  565. +            DDD_NO_BROADCAST_SYSTEM,
  566. +            lpLocalName,
  567. +            ConnectionName)) {
  568. +            Status = GetLastError();
  569. +            DbgP((L"DefineDosDevice(lpLocalName='%s',"
  570. +                L"ConnectionName='%s') failed with %d\n",
  571. +                lpLocalName, ConnectionName, Status));
  572. +            goto out_delconn;
  573. +        }
  574.      }
  575.  
  576.      // The connection was established and the local device mapping
  577. @@ -708,10 +747,12 @@ out:
  578.      DbgP((L"<-- NPAddConnection3 returns %d\n", (int)Status));
  579.      return Status;
  580.  out_undefine:
  581. -    (void)DefineDosDevice(DDD_REMOVE_DEFINITION |
  582. -        DDD_RAW_TARGET_PATH |
  583. -        DDD_EXACT_MATCH_ON_REMOVE,
  584. -        LocalName, ConnectionName);
  585. +    if (lpNetResource->lpLocalName != NULL) {
  586. +        (void)DefineDosDevice(DDD_REMOVE_DEFINITION |
  587. +            DDD_RAW_TARGET_PATH |
  588. +            DDD_EXACT_MATCH_ON_REMOVE,
  589. +            LocalName, ConnectionName);
  590. +    }
  591.  out_delconn:
  592.      SendTo_NFS41Driver(IOCTL_NFS41_DELCONN, ConnectionName,
  593.          Connection.Buffer->NameLength, NULL, &CopyBytes);
  594. @@ -730,10 +771,20 @@ NPCancelConnection(
  595.  #ifdef NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE
  596.      LUID authenticationid = { .LowPart = 0, .HighPart = 0L };
  597.  #endif /* NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE */
  598. +    bool is_unc_path;
  599.  
  600.      DbgP((L"--> NPCancelConnection(lpName='%s', fForce=%d)\n",
  601.          lpName, (int)fForce));
  602.  
  603. +    if (lpName && (lpName[0] == L'\\') && (lpName[1] == L'\\')) {
  604. +        is_unc_path = true;
  605. +    }
  606. +    else {
  607. +        is_unc_path = false;
  608. +    }
  609. +
  610. +    DbgP((L"is_unc_path=%d\n", (int)is_unc_path));
  611. +
  612.  #ifdef NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE
  613.      (void)get_token_authenticationid(GetCurrentThreadEffectiveToken(),
  614.          &authenticationid);
  615. @@ -754,11 +805,57 @@ NPCancelConnection(
  616.                  pSharedMemory->NextAvailableIndex,
  617.                  pSharedMemory->NumberOfResourcesInUse));
  618.  
  619. -    for (Index = 0; Index < pSharedMemory->NextAvailableIndex; Index++)
  620. -    {
  621. +    for (Index = 0; Index < pSharedMemory->NextAvailableIndex; Index++) {
  622.          pNetResource = &pSharedMemory->NetResources[Index];
  623.  
  624. -        if (pNetResource->InUse) {
  625. +        if (!pNetResource->InUse)
  626. +            continue;
  627. +
  628. +        DbgP((L"Name '%s' EntryName '%s'\n",
  629. +            lpName, pNetResource->LocalName));
  630. +
  631. +        if (is_unc_path) {
  632. +            LPWSTR unc_devname = NFS41NP_LOCALNAME_UNC_MARKER;
  633. +
  634. +            if (
  635. +#ifdef NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE
  636. +                /* Need exact match here, not |SYSTEM_LUID|! */
  637. +                equal_luid(&authenticationid,
  638. +                    &pNetResource->MountAuthId) &&
  639. +#endif /* NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE */
  640. +                (((wcslen(unc_devname)+1) * sizeof(WCHAR)) ==
  641. +                pNetResource->LocalNameLength) &&
  642. +                (!wcscmp(unc_devname, pNetResource->LocalName)) &&
  643. +                (((wcslen(lpName)+1) * sizeof(WCHAR)) ==
  644. +                pNetResource->RemoteNameLength) &&
  645. +                (!wcscmp(lpName, pNetResource->RemoteName))) {
  646. +                ULONG CopyBytes;
  647. +
  648. +                DbgP((L"NPCancelConnection: UNC Connection Found:\n"));
  649. +
  650. +                CopyBytes = 0;
  651. +
  652. +                Status = SendTo_NFS41Driver(IOCTL_NFS41_DELCONN,
  653. +                            pNetResource->ConnectionName,
  654. +                            pNetResource->ConnectionNameLength,
  655. +                            NULL,
  656. +                            &CopyBytes);
  657. +
  658. +                if (Status != WN_SUCCESS) {
  659. +                    DbgP((L"SendToMiniRdr returned Status %lx\n",
  660. +                        Status));
  661. +                    break;
  662. +                }
  663. +
  664. +                pNetResource->InUse = FALSE;
  665. +                pSharedMemory->NumberOfResourcesInUse--;
  666. +
  667. +                if (Index+1 == pSharedMemory->NextAvailableIndex)
  668. +                    pSharedMemory->NextAvailableIndex--;
  669. +                break;
  670. +            }
  671. +        }
  672. +        else {
  673.              if (
  674.  #ifdef NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE
  675.                  /* Need exact match here, not |SYSTEM_LUID|! */
  676. @@ -774,7 +871,7 @@ NPCancelConnection(
  677.  
  678.                  CopyBytes = 0;
  679.  
  680. -                Status = SendTo_NFS41Driver( IOCTL_NFS41_DELCONN,
  681. +                Status = SendTo_NFS41Driver(IOCTL_NFS41_DELCONN,
  682.                              pNetResource->ConnectionName,
  683.                              pNetResource->ConnectionNameLength,
  684.                              NULL,
  685. @@ -787,7 +884,7 @@ NPCancelConnection(
  686.                  }
  687.  
  688.                  if (DefineDosDevice(DDD_REMOVE_DEFINITION |
  689. -                    DDD_RAW_TARGET_PATH | DDD_EXACT_MATCH_ON_REMOVE,
  690. +                        DDD_RAW_TARGET_PATH | DDD_EXACT_MATCH_ON_REMOVE,
  691.                      lpName,
  692.                      pNetResource->ConnectionName) == FALSE) {
  693.                      DbgP((L"DefineDosDevice error: %d\n",
  694. @@ -803,12 +900,6 @@ NPCancelConnection(
  695.                  }
  696.                  break;
  697.              }
  698. -
  699. -            DbgP((L"Name '%s' EntryName '%s'\n",
  700. -                lpName,pNetResource->LocalName));
  701. -            DbgP((L"Name Length %d Entry Name Length %d\n",
  702. -                pNetResource->LocalNameLength,
  703. -                pNetResource->LocalName));
  704.          }
  705.      }
  706.  
  707. @@ -820,6 +911,96 @@ out:
  708.      return Status;
  709.  }
  710.  
  711. +static
  712. +DWORD is_unc_path_mounted(
  713. +    __in LPWSTR lpRemoteName)
  714. +{
  715. +    DWORD   Status = 0;
  716. +
  717. +    HANDLE  hMutex, hMemory;
  718. +    PNFS41NP_SHARED_MEMORY  pSharedMemory;
  719. +#ifdef NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE
  720. +    LUID authenticationid = { .LowPart = 0, .HighPart = 0L };
  721. +#endif /* NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE */
  722. +    LPWSTR lpLocalName = NFS41NP_LOCALNAME_UNC_MARKER;
  723. +
  724. +    DbgP((L"--> is_unc_path_mounted(lpRemoteName='%s')\n", lpRemoteName));
  725. +
  726. +#ifdef NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE
  727. +    (void)get_token_authenticationid(GetCurrentThreadEffectiveToken(),
  728. +        &authenticationid);
  729. +#endif /* NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE */
  730. +
  731. +    Status = OpenSharedMemory(&hMutex,
  732. +        &hMemory,
  733. +        (PVOID)&pSharedMemory);
  734. +    if (Status != WN_SUCCESS)
  735. +        goto out;
  736. +
  737. +    INT  Index;
  738. +    PNFS41NP_NETRESOURCE pNetResource;
  739. +    PNFS41NP_NETRESOURCE foundNetResource = NULL;
  740. +#ifdef NFS41_DRIVER_SYSTEM_LUID_MOUNTS_ARE_GLOBAL
  741. +    PNFS41NP_NETRESOURCE foundSystemLuidNetResource = NULL;
  742. +#endif /* NFS41_DRIVER_SYSTEM_LUID_MOUNTS_ARE_GLOBAL */
  743. +    Status = WN_NOT_CONNECTED;
  744. +
  745. +    for (Index = 0; Index < pSharedMemory->NextAvailableIndex; Index++) {
  746. +        pNetResource = &pSharedMemory->NetResources[Index];
  747. +
  748. +        if (!pNetResource->InUse)
  749. +            continue;
  750. +
  751. +        if ((((wcslen(lpLocalName)+1)*sizeof(WCHAR)) ==
  752. +                pNetResource->LocalNameLength) &&
  753. +                (!wcscmp(lpLocalName, pNetResource->LocalName)) &&
  754. +                (((wcslen(lpRemoteName)+1)*sizeof(WCHAR)) ==
  755. +                pNetResource->RemoteNameLength) &&
  756. +                (!wcscmp(lpRemoteName, pNetResource->RemoteName))) {
  757. +#ifdef NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE
  758. +                if (equal_luid(&authenticationid,
  759. +                    &pNetResource->MountAuthId)) {
  760. +                    foundNetResource = pNetResource;
  761. +                    break;
  762. +                }
  763. +#ifdef NFS41_DRIVER_SYSTEM_LUID_MOUNTS_ARE_GLOBAL
  764. +            else if (equal_luid(&SystemLuid,
  765. +                &pNetResource->MountAuthId)) {
  766. +                /*
  767. +                 * Found netresource for user "SYSTEM", but
  768. +                 * continue searching |pSharedMemory->NetResources|
  769. +                 * for an exact match...
  770. +                 */
  771. +                foundSystemLuidNetResource = pNetResource;
  772. +            }
  773. +#endif /* NFS41_DRIVER_SYSTEM_LUID_MOUNTS_ARE_GLOBAL */
  774. +#else /* NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE */
  775. +            foundNetResource = pNetResource;
  776. +#endif /* NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE */
  777. +        }
  778. +    }
  779. +
  780. +#ifdef NFS41_DRIVER_SYSTEM_LUID_MOUNTS_ARE_GLOBAL
  781. +    /*
  782. +     * No exact match found ? Then fall-back to any match we found for
  783. +     * user "SYSTEM"
  784. +     */
  785. +    if (foundNetResource == NULL) {
  786. +        foundNetResource = foundSystemLuidNetResource;
  787. +    }
  788. +#endif /* NFS41_DRIVER_SYSTEM_LUID_MOUNTS_ARE_GLOBAL */
  789. +
  790. +    if (foundNetResource) {
  791. +        Status = WN_SUCCESS;
  792. +    }
  793. +
  794. +    CloseSharedMemory( &hMutex, &hMemory, (PVOID)&pSharedMemory);
  795. +out:
  796. +    DbgP((L"<-- is_unc_path_mounted returns %d\n", (int)Status));
  797. +
  798. +    return Status;
  799. +}
  800. +
  801.  DWORD APIENTRY
  802.  NPGetConnection(
  803.      __in LPWSTR  lpLocalName,
  804. @@ -836,6 +1017,12 @@ NPGetConnection(
  805.  
  806.      DbgP((L"--> NPGetConnection(lpLocalName='%s')\n", lpLocalName));
  807.  
  808. +    if (lpLocalName == NULL) {
  809. +        lpLocalName = NFS41NP_LOCALNAME_UNC_MARKER;
  810. +        DbgP((L"lpLocalName==NULL, "
  811. +            "changed to " NFS41NP_LOCALNAME_UNC_MARKER L"\n"));
  812. +    }
  813. +
  814.  #ifdef NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE
  815.      (void)get_token_authenticationid(GetCurrentThreadEffectiveToken(),
  816.          &authenticationid);
  817. diff --git a/mount/mount.c b/mount/mount.c
  818. index ce8d94f..dd805de 100644
  819. --- a/mount/mount.c
  820. +++ b/mount/mount.c
  821. @@ -78,6 +78,7 @@ void PrintMountUsage(LPWSTR pProcess)
  822.  {
  823.      (void)fprintf(stderr,
  824.          "Usage: %S [options] <drive letter|*> <hostname>:<path>\n"
  825. +        "Usage: %S [options] <hostname>:<path>\n"
  826.          "Usage: %S -d [options] <drive letter>\n"
  827.          "Usage: %S\n"
  828.  
  829. @@ -141,9 +142,11 @@ void PrintMountUsage(LPWSTR pProcess)
  830.          "\tnfs_mount.exe -o sec=sys,rw '*' [fe80::21b:1bff:fec3:7713]://net_tmpfs2/test2\n"
  831.          "\tnfs_mount.exe -o sec=sys,rw '*' nfs://[fe80::21b:1bff:fec3:7713]//net_tmpfs2/test2\n"
  832.          "\tnfs_mount.exe -o sec=sys,rw S nfs://myhost1//dirwithspace/dir%%20space/test2\n"
  833. +        "\tnfs_mount.exe -o sec=sys,rw nfs://myhost1//dirwithspace/dir%%20space/test2\n"
  834.          "\tnfs_mount.exe -o sec=sys,rw S nfs://myhost1//dirwithspace/dir+space/test2\n"
  835. -        "\tnfs_mount.exe -o sec=sys S nfs://myhost1//dirwithspace/dir+space/test2?rw=1\n",
  836. -        pProcess, pProcess, pProcess,
  837. +        "\tnfs_mount.exe -o sec=sys S nfs://myhost1//dirwithspace/dir+space/test2?rw=1\n"
  838. +        "\tnfs_mount.exe -o sec=sys nfs://myhost1//dirwithspace/dir+space/test2?rw=1\n",
  839. +        pProcess, pProcess, pProcess, pProcess,
  840.          (int)NFS41_DRIVER_DEFAULT_CREATE_MODE);
  841.  }
  842.  
  843. @@ -166,7 +169,7 @@ int mount_main(int argc, wchar_t *argv[])
  844.  {
  845.      int     i;
  846.      DWORD   result = NO_ERROR;
  847. -    wchar_t szLocalName[] = L"C:\0";
  848. +    wchar_t szLocalName[NFS41_SYS_MAX_PATH_LEN];
  849.      LPWSTR  pLocalName = NULL;
  850.      LPWSTR  pRemoteName = NULL;
  851.      BOOL    bUnmount = FALSE;
  852. @@ -363,11 +366,12 @@ opt_o_argv_i_again:
  853.              goto out;
  854.         }
  855.          /* drive letter */
  856. -       else if (pLocalName == NULL) {
  857. +       else if ((!bUnmount) && (pLocalName == NULL) &&
  858. +            (i == (argc-2)) && (wcslen(argv[i]) <= 2)) {
  859.              pLocalName = argv[i];
  860.          }
  861.          /* remote path */
  862. -        else if (pRemoteName == NULL) {
  863. +        else if ((pRemoteName == NULL) && (i == (argc-1))) {
  864.              pRemoteName = argv[i];
  865.          }
  866.          else {
  867. @@ -378,26 +382,21 @@ opt_o_argv_i_again:
  868.      }
  869.  
  870.      /* validate local drive letter */
  871. -    if (pLocalName == NULL)
  872. -    {
  873. -        result = ERROR_BAD_ARGUMENTS;
  874. -        (void)fwprintf(stderr, L"Missing argument for drive letter.\n\n");
  875. -        PrintMountUsage(argv[0]);
  876. -        goto out_free;
  877. -    }
  878. -    if (FALSE == ParseDriveLetter(pLocalName, szLocalName))
  879. -    {
  880. -        result = ERROR_BAD_ARGUMENTS;
  881. -        (void)fwprintf(stderr, L"Invalid drive letter '%s'. "
  882. -            L"Expected 'C' or 'C:'.\n\n",
  883. -            pLocalName);
  884. -        PrintMountUsage(argv[0]);
  885. -        goto out_free;
  886. +    if (pLocalName) {
  887. +        if (!ParseDriveLetter(pLocalName, szLocalName)) {
  888. +            result = ERROR_BAD_ARGUMENTS;
  889. +            (void)fwprintf(stderr, L"Invalid drive letter '%s'. "
  890. +                L"Expected 'C' or 'C:'.\n\n",
  891. +                pLocalName);
  892. +            PrintMountUsage(argv[0]);
  893. +            goto out_free;
  894. +        }
  895.      }
  896.  
  897.      if (bUnmount == TRUE) /* unmount */
  898.      {
  899. -        result = DoUnmount(szLocalName, bForceUnmount);
  900. +        result = DoUnmount(pLocalName?szLocalName:pRemoteName,
  901. +            bForceUnmount);
  902.          if (result)
  903.              PrintErrorMessage(result);
  904.      }
  905. @@ -440,7 +439,9 @@ opt_o_argv_i_again:
  906.              }
  907.          }
  908.  
  909. -        result = DoMount(szLocalName, szRemoteName, szParsedRemoteName, bPersistent, &Options);
  910. +        result = DoMount(pLocalName?szLocalName:NULL,
  911. +            szRemoteName, szParsedRemoteName, bPersistent,
  912. +            &Options);
  913.          if (result)
  914.              PrintErrorMessage(result);
  915.      }
  916. @@ -977,47 +978,56 @@ static DWORD DoMount(
  917.      RecursivePrintEaInformation((PFILE_FULL_EA_INFORMATION)pOptions->Buffer->Buffer);
  918.  #endif /* DEBUG_MOUNT */
  919.  
  920. -    /* fail if the connection already exists */
  921. -    dwLength = NFS41_SYS_MAX_PATH_LEN;
  922. -    result = WNetGetConnection(pLocalName, (LPWSTR)szExisting, &dwLength);
  923. -    if (result == NO_ERROR)
  924. -    {
  925. -        result = ERROR_ALREADY_ASSIGNED;
  926. -        (void)fwprintf(stderr, L"Mount failed, drive '%s' is "
  927. -            L"already assigned to '%s'.\n",
  928. -            pLocalName, szExisting);
  929. +    if (pLocalName) {
  930. +        /* fail if the connection already exists */
  931. +        dwLength = NFS41_SYS_MAX_PATH_LEN;
  932. +        result = WNetGetConnection(pLocalName, (LPWSTR)szExisting, &dwLength);
  933. +        if (result == NO_ERROR) {
  934. +            result = ERROR_ALREADY_ASSIGNED;
  935. +            (void)fwprintf(stderr, L"Mount failed, drive '%s' is "
  936. +                L"already assigned to '%s'.\n",
  937. +                pLocalName, szExisting);
  938. +            return result;
  939. +        }
  940.      }
  941. -    else
  942. -    {
  943. -        wchar_t szConnection[NFS41_SYS_MAX_PATH_LEN];
  944. -        DWORD ConnectSize = NFS41_SYS_MAX_PATH_LEN, ConnectResult, Flags = 0;
  945.  
  946. -        ZeroMemory(&NetResource, sizeof(NETRESOURCE));
  947. -        NetResource.dwType = RESOURCETYPE_DISK;
  948. -        /* drive letter is chosen automatically if lpLocalName == NULL */
  949. +    wchar_t szConnection[NFS41_SYS_MAX_PATH_LEN];
  950. +    DWORD ConnectSize = NFS41_SYS_MAX_PATH_LEN;
  951. +    DWORD ConnectResult;
  952. +    DWORD Flags = 0;
  953. +
  954. +    (void)memset(&NetResource, 0, sizeof(NETRESOURCE));
  955. +    NetResource.dwType = RESOURCETYPE_DISK;
  956. +    if (pLocalName) {
  957. +        /* drive letter is chosen automatically if lpLocalName == "*" */
  958.          NetResource.lpLocalName = *pLocalName == L'*' ? NULL : pLocalName;
  959. -        NetResource.lpRemoteName = pRemoteName;
  960. -        /* ignore other network providers */
  961. -        NetResource.lpProvider = NFS41_PROVIDER_NAME_U;
  962. -        /* pass mount options via lpComment */
  963. -        if (pOptions->Buffer->Length) {
  964. -            NetResource.lpComment = (LPWSTR)pOptions->Buffer;
  965. -        }
  966. +    }
  967. +    else {
  968. +        NetResource.lpLocalName = NULL;
  969. +    }
  970. +    NetResource.lpRemoteName = pRemoteName;
  971. +    /* ignore other network providers */
  972. +    NetResource.lpProvider = NFS41_PROVIDER_NAME_U;
  973. +    /* pass mount options via lpComment */
  974. +    if (pOptions->Buffer->Length) {
  975. +        NetResource.lpComment = (LPWSTR)pOptions->Buffer;
  976. +    }
  977.  
  978. -        if (bPersistent)
  979. -            Flags |= CONNECT_UPDATE_PROFILE;
  980. +    if (bPersistent)
  981. +        Flags |= CONNECT_UPDATE_PROFILE;
  982.  
  983. -        result = WNetUseConnection(NULL,
  984. -            &NetResource, NULL, NULL, Flags,
  985. -            szConnection, &ConnectSize, &ConnectResult);
  986. -
  987. -        if (result == NO_ERROR)
  988. -            (void)wprintf(L"Successfully mounted '%s' to drive '%s'\n",
  989. -                pParsedRemoteName, szConnection);
  990. -        else
  991. -            (void)fwprintf(stderr, L"WNetUseConnection('%s', '%s') "
  992. -                L"failed with error code %u.\n",
  993. -                pLocalName, pRemoteName, result);
  994. +    result = WNetUseConnection(NULL,
  995. +        &NetResource, NULL, NULL, Flags,
  996. +        szConnection, &ConnectSize, &ConnectResult);
  997. +
  998. +    if (result == NO_ERROR) {
  999. +        (void)wprintf(L"Successfully mounted '%s' to drive '%s'\n",
  1000. +            pParsedRemoteName, szConnection);
  1001. +    }
  1002. +    else {
  1003. +        (void)fwprintf(stderr, L"WNetUseConnection('%s', '%s') "
  1004. +            L"failed with error code %u.\n",
  1005. +            pLocalName, pRemoteName, result);
  1006.      }
  1007.  
  1008.      return result;
  1009. @@ -1050,26 +1060,32 @@ static DWORD DoUnmount(
  1010.      return result;
  1011.  }
  1012.  
  1013. +#define ISWDOSLETTER(c) \
  1014. +    ( \
  1015. +        (((c) >= L'a') && ((c) <= L'z')) || \
  1016. +        (((c) >= L'A') && ((c) <= L'Z')) \
  1017. +    )
  1018. +
  1019.  static BOOL ParseDriveLetter(
  1020.      IN LPWSTR pArg,
  1021. -    OUT PTCH pDriveLetter)
  1022. +    OUT PWCH pDriveLetter)
  1023.  {
  1024.      /* accept 'C' or 'C:' */
  1025. -    switch (wcslen(pArg))
  1026. -    {
  1027. -    case 2:
  1028. -        if (pArg[1] != L':')
  1029. -            return FALSE;
  1030. -        /* break intentionally missing */
  1031. -    case 1:
  1032. -        if (iswlower(*pArg))
  1033. -            *pArg = (wchar_t)towupper(*pArg);
  1034. -        else if (!iswupper(*pArg) && *pArg != L'*')
  1035. -            return FALSE;
  1036. -
  1037. -        *pDriveLetter = *pArg;
  1038. -        return TRUE;
  1039. +    switch (wcslen(pArg)) {
  1040. +        case 2:
  1041. +            if (pArg[1] != L':')
  1042. +                return FALSE;
  1043. +            /* fall-through */
  1044. +        case 1:
  1045. +            if (!ISWDOSLETTER(*pArg) && (*pArg != L'*'))
  1046. +                return FALSE;
  1047. +
  1048. +            pDriveLetter[0] = towupper(*pArg);
  1049. +            pDriveLetter[1] = L':';
  1050. +            pDriveLetter[2] = L'\0';
  1051. +            return TRUE;
  1052.      }
  1053. +
  1054.      return FALSE;
  1055.  }
  1056.  
  1057. --
  1058. 2.45.1
  1059.  
  1060. From 1d5acbedbe63f43fc705c0d58f2d0f211a3735ad Mon Sep 17 00:00:00 2001
  1061. From: Roland Mainz <roland.mainz@nrubsig.org>
  1062. Date: Fri, 4 Oct 2024 16:47:28 +0200
  1063. Subject: [PATCH 5/5] dll: Minor code cleanup
  1064.  
  1065. Minor code cleanup in nfs41_np
  1066.  
  1067. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
  1068. ---
  1069. dll/nfs41_np.c | 64 +++++++++++++++++++++++++-------------------------
  1070.  1 file changed, 32 insertions(+), 32 deletions(-)
  1071.  
  1072. diff --git a/dll/nfs41_np.c b/dll/nfs41_np.c
  1073. index 490c0fa..07f2984 100644
  1074. --- a/dll/nfs41_np.c
  1075. +++ b/dll/nfs41_np.c
  1076. @@ -256,7 +256,7 @@ static DWORD StoreConnectionInfo(
  1077.      IN LPCWSTR LocalName,
  1078.      IN LPCWSTR ConnectionName,
  1079.      IN USHORT ConnectionNameLength,
  1080. -    IN LPNETRESOURCE lpNetResource)
  1081. +    IN LPNETRESOURCEW lpNetResource)
  1082.  {
  1083.      DWORD status;
  1084.      HANDLE hMutex, hMemory;
  1085. @@ -499,7 +499,7 @@ NPPasswordChangeNotify (
  1086.  
  1087.  DWORD APIENTRY
  1088.  NPAddConnection(
  1089. -    __in LPNETRESOURCE   lpNetResource,
  1090. +    __in LPNETRESOURCEW  lpNetResource,
  1091.      __in_opt LPWSTR      lpPassword,
  1092.      __in_opt LPWSTR      lpUserName )
  1093.  {
  1094. @@ -510,7 +510,7 @@ NPAddConnection(
  1095.  DWORD APIENTRY
  1096.  NPAddConnection3(
  1097.      __in HWND           hwndOwner,
  1098. -    __in LPNETRESOURCE  lpNetResource,
  1099. +    __in LPNETRESOURCEW lpNetResource,
  1100.      __in_opt LPWSTR     lpPassword,
  1101.      __in_opt LPWSTR     lpUserName,
  1102.      __in DWORD          dwFlags)
  1103. @@ -1042,35 +1042,35 @@ NPGetConnection(
  1104.  #endif /* NFS41_DRIVER_SYSTEM_LUID_MOUNTS_ARE_GLOBAL */
  1105.      Status = WN_NOT_CONNECTED;
  1106.  
  1107. -    for (Index = 0; Index < pSharedMemory->NextAvailableIndex; Index++)
  1108. -    {
  1109. +    for (Index = 0; Index < pSharedMemory->NextAvailableIndex; Index++) {
  1110.          pNetResource = &pSharedMemory->NetResources[Index];
  1111.  
  1112. -        if (pNetResource->InUse) {
  1113. -            if ((((wcslen(lpLocalName)+1)*sizeof(WCHAR)) ==
  1114. -                    pNetResource->LocalNameLength) &&
  1115. -                    (!wcscmp(lpLocalName, pNetResource->LocalName))) {
  1116. +        if (!pNetResource->InUse)
  1117. +            break;
  1118. +
  1119. +        if ((((wcslen(lpLocalName)+1)*sizeof(WCHAR)) ==
  1120. +                pNetResource->LocalNameLength) &&
  1121. +                (!wcscmp(lpLocalName, pNetResource->LocalName))) {
  1122.  #ifdef NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE
  1123. -                if (equal_luid(&authenticationid,
  1124. -                    &pNetResource->MountAuthId)) {
  1125. -                    foundNetResource = pNetResource;
  1126. -                    break;
  1127. -                }
  1128. +            if (equal_luid(&authenticationid,
  1129. +                &pNetResource->MountAuthId)) {
  1130. +                foundNetResource = pNetResource;
  1131. +                break;
  1132. +            }
  1133.  #ifdef NFS41_DRIVER_SYSTEM_LUID_MOUNTS_ARE_GLOBAL
  1134. -                else if (equal_luid(&SystemLuid,
  1135. -                    &pNetResource->MountAuthId)) {
  1136. -                    /*
  1137. -                     * Found netresource for user "SYSTEM", but
  1138. -                     * continue searching |pSharedMemory->NetResources|
  1139. -                     * for an exact match...
  1140. -                     */
  1141. -                    foundSystemLuidNetResource = pNetResource;
  1142. -                }
  1143. +            else if (equal_luid(&SystemLuid,
  1144. +                &pNetResource->MountAuthId)) {
  1145. +                /*
  1146. +                 * Found netresource for user "SYSTEM", but
  1147. +                 * continue searching |pSharedMemory->NetResources|
  1148. +                 * for an exact match...
  1149. +                 */
  1150. +                foundSystemLuidNetResource = pNetResource;
  1151. +            }
  1152.  #endif /* NFS41_DRIVER_SYSTEM_LUID_MOUNTS_ARE_GLOBAL */
  1153.  #else /* NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE */
  1154. -                foundNetResource = pNetResource;
  1155. +            foundNetResource = pNetResource;
  1156.  #endif /* NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE */
  1157. -            }
  1158.          }
  1159.      }
  1160.  
  1161. @@ -1110,7 +1110,7 @@ NPOpenEnum(
  1162.      DWORD           dwScope,
  1163.      DWORD           dwType,
  1164.      DWORD           dwUsage,
  1165. -    LPNETRESOURCE   lpNetResource,
  1166. +    LPNETRESOURCEW  lpNetResource,
  1167.      LPHANDLE        lphEnum)
  1168.  {
  1169.      DWORD Status;
  1170. @@ -1158,7 +1158,7 @@ NPEnumResource(
  1171.  {
  1172.      DWORD           Status = WN_SUCCESS;
  1173.      ULONG           EntriesCopied;
  1174. -    LPNETRESOURCE   pNetResource;
  1175. +    LPNETRESOURCEW  pNetResource;
  1176.      ULONG           SpaceNeeded = 0;
  1177.      ULONG           SpaceAvailable;
  1178.      PWCHAR          StringZone;
  1179. @@ -1179,7 +1179,7 @@ NPEnumResource(
  1180.          &authenticationid);
  1181.  #endif /* NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE */
  1182.  
  1183. -    pNetResource = (LPNETRESOURCE) lpBuffer;
  1184. +    pNetResource = (LPNETRESOURCEW)lpBuffer;
  1185.      SpaceAvailable = *lpBufferSize;
  1186.      EntriesCopied = 0;
  1187.      StringZone = (PWCHAR) ((PBYTE)lpBuffer + *lpBufferSize);
  1188. @@ -1289,9 +1289,9 @@ NPCloseEnum(
  1189.  
  1190.  DWORD APIENTRY
  1191.  NPGetResourceParent(
  1192. -    LPNETRESOURCE   lpNetResource,
  1193. -    LPVOID  lpBuffer,
  1194. -    LPDWORD lpBufferSize )
  1195. +    LPNETRESOURCEW  lpNetResource,
  1196. +    LPVOID          lpBuffer,
  1197. +    LPDWORD         lpBufferSize )
  1198.  {
  1199.      DbgP((L"NPGetResourceParent: WN_NOT_SUPPORTED\n"));
  1200.      return WN_NOT_SUPPORTED;
  1201. @@ -1299,7 +1299,7 @@ NPGetResourceParent(
  1202.  
  1203.  DWORD APIENTRY
  1204.  NPGetResourceInformation(
  1205. -    __in LPNETRESOURCE   lpNetResource,
  1206. +    __in LPNETRESOURCEW   lpNetResource,
  1207.      __out_bcount(*lpBufferSize) LPVOID  lpBuffer,
  1208.      __inout LPDWORD lpBufferSize,
  1209.      __deref_out LPWSTR *lplpSystem )
  1210. --
  1211. 2.45.1

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