[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-846-gb62dd61

[Michael Adam]

The branch, v3-2-test has been updated
       via  b62dd61cc56ec33601289fd4e23058c7f9ad3f0d (commit)
       via  18ced7e42072953a1968db15b0a344b54214b83d (commit)
      from  eefd03d39b107598e9b0d1f35def7b17073d8ebc (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit b62dd61cc56ec33601289fd4e23058c7f9ad3f0d
Author: Michael Adam <obnox at samba.org>
Date:   Sun Apr 13 00:24:42 2008 +0200

    libnetapi: fix a C++ warning by making implicit cast explicit
    
    Michael

commit 18ced7e42072953a1968db15b0a344b54214b83d
Author: Michael Adam <obnox at samba.org>
Date:   Sun Apr 13 00:23:58 2008 +0200

    dbwrap_tdb2: fix a C++ warning by making implicit cast explicit
    
    Michael

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

Summary of changes:
 source/lib/dbwrap_tdb2.c       |    6 +++---
 source/lib/netapi/serverinfo.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/dbwrap_tdb2.c b/source/lib/dbwrap_tdb2.c
index cbcbe71..9f68ef4 100644
--- a/source/lib/dbwrap_tdb2.c
+++ b/source/lib/dbwrap_tdb2.c
@@ -569,9 +569,9 @@ static void db_tdb2_queue_change(struct db_tdb2_ctx *db_ctx, const TDB_DATA key)
 	}
 	db_ctx->changes.keys = keys;
 
-	keys[db_ctx->changes.num_keys].data = talloc_memdup(keys,
-							    key.dptr,
-							    key.dsize);
+	keys[db_ctx->changes.num_keys].data = (uint8_t *)talloc_memdup(keys,
+								key.dptr,
+								key.dsize);
 	if (!keys[db_ctx->changes.num_keys].data) {
 		goto overflow;
 	}
diff --git a/source/lib/netapi/serverinfo.c b/source/lib/netapi/serverinfo.c
index 58efeb3..dd7a880 100644
--- a/source/lib/netapi/serverinfo.c
+++ b/source/lib/netapi/serverinfo.c
@@ -90,7 +90,7 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	*r->out.buffer = talloc_memdup(ctx, &info, sizeof(info));
+	*r->out.buffer = (uint8_t *)talloc_memdup(ctx, &info, sizeof(info));
 	if (!*r->out.buffer) {
 		werr = WERR_NOMEM;
 		goto done;


-- 
Samba Shared Repository