Merged V2.0 to HEAD

5450: (from V1.4)
      5423 (V1.4): CIFS authentication
   5451: (from V1.4)
      5432 (V1.4): 'No root node' fix
      5437 (V1.4): EHCache upgrade
      5440 (V1.4): AR-1355 - Ticket cache config fix
      5442 (V1.4): Bootstrap reorganization
      5446 (V1.4): AR-1353
   5452: (from V1.4)
      5391: AR-1310 (script rename fix)
   5453: Win32NetBIOS LANA
   5454: CIFS unused code


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/filesys/smb/server/NTProtocolHandler.java

@@ -3153,6 +3153,17 @@ public class NTProtocolHandler extends CoreProtocolHandler
             return;
         }
         
+        // Check if the search is for an NTFS stream
+        
+        if ( FileName.containsStreamName( srchPath))
+        {
+        	// NTFS streams not supported
+        	
+            m_sess.sendErrorResponseSMB(SMBStatus.NTObjectNotFound, SMBStatus.SRVNonSpecificError,
+                    SMBStatus.ErrSrv);
+            return;
+        }
+        
         // Access the shared device disk interface
 
         SearchContext ctx = null;

source/java/org/alfresco/filesys/smb/server/SMBSrvSession.java

@@ -313,6 +313,16 @@ public class SMBSrvSession extends SrvSession implements Runnable
 		m_vcircuits.removeCircuit(uid, this);
 	}
     
+	/**
+	 * Return the count of virtual circuits on this session
+	 * 
+	 * @return int
+	 */
+	public final int getVirtualCircuitCount()
+	{
+		return m_vcircuits != null ? m_vcircuits.getCircuitCount() : 0;
+	}
+	
     /**
 	 * Cleanup any resources owned by this session, close files, searches and
 	 * change notification requests.