diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 11:59:02 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 11:59:02 +0100 |
| commit | 4e750552b789054f094c3dc42f091cebdc4f715e (patch) | |
| tree | 6231d9969f39482b5b9e74e7ee519a96cc989653 /source4/smb_server/smb2/find.c | |
| parent | 85ac8dc17ad8cd01bb773383fd30261b9f357292 (diff) | |
| parent | e8cf95773df914e8d71dcc1ce713fe0cc723d946 (diff) | |
| download | samba-4e750552b789054f094c3dc42f091cebdc4f715e.tar.gz samba-4e750552b789054f094c3dc42f091cebdc4f715e.tar.bz2 samba-4e750552b789054f094c3dc42f091cebdc4f715e.zip | |
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
(This used to be commit d31987461984aebf8c6f2513e83c92757c0f83c7)
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)); } |