[SCM] Samba Shared Repository - branch v3-6-test updated

Günther Deschner gd at samba.org
Tue Sep 21 00:02:07 MDT 2010


The branch, v3-6-test has been updated
       via  5742ccf lib/tdb: fix c++ build warning in tdb_header_hash().
      from  ee51d03 s3-build: only link in prs parser where needed.

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


- Log -----------------------------------------------------------------
commit 5742ccff3bf521f512d07937ce7748161127f16d
Author: Günther Deschner <gd at samba.org>
Date:   Mon Sep 20 16:01:51 2010 -0700

    lib/tdb: fix c++ build warning in tdb_header_hash().
    
    Guenther
    (cherry picked from commit 1585c4df68a66569524a41def95488666dd827dd)

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

Summary of changes:
 lib/tdb/common/open.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/common/open.c b/lib/tdb/common/open.c
index d195c1c..a964994 100644
--- a/lib/tdb/common/open.c
+++ b/lib/tdb/common/open.c
@@ -55,7 +55,7 @@ void tdb_header_hash(struct tdb_context *tdb,
 	hash_key.dsize = sizeof(TDB_MAGIC_FOOD);
 	*magic1_hash = tdb->hash_fn(&hash_key);
 
-	hash_key.dptr = CONVERT(tdb_magic);
+	hash_key.dptr = (unsigned char *)CONVERT(tdb_magic);
 	hash_key.dsize = sizeof(tdb_magic);
 	*magic2_hash = tdb->hash_fn(&hash_key);
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list