Attachment 8764 Details for Bug 9782 – [PATCH 2/3] s3:smbd: convert srvstr_pull_req_talloc() into a function

[patch] [PATCH 2/3] s3:smbd: convert srvstr_pull_req_talloc() into a function

0002-s3-smbd-convert-srvstr_pull_req_talloc-into-a-functi.patch (text/plain), 2.66 KB, created by Ralph Wuerthner on 2013-04-12 08:00:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Wuerthner

Created: 2013-04-12 08:00:37 UTC

Size: 2.66 KB

patch

obsolete

>From 04beaba9f52e5aa5e052871904058522206edc3b Mon Sep 17 00:00:00 2001
>From: Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
>Date: Thu, 4 Apr 2013 13:24:36 +0200
>Subject: [PATCH 2/3] s3:smbd: convert srvstr_pull_req_talloc() into a
> function
>
>---
> source3/include/srvstr.h |    9 ---------
> source3/smbd/proto.h     |    2 ++
> source3/smbd/reply.c     |   11 +++++++++++
> 3 files changed, 13 insertions(+), 9 deletions(-)
>
>diff --git a/source3/include/srvstr.h b/source3/include/srvstr.h
>index 7e7d8a2..2c6e7ef 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 fae1407..d360df6 100644
>--- a/source3/smbd/proto.h
>+++ b/source3/smbd/proto.h
>@@ -826,6 +826,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 17dd513..31d6aef 100644
>--- a/source3/smbd/reply.c
>+++ b/source3/smbd/reply.c
>@@ -339,6 +339,17 @@ 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.
> ****************************************************************************/
>-- 
>1.7.9.5
>

Actions: View

Attachments on bug 9782: 8763 | 8764 | 8765 | 8766