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

Karolin Seeger kseeger at samba.org
Mon Nov 23 01:00:53 MST 2009


The branch, v3-4-test has been updated
       via  d96bc12... s3:fix endianness bug in dbwrap_change_int32_atomic() (bug #6901)
       via  d3db4b2... s3:fix endianness bug in dbwrap_change_uint32_atomic() (bug #6901)
      from  a23ff8b... s3/docs: Document "enable spoolss".

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


- Log -----------------------------------------------------------------
commit d96bc12a8634d50c0c74f583c264cf8f89e22637
Author: Michael Adam <obnox at samba.org>
Date:   Sat Nov 21 00:23:22 2009 +0100

    s3:fix endianness bug in dbwrap_change_int32_atomic() (bug #6901)
    
    Michael

commit d3db4b2d3a56975b0170714828921e0871bfa4a2
Author: Michael Adam <obnox at samba.org>
Date:   Sat Nov 21 00:21:56 2009 +0100

    s3:fix endianness bug in dbwrap_change_uint32_atomic() (bug #6901)
    
    Michael

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

Summary of changes:
 source3/lib/dbwrap_util.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/dbwrap_util.c b/source3/lib/dbwrap_util.c
index 3be3a49..728eb99 100644
--- a/source3/lib/dbwrap_util.c
+++ b/source3/lib/dbwrap_util.c
@@ -110,7 +110,7 @@ uint32_t dbwrap_change_uint32_atomic(struct db_context *db, const char *keystr,
 {
 	struct db_record *rec;
 	uint32 val = -1;
-	TDB_DATA data;
+	uint32_t v_store;
 
 	if (!(rec = db->fetch_locked(db, NULL,
 				     string_term_tdb_data(keystr)))) {
@@ -128,10 +128,11 @@ uint32_t dbwrap_change_uint32_atomic(struct db_context *db, const char *keystr,
 
 	val += change_val;
 
-	data.dsize = sizeof(val);
-	data.dptr = (uint8 *)&val;
+	SIVAL(&v_store, 0, val);
 
-	rec->store(rec, data, TDB_REPLACE);
+	rec->store(rec,
+		   make_tdb_data((const uint8_t *)&v_store, sizeof(v_store)),
+		   TDB_REPLACE);
 
 	TALLOC_FREE(rec);
 
@@ -150,7 +151,7 @@ int32 dbwrap_change_int32_atomic(struct db_context *db, const char *keystr,
 {
 	struct db_record *rec;
 	int32 val = -1;
-	TDB_DATA data;
+	int32_t v_store;
 
 	if (!(rec = db->fetch_locked(db, NULL,
 				     string_term_tdb_data(keystr)))) {
@@ -168,10 +169,11 @@ int32 dbwrap_change_int32_atomic(struct db_context *db, const char *keystr,
 
 	val += change_val;
 
-	data.dsize = sizeof(val);
-	data.dptr = (uint8 *)&val;
+	SIVAL(&v_store, 0, val);
 
-	rec->store(rec, data, TDB_REPLACE);
+	rec->store(rec,
+		   make_tdb_data((const uint8_t *)&v_store, sizeof(v_store)),
+		   TDB_REPLACE);
 
 	TALLOC_FREE(rec);
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list