[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  31c1c49 s3: Fix a c++ warning
       via  49233b4 s3: Fix "ISO C90 forbids mixed declarations and code"
       via  120b139 swrap: Fix a c++ warning
       via  dea2bd5 s3: Fix two c++ warnings
      from  6589f17 pyldb: Drop unnecessary dependency on pytalloc-util.

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


- Log -----------------------------------------------------------------
commit 31c1c49b58453704a262c2524eafac5db7d1f803
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Sep 18 01:52:14 2011 +0200

    s3: Fix a c++ warning
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sun Sep 18 18:55:48 CEST 2011 on sn-devel-104

commit 49233b41e64e931706d35741c714b6273e8f6e1e
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Sep 18 01:50:37 2011 +0200

    s3: Fix "ISO C90 forbids mixed declarations and code"

commit 120b1392d3e6bc0c7a3e25d22df5121819462730
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Sep 18 01:31:44 2011 +0200

    swrap: Fix a c++ warning

commit dea2bd5b9b1fb99329f644b58682ca3f38e7570c
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Sep 18 01:27:53 2011 +0200

    s3: Fix two c++ warnings

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

Summary of changes:
 lib/socket_wrapper/socket_wrapper.c |    3 ++-
 source3/modules/vfs_acl_common.c    |    3 ++-
 source3/rpc_client/util_lsarpc.c    |    4 ++--
 source3/utils/net_rpc_conf.c        |    6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c
index 9469809..ddfc74f 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -2198,7 +2198,8 @@ _PUBLIC_ ssize_t swrap_sendto(int s, const void *buf, size_t len, int flags, con
 		return len;
 	}
 
-	ret = real_sendto(s, buf, len, flags, msg.msg_name, msg.msg_namelen);
+	ret = real_sendto(s, buf, len, flags, (struct sockaddr *)msg.msg_name,
+			  msg.msg_namelen);
 
 	swrap_sendmsg_after(si, &msg, to, ret);
 
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index f2f55ec..9a1d13b 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -656,7 +656,8 @@ static int open_acl_common(vfs_handle_struct *handle,
 			/* Cache the parent security descriptor for
 			 * later use. */
 
-			pp_psd = VFS_ADD_FSP_EXTENSION(handle,
+			pp_psd = (struct security_descriptor **)
+				VFS_ADD_FSP_EXTENSION(handle,
 					fsp,
 					struct security_descriptor *,
 					NULL);
diff --git a/source3/rpc_client/util_lsarpc.c b/source3/rpc_client/util_lsarpc.c
index 169c10b..d67144b 100644
--- a/source3/rpc_client/util_lsarpc.c
+++ b/source3/rpc_client/util_lsarpc.c
@@ -50,7 +50,7 @@ static NTSTATUS ai_array_2_trust_domain_info_buffer(TALLOC_CTX *mem_ctx,
 					status = NT_STATUS_INVALID_PARAMETER;
 					goto fail;
 				}
-				b[i].data.data = talloc_memdup(b,
+				b[i].data.data = (uint8_t *)talloc_memdup(b,
 				    &ai->array[i].AuthInfo.nt4owf.password.hash,
 				    16);
 				if (b[i].data.data == NULL) {
@@ -76,7 +76,7 @@ static NTSTATUS ai_array_2_trust_domain_info_buffer(TALLOC_CTX *mem_ctx,
 					goto fail;
 				}
 				b[i].data.size = 4;
-				b[i].data.data = talloc_memdup(b,
+				b[i].data.data = (uint8_t *)talloc_memdup(b,
 				     &ai->array[i].AuthInfo.version.version, 4);
 				if (b[i].data.data == NULL) {
 					status = NT_STATUS_NO_MEMORY;
diff --git a/source3/utils/net_rpc_conf.c b/source3/utils/net_rpc_conf.c
index a4bb733..3dec375 100644
--- a/source3/utils/net_rpc_conf.c
+++ b/source3/utils/net_rpc_conf.c
@@ -1759,6 +1759,9 @@ static NTSTATUS rpc_conf_setparm_internal(struct net_context *c,
 	struct winreg_String key, keyclass;
 	enum winreg_CreateAction action = 0;
 
+	const char *canon_valname;
+	const char *canon_valstr;
+
 	ZERO_STRUCT(hive_hnd);
 	ZERO_STRUCT(key_hnd);
 	ZERO_STRUCT(share_hnd);
@@ -1839,9 +1842,6 @@ static NTSTATUS rpc_conf_setparm_internal(struct net_context *c,
 			break;
 	}
 
-
-	const char *canon_valname;
-	const char *canon_valstr;
 	/* check if parameter is valid for writing */
 	if (!lp_canonicalize_parameter_with_value(argv[1], argv[2],
 						  &canon_valname,


-- 
Samba Shared Repository