[SCM] Samba Shared Repository - branch master updated - d9c40172bf3ca4c18da0ddc04b1aad1c36187a30

[Volker Lendecke]

The branch, master has been updated
       via  d9c40172bf3ca4c18da0ddc04b1aad1c36187a30 (commit)
       via  50aa8a4ac8184a9b0feb89f6cb9b6a74e856d126 (commit)
      from  cda0b7051967afaaaafbd3dad2052c66b3035491 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d9c40172bf3ca4c18da0ddc04b1aad1c36187a30
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jan 10 13:04:33 2009 +0100

    Fix a type-punned error

commit 50aa8a4ac8184a9b0feb89f6cb9b6a74e856d126
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jan 10 13:02:43 2009 +0100

    Fix a C++ warning

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/process.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 1f24058..60e58aa 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -406,8 +406,8 @@ static void smbd_deferred_open_timer(struct event_context *ev,
 	TALLOC_CTX *mem_ctx = talloc_tos();
 	uint8_t *inbuf;
 
-	inbuf = talloc_memdup(mem_ctx, msg->buf.data,
-			      msg->buf.length);
+	inbuf = (uint8_t *)talloc_memdup(mem_ctx, msg->buf.data,
+					 msg->buf.length);
 	if (inbuf == NULL) {
 		exit_server("smbd_deferred_open_timer: talloc failed\n");
 		return;
@@ -1884,7 +1884,7 @@ static void smbd_server_connection_read_handler(struct smbd_server_connection *c
 	/* TODO: make this completely nonblocking */
 
 	status = receive_smb_talloc(mem_ctx, smbd_server_fd(),
-				    (char **)&inbuf,
+				    (char **)(void *)&inbuf,
 				    0, /* timeout */
 				    &unread_bytes,
 				    &encrypted,


-- 
Samba Shared Repository