summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2013-03-19 12:16:32 -0700
committerKarolin Seeger <kseeger@samba.org>2013-04-25 12:50:58 +0200
commit67839e1138d8d9a2e4aa69fdd0eb1e0504a1910d (patch)
tree07cbc61dc95fae19c93ea2f45ede50a063ecccb0
parent07ab7e645de69700b2924465eccd5489c78b457a (diff)
downloadsamba-67839e1138d8d9a2e4aa69fdd0eb1e0504a1910d.tar.gz
If we already have an smb1req attached to the struct smbd_smb2_request, don't recreate it.
Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Stefan (metze) Metzmacher <metze@samba.org> (cherry picked from commit ec9fc986da8279f15338b7682c629bfdfc36d016)
-rw-r--r--source3/smbd/smb2_glue.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/smbd/smb2_glue.c b/source3/smbd/smb2_glue.c
index 1b2b4dd693f..9fc1e49c2e5 100644
--- a/source3/smbd/smb2_glue.c
+++ b/source3/smbd/smb2_glue.c
@@ -28,9 +28,13 @@ struct smb_request *smbd_smb2_fake_smb_request(struct smbd_smb2_request *req)
struct smb_request *smbreq;
const uint8_t *inhdr = SMBD_SMB2_IN_HDR_PTR(req);
- smbreq = talloc_zero(req, struct smb_request);
- if (smbreq == NULL) {
- return NULL;
+ if (req->smb1req) {
+ smbreq = req->smb1req;
+ } else {
+ smbreq = talloc_zero(req, struct smb_request);
+ if (smbreq == NULL) {
+ return NULL;
+ }
}
smbreq->request_time = req->request_time;