The branch, v3-6-test has been updated
via 50755b2 s3:net rpc trust: fix two C++ implicit void * cast warnings
via 5d563f4 s3:passdb:pdb_ipa: fix a C++ implicit void * cast warnings
via 332138a s3:net idmap check: fix a couple of c++ implicit void *
cast warnings
via e00b614 packaging(RHEL-CTDB): fix configure.rpm (honour additional
cmdline parameters)
from 8782c30 WHATSNEW: Fix typos.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 50755b2d3609b8a94abae0082a85b1117b462151
Author: Michael Adam <[email protected]>
Date: Thu Apr 7 16:54:12 2011 +0200
s3:net rpc trust: fix two C++ implicit void * cast warnings
commit 5d563f40250014f06c92bed1bb0312dfcfad0427
Author: Michael Adam <[email protected]>
Date: Thu Apr 7 16:54:12 2011 +0200
s3:passdb:pdb_ipa: fix a C++ implicit void * cast warnings
commit 332138a8ae7e65cd298e72673ff66100d1d72d0f
Author: Michael Adam <[email protected]>
Date: Thu Apr 7 16:54:12 2011 +0200
s3:net idmap check: fix a couple of c++ implicit void * cast warnings
commit e00b614f9d1a4409a3d42f965acc6e0ab2163ad7
Author: Michael Adam <[email protected]>
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 f36a6cf..9d945a4 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
