Windows: NPCancelConnection set correct length

The RemoteNameLength passed in the IOCTL_AFS_CANCEL_CONNECTION call
must not include the trailing NUL.  NPGetConnection() returns the
size of the buffer used which does include the trailing NUL.

Change-Id: Ic5eae51aade91db4a799bea83d898af6fbc37504
Reviewed-on: http://gerrit.openafs.org/5806
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>

diff --git a/src/WINNT/afsrdr/npdll/AFS_Npdll.c b/src/WINNT/afsrdr/npdll/AFS_Npdll.c
index 56e9ef1663bf6af0abca5da150ca9793cc08b3e0..9b889bef74eca18455a0b0a99a2e1791c47b65f4 100644 (file)
--- a/src/WINNT/afsrdr/npdll/AFS_Npdll.c
+++ b/src/WINNT/afsrdr/npdll/AFS_Npdll.c
@@ -912,6 +912,11 @@ NPCancelConnection( LPWSTR  lpName,
 #endif
                 try_return( dwStatus = WN_NOT_CONNECTED);
             }
+
+            //
+            // NPGetConnection returns the buffer size not the length without NUL
+            //
+            dwRemoteNameLength -= sizeof( WCHAR);
         }
         else
         {