mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5086 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5087 . IPC$ name pipe svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5092 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5093 . MSWord support. AR-1228. Added FLOSS to new file git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5301 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -666,7 +666,7 @@ public class NTProtocolHandler extends CoreProtocolHandler
|
||||
|
||||
// Map the IPC$ share to the admin pipe type
|
||||
|
||||
if (servType == ShareType.NAMEDPIPE && share.getShareName().compareTo("IPC$") == 0)
|
||||
if (share.getShareName().compareTo("IPC$") == 0)
|
||||
servType = ShareType.ADMINPIPE;
|
||||
|
||||
// Check if the session is a null session, only allow access to the IPC$ named pipe share
|
||||
@@ -1194,7 +1194,7 @@ public class NTProtocolHandler extends CoreProtocolHandler
|
||||
|
||||
// Map the IPC$ share to the admin pipe type
|
||||
|
||||
if (servType == ShareType.NAMEDPIPE && shareName.compareTo("IPC$") == 0)
|
||||
if (shareName.compareTo("IPC$") == 0)
|
||||
servType = ShareType.ADMINPIPE;
|
||||
|
||||
// Check if the session is a null session, only allow access to the IPC$ named pipe share
|
||||
@@ -2096,7 +2096,7 @@ public class NTProtocolHandler extends CoreProtocolHandler
|
||||
|
||||
// Return an error status
|
||||
|
||||
m_sess.sendErrorResponseSMB(SMBStatus.DOSNotLocked, SMBStatus.ErrDos);
|
||||
m_sess.sendErrorResponseSMB(SMBStatus.NTRangeNotLocked, SMBStatus.DOSNotLocked, SMBStatus.ErrDos);
|
||||
return;
|
||||
}
|
||||
catch (LockConflictException ex)
|
||||
@@ -2104,9 +2104,7 @@ public class NTProtocolHandler extends CoreProtocolHandler
|
||||
|
||||
// Return an error status
|
||||
|
||||
m_sess
|
||||
.sendErrorResponseSMB(SMBStatus.NTLockNotGranted, SMBStatus.DOSLockConflict,
|
||||
SMBStatus.ErrDos);
|
||||
m_sess.sendErrorResponseSMB(SMBStatus.NTLockNotGranted, SMBStatus.DOSLockConflict, SMBStatus.ErrDos);
|
||||
return;
|
||||
}
|
||||
catch (IOException ex)
|
||||
@@ -2136,7 +2134,7 @@ public class NTProtocolHandler extends CoreProtocolHandler
|
||||
|
||||
// Return an error status
|
||||
|
||||
m_sess.sendErrorResponseSMB(SMBStatus.DOSNotLocked, SMBStatus.ErrDos);
|
||||
m_sess.sendErrorResponseSMB(SMBStatus.NTRangeNotLocked, SMBStatus.DOSNotLocked, SMBStatus.ErrDos);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user