From 61317df8aab2fe2fd47baba8a137566df7b23395 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 14 Nov 2005 07:06:16 +0000
Subject: r11721: Fix warnings (This used to be commit
 d760583e388157ff25e317da06c57e5a42f171bd)

---
 source4/include/structs.h     | 5 +++++
 source4/libcli/smb2/close.c   | 2 +-
 source4/libcli/smb2/getinfo.c | 2 +-
 source4/libcli/smb2/read.c    | 2 +-
 source4/libcli/smb2/request.c | 6 +++---
 source4/libcli/smb2/write.c   | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/source4/include/structs.h b/source4/include/structs.h
index e519c52b52..4f97a6aada 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -344,3 +344,8 @@ struct smb2_tree_connect;
 struct smb2_create;
 struct smb2_close;
 struct smb2_getinfo;
+struct smb2_read;
+struct smb2_write;
+struct smb2_handle;
+
+union smb2_fileinfo;
diff --git a/source4/libcli/smb2/close.c b/source4/libcli/smb2/close.c
index d5a2c4d422..cf1cdbef5f 100644
--- a/source4/libcli/smb2/close.c
+++ b/source4/libcli/smb2/close.c
@@ -38,7 +38,7 @@ struct smb2_request *smb2_close_send(struct smb2_tree *tree, struct smb2_close *
 	SSVAL(req->out.body, 0x00, io->in.buffer_code);
 	SSVAL(req->out.body, 0x02, io->in.flags);
 	SIVAL(req->out.body, 0x04, io->in._pad);
-	smb2_put_handle(req->out.body+0x08, io->in.handle);
+	smb2_put_handle(req->out.body+0x08, &io->in.handle);
 
 	smb2_transport_send(req);
 
diff --git a/source4/libcli/smb2/getinfo.c b/source4/libcli/smb2/getinfo.c
index a7935526e5..ffc2a92daf 100644
--- a/source4/libcli/smb2/getinfo.c
+++ b/source4/libcli/smb2/getinfo.c
@@ -42,7 +42,7 @@ struct smb2_request *smb2_getinfo_send(struct smb2_tree *tree, struct smb2_getin
 	SIVAL(req->out.body, 0x0C, io->in.flags);
 	SIVAL(req->out.body, 0x10, io->in.unknown3);
 	SIVAL(req->out.body, 0x14, io->in.unknown4);
-	smb2_put_handle(req->out.body+0x18, io->in.handle);
+	smb2_put_handle(req->out.body+0x18, &io->in.handle);
 
 	smb2_transport_send(req);
 
diff --git a/source4/libcli/smb2/read.c b/source4/libcli/smb2/read.c
index cbb3f74fa4..0d63a6ba0a 100644
--- a/source4/libcli/smb2/read.c
+++ b/source4/libcli/smb2/read.c
@@ -39,7 +39,7 @@ struct smb2_request *smb2_read_send(struct smb2_tree *tree, struct smb2_read *io
 	SSVAL(req->out.body, 0x02, 0);
 	SIVAL(req->out.body, 0x04, io->in.length);
 	SBVAL(req->out.body, 0x08, io->in.offset);
-	smb2_put_handle(req->out.body+0x10, io->in.handle);
+	smb2_put_handle(req->out.body+0x10, &io->in.handle);
 	memcpy(req->out.body+0x20, io->in._pad, 17);
 
 	smb2_transport_send(req);
diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c
index a06121df05..4e40b1884a 100644
--- a/source4/libcli/smb2/request.c
+++ b/source4/libcli/smb2/request.c
@@ -267,9 +267,9 @@ NTSTATUS smb2_string_blob(TALLOC_CTX *mem_ctx, const char *str, DATA_BLOB *blob)
 /*
   put a file handle into a buffer
 */
-void smb2_put_handle(uint8_t *data, struct smb2_handle h)
+void smb2_put_handle(uint8_t *data, struct smb2_handle *h)
 {
-	SBVAL(data, 0, h.data[0]);
-	SBVAL(data, 8, h.data[1]);
+	SBVAL(data, 0, h->data[0]);
+	SBVAL(data, 8, h->data[1]);
 }
 
diff --git a/source4/libcli/smb2/write.c b/source4/libcli/smb2/write.c
index f842969b93..e458a540e8 100644
--- a/source4/libcli/smb2/write.c
+++ b/source4/libcli/smb2/write.c
@@ -39,7 +39,7 @@ struct smb2_request *smb2_write_send(struct smb2_tree *tree, struct smb2_write *
 	SSVAL(req->out.body, 0x02, req->out.body+0x30 - req->out.hdr);
 	SIVAL(req->out.body, 0x04, io->in.data.length);
 	SBVAL(req->out.body, 0x08, io->in.offset);
-	smb2_put_handle(req->out.body+0x10, io->in.handle);
+	smb2_put_handle(req->out.body+0x10, &io->in.handle);
 	memcpy(req->out.body+0x20, io->in._pad, 0x10);
 	memcpy(req->out.body+0x30, io->in.data.data, io->in.data.length);
 
-- 
cgit