diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 11:31:40 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 11:31:40 +0100 |
commit | 9d0d614c7af6299482ba30c7c0ad36eed5af7474 (patch) | |
tree | d2c20eeb32c7b6bb18d380fa47ab39cce06405c0 /source4/smb_server/smb2/find.c | |
parent | 0419da69d5a8ab606a49598692c050447e306663 (diff) | |
parent | 0e03c3aa892439bb5567b0129a40b267ecb6cee5 (diff) | |
download | samba-9d0d614c7af6299482ba30c7c0ad36eed5af7474.tar.gz samba-9d0d614c7af6299482ba30c7c0ad36eed5af7474.tar.bz2 samba-9d0d614c7af6299482ba30c7c0ad36eed5af7474.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 2fb93e85eb5f415fbcdfb2fc0a1a58fad823138a)
Diffstat (limited to 'source4/smb_server/smb2/find.c')
-rw-r--r-- | source4/smb_server/smb2/find.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/smb_server/smb2/find.c b/source4/smb_server/smb2/find.c index c594adf7a0..6018f1958f 100644 --- a/source4/smb_server/smb2/find.c +++ b/source4/smb_server/smb2/find.c @@ -161,6 +161,11 @@ void smb2srv_find_recv(struct smb2srv_request *req) SMB2SRV_CHECK(smb2_pull_o16s16_string(&req->in, info, req->in.body+0x18, &info->in.pattern)); info->in.max_response_size = IVAL(req->in.body, 0x1C); + /* the VFS backend does not yet handle NULL patterns */ + if (info->in.pattern == NULL) { + info->in.pattern = ""; + } + SMB2SRV_CHECK_FILE_HANDLE(info->in.file.ntvfs); SMB2SRV_CALL_NTVFS_BACKEND(smb2srv_find_backend(state)); } |