Author: metze
Date: 2006-07-10 10:27:02 +0000 (Mon, 10 Jul 2006)
New Revision: 16910

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16910

Log:
- don't search the wildcard handle
  (a handle with all bits set to 1 is justed for some
   SMB2 Ioctl calls...)
- don't crash if we didn't find the tcon

metze
Modified:
   branches/SAMBA_4_0/source/smb_server/smb2/tcon.c


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb2/tcon.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/tcon.c    2006-07-10 09:39:14 UTC 
(rev 16909)
+++ branches/SAMBA_4_0/source/smb_server/smb2/tcon.c    2006-07-10 10:27:02 UTC 
(rev 16910)
@@ -53,10 +53,18 @@
                return NULL;
        }
 
+       /* if it's the wildcard handle, don't waste time to search it... */
+       if (hid == UINT64_MAX && tid == UINT32_MAX) {
+               return NULL;
+       }
+
 /* TODO: add comments */
        tcon = req->tcon;
        if (tid != req->tcon->tid) {
                tcon = smbsrv_smb2_tcon_find(req->session, tid, 
req->request_time);
+               if (!tcon) {
+                       return NULL;
+               }
        }
 
        handle = smbsrv_smb2_handle_find(tcon, hid, req->request_time);

Reply via email to