[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  9705dab s3:net rpc trust: fix two C++ implicit void * cast warnings
       via  32d816d s3:passdb:pdb_ipa: fix a C++ implicit void * cast warnings
       via  838e2dd s3:net idmap check: fix a couple of c++ implicit void * cast warnings
       via  7e4f261 packaging(RHEL-CTDB): fix configure.rpm (honour additional cmdline parameters)
      from  94f5b2f ldb:ldb_msg.c - make "ldb_msg_find_attr_as_*" more robust against invalid values

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


- Log -----------------------------------------------------------------
commit 9705dab835c618af26d86c59b49b59543aff2755
Author: Michael Adam <obnox at samba.org>
Date:   Thu Apr 7 16:54:12 2011 +0200

    s3:net rpc trust: fix two C++ implicit void * cast warnings
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Thu Apr  7 17:52:28 CEST 2011 on sn-devel-104

commit 32d816d59b34947bf1eb2d5e7e482587b815d773
Author: Michael Adam <obnox at samba.org>
Date:   Thu Apr 7 16:54:12 2011 +0200

    s3:passdb:pdb_ipa: fix a C++ implicit void * cast warnings

commit 838e2dd1f1a7bd8277b75ea2da31acd6ae2fcd0a
Author: Michael Adam <obnox at samba.org>
Date:   Thu Apr 7 16:54:12 2011 +0200

    s3:net idmap check: fix a couple of c++ implicit void * cast warnings

commit 7e4f2614abc0daa91f5909690a133e96f0f942e4
Author: Michael Adam <obnox at samba.org>
Date:   Wed Apr 6 17:53:14 2011 +0200

    packaging(RHEL-CTDB): fix configure.rpm (honour additional cmdline parameters)

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

Summary of changes:
 packaging/RHEL-CTDB/configure.rpm |    2 +-
 source3/passdb/pdb_ipa.c          |    3 ++-
 source3/utils/net_idmap_check.c   |   10 +++++-----
 source3/utils/net_rpc_trust.c     |    7 +++++--
 4 files changed, 13 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index 527b14f..616336e 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -59,7 +59,7 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \
 	--without-ldb \
 	--without-dnsupdate \
 	--with-aio-support \
-	--disable-merged-build
+	--disable-merged-build \
 	$*
 
 make showlayout
diff --git a/source3/passdb/pdb_ipa.c b/source3/passdb/pdb_ipa.c
index c98f33e..f118e6e 100644
--- a/source3/passdb/pdb_ipa.c
+++ b/source3/passdb/pdb_ipa.c
@@ -718,7 +718,8 @@ static struct pdb_domain_info *pdb_ipasam_get_domain_info(struct pdb_methods *pd
 {
 	struct pdb_domain_info *info;
 	NTSTATUS status;
-	struct ldapsam_privates *ldap_state = pdb_methods->private_data;
+	struct ldapsam_privates *ldap_state =
+			(struct ldapsam_privates *)pdb_methods->private_data;
 
 	info = talloc(mem_ctx, struct pdb_domain_info);
 	if (info == NULL) {
diff --git a/source3/utils/net_idmap_check.c b/source3/utils/net_idmap_check.c
index 5231461..556a058 100644
--- a/source3/utils/net_idmap_check.c
+++ b/source3/utils/net_idmap_check.c
@@ -258,7 +258,7 @@ typedef struct {
 
 static TDB_DATA pack_diff(TDB_DATA_diff* diff) {
 	return (TDB_DATA) {
-		.dptr = (void*)diff,
+		.dptr = (uint8_t *)diff,
 		.dsize = sizeof(TDB_DATA_diff),
 	};
 }
@@ -397,7 +397,7 @@ static bool check_version(struct check_ctx* ctx) {
 	case 'f':
 		SIVAL(&version, 0, 2);
 		add_record(ctx, string_term_tdb_data(key),
-			   make_tdb_data((void*)&version, sizeof(uint32_t)));
+			   make_tdb_data((uint8_t *)&version, sizeof(uint32_t)));
 		break;
 	case 'a':
 		return false;
@@ -422,7 +422,7 @@ static void check_hwm(struct check_ctx* ctx, const char* key, uint32_t target) {
 	if (action == 'f') {
 		SIVAL(&hwm, 0, target);
 		add_record(ctx, string_term_tdb_data(key),
-			   make_tdb_data((void*)&hwm, sizeof(uint32_t)));
+			   make_tdb_data((uint8_t *)&hwm, sizeof(uint32_t)));
 	}
 }
 
@@ -530,7 +530,7 @@ void adjust_hwm(struct check_ctx* ctx, const struct record* r) {
 
 TDB_DATA talloc_copy(TALLOC_CTX* mem_ctx, TDB_DATA data) {
 	TDB_DATA ret = {
-		.dptr  = talloc_size(mem_ctx, data.dsize+1),
+		.dptr  = (uint8_t *)talloc_size(mem_ctx, data.dsize+1),
 		.dsize = data.dsize
 	};
 	if (ret.dptr == NULL) {
@@ -683,7 +683,7 @@ TDB_DATA parse_data(TALLOC_CTX* mem_ctx, const char** ptr) {
 	srprs_skipws(ptr);
 	if (srprs_quoted(ptr, ost)) {
 		ret.dsize = cbuf_getpos(ost);
-		ret.dptr = (void*)talloc_steal(mem_ctx, cbuf_gets(ost,0));
+		ret.dptr = (uint8_t *)talloc_steal(mem_ctx, cbuf_gets(ost,0));
 	}
 	talloc_free(ost);
 	return ret;
diff --git a/source3/utils/net_rpc_trust.c b/source3/utils/net_rpc_trust.c
index 654b0f1..da0a7cc 100644
--- a/source3/utils/net_rpc_trust.c
+++ b/source3/utils/net_rpc_trust.c
@@ -519,7 +519,9 @@ static int rpc_trust_common(struct net_context *net_ctx, int argc,
 			goto done;
 		}
 
-		authinfo.auth_blob.data = talloc_memdup(mem_ctx, auth_blob.data,
+		authinfo.auth_blob.data = (uint8_t *)talloc_memdup(
+							mem_ctx,
+							auth_blob.data,
 							auth_blob.length);
 		if (authinfo.auth_blob.data == NULL) {
 			goto done;
@@ -544,7 +546,8 @@ static int rpc_trust_common(struct net_context *net_ctx, int argc,
 
 		if (other_net_ctx != NULL) {
 			talloc_free(authinfo.auth_blob.data);
-			authinfo.auth_blob.data = talloc_memdup(mem_ctx,
+			authinfo.auth_blob.data = (uint8_t *)talloc_memdup(
+								mem_ctx,
 								auth_blob.data,
 								auth_blob.length);
 			if (authinfo.auth_blob.data == NULL) {


-- 
Samba Shared Repository