diff options
| -rw-r--r-- | source3/include/srvstr.h | 9 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 2 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 12 |
3 files changed, 14 insertions, 9 deletions
diff --git a/source3/include/srvstr.h b/source3/include/srvstr.h index 7e7d8a2e92..2c6e7ef96a 100644 --- a/source3/include/srvstr.h +++ b/source3/include/srvstr.h @@ -19,12 +19,3 @@ #define srvstr_pull_talloc(ctx, base_ptr, smb_flags2, dest, src, src_len, flags) \ pull_string_talloc(ctx, base_ptr, smb_flags2, dest, src, src_len, flags) - -/* pull a string from the smb_buf part of a packet. In this case the - string can either be null terminated or it can be terminated by the - end of the smbbuf area -*/ - -#define srvstr_pull_req_talloc(ctx, req_, dest, src, flags) \ - pull_string_talloc(ctx, req_->inbuf, req_->flags2, dest, src, \ - smbreq_bufrem(req_, src), flags) diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 7e13049ff8..2be73a24d8 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -841,6 +841,8 @@ size_t srvstr_get_path_req_wcard(TALLOC_CTX *mem_ctx, struct smb_request *req, size_t srvstr_get_path_req(TALLOC_CTX *mem_ctx, struct smb_request *req, char **pp_dest, const char *src, int flags, NTSTATUS *err); +size_t srvstr_pull_req_talloc(TALLOC_CTX *ctx, struct smb_request *req, + char **dest, const char *src, int flags); bool check_fsp_open(connection_struct *conn, struct smb_request *req, files_struct *fsp); bool check_fsp(connection_struct *conn, struct smb_request *req, diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 5fb10d5c54..274807beb9 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -339,6 +339,18 @@ size_t srvstr_get_path_req(TALLOC_CTX *mem_ctx, struct smb_request *req, flags, err, &ignore); } +/** + * pull a string from the smb_buf part of a packet. In this case the + * string can either be null terminated or it can be terminated by the + * end of the smbbuf area + */ +size_t srvstr_pull_req_talloc(TALLOC_CTX *ctx, struct smb_request *req, + char **dest, const char *src, int flags) +{ + return pull_string_talloc(ctx, req->inbuf, req->flags2, dest, src, + smbreq_bufrem(req, src), flags); +} + /**************************************************************************** Check if we have a correct fsp pointing to a file. Basic check for open fsp. ****************************************************************************/ |