From f7cf559480c04989c7c46126f2036fe78f301705 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Wed, 20 Mar 2013 16:23:59 -0400 Subject: [PATCH] Windows: NPCancelConnection without drive letter When canceling a network connection to a UNC path, do not match connections that have drive letters assigned. Only cancel the connection if there it matches the UNC path and has no local name. Change-Id: I2c27c6d08cec65406f7e7f9eb61cd6d6c7be1f5c Reviewed-on: http://gerrit.openafs.org/9640 Tested-by: BuildBot Reviewed-by: Peter Scott Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsrdr/kernel/lib/AFSNetworkProviderSupport.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/WINNT/afsrdr/kernel/lib/AFSNetworkProviderSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSNetworkProviderSupport.cpp index 3cb840b69..c6cd352fc 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSNetworkProviderSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSNetworkProviderSupport.cpp @@ -458,7 +458,9 @@ AFSCancelConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, if( ( ConnectCB->LocalName != L'\0' && pConnection->LocalName == ConnectCB->LocalName) || - ( RtlCompareUnicodeString( &uniRemoteName, + ( ConnectCB->LocalName == L'\0' && + pConnection->LocalName == L'\0' && + RtlCompareUnicodeString( &uniRemoteName, &pConnection->RemoteName, TRUE) == 0)) { -- 2.39.5