diff options
| author | Jeremy Allison <jra@samba.org> | 2011-02-09 15:05:58 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-02-09 15:13:40 -0800 |
| commit | 1607ebfe8632fa13c5ffb466b8c9f416d7ab20aa (patch) | |
| tree | 8abea25027bd719eb7eb8e1fdb89371e7f72d49a /source3/smbd/reply.c | |
| parent | 61c1f312d2665197d34245537a8f5b641bda1243 (diff) | |
| download | samba-1607ebfe8632fa13c5ffb466b8c9f416d7ab20aa.tar.gz samba-1607ebfe8632fa13c5ffb466b8c9f416d7ab20aa.tar.bz2 samba-1607ebfe8632fa13c5ffb466b8c9f416d7ab20aa.zip | |
Allow SMB2_FIND to actually use the open fd handle if we support fdopendir. Fallback to pathname opendir if not.
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index e64627b06c..120b8bc69f 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1460,6 +1460,7 @@ void reply_search(struct smb_request *req) SCVAL(status,0,(dirtype & 0x1F)); nt_status = dptr_create(conn, + NULL, /* fsp */ directory, True, expect_close, @@ -2646,7 +2647,7 @@ NTSTATUS unlink_internals(connection_struct *conn, struct smb_request *req, goto out; } - dir_hnd = OpenDir(talloc_tos(), conn, fname_dir, fname_mask, + dir_hnd = OpenDir(talloc_tos(), conn, NULL, fname_dir, fname_mask, dirtype); if (dir_hnd == NULL) { status = map_nt_error_from_unix(errno); @@ -6379,7 +6380,7 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx, goto out; } - dir_hnd = OpenDir(talloc_tos(), conn, fname_src_dir, fname_src_mask, + dir_hnd = OpenDir(talloc_tos(), conn, NULL, fname_src_dir, fname_src_mask, attrs); if (dir_hnd == NULL) { status = map_nt_error_from_unix(errno); @@ -7066,7 +7067,7 @@ void reply_copy(struct smb_request *req) goto out; } - dir_hnd = OpenDir(ctx, conn, fname_src_dir, fname_src_mask, 0); + dir_hnd = OpenDir(ctx, conn, NULL, fname_src_dir, fname_src_mask, 0); if (dir_hnd == NULL) { status = map_nt_error_from_unix(errno); reply_nterror(req, status); |