[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Fri Nov 20 16:50:32 MST 2009
The branch, master has been updated
via 446ed18... s3:fix endianness bug in dbwrap_change_int32_atomic() (bug #6901)
via 4afffc9... s3:fix endianness bug in dbwrap_change_uint32_atomic() (bug #6901)
from c1cb1f7... charset/tests/iconv - Remove the "const" from "ptr_in" to prevent "discard_const_p" use
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 446ed18eb6eeec06b4f81aaf89f75db32472defb
Author: Michael Adam <obnox at samba.org>
Date: Sat Nov 21 00:14:29 2009 +0100
s3:fix endianness bug in dbwrap_change_int32_atomic() (bug #6901)
Michael
commit 4afffc96ee7ed81c4d77b28da887fcb51f1b3579
Author: Michael Adam <obnox at samba.org>
Date: Sat Nov 21 00:08:38 2009 +0100
s3:fix endianness bug in dbwrap_change_uint32_atomic() (bug #6901)
Michael
-----------------------------------------------------------------------
Summary of changes:
source3/lib/dbwrap_util.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/dbwrap_util.c b/source3/lib/dbwrap_util.c
index 1c19016..74b2265 100644
--- a/source3/lib/dbwrap_util.c
+++ b/source3/lib/dbwrap_util.c
@@ -118,7 +118,7 @@ static NTSTATUS dbwrap_change_uint32_atomic_action(struct db_context *db,
{
struct db_record *rec;
uint32 val = -1;
- TDB_DATA data;
+ uint32_t v_store;
NTSTATUS ret;
struct dbwrap_change_uint32_atomic_context *state;
@@ -141,10 +141,12 @@ static NTSTATUS dbwrap_change_uint32_atomic_action(struct db_context *db,
val += state->change_val;
- data.dsize = sizeof(val);
- data.dptr = (uint8 *)&val;
+ SIVAL(&v_store, 0, val);
- ret = rec->store(rec, data, TDB_REPLACE);
+ ret = rec->store(rec,
+ make_tdb_data((const uint8 *)&v_store,
+ sizeof(v_store)),
+ TDB_REPLACE);
done:
TALLOC_FREE(rec);
@@ -202,7 +204,7 @@ static NTSTATUS dbwrap_change_int32_atomic_action(struct db_context *db,
{
struct db_record *rec;
int32_t val = -1;
- TDB_DATA data;
+ int32_t v_store;
NTSTATUS ret;
struct dbwrap_change_int32_atomic_context *state;
@@ -225,10 +227,12 @@ static NTSTATUS dbwrap_change_int32_atomic_action(struct db_context *db,
val += state->change_val;
- data.dsize = sizeof(val);
- data.dptr = (uint8 *)&val;
+ SIVAL(&v_store, 0, val);
- ret = rec->store(rec, data, TDB_REPLACE);
+ ret = rec->store(rec,
+ make_tdb_data((const uint8_t *)&v_store,
+ sizeof(v_store)),
+ TDB_REPLACE);
done:
TALLOC_FREE(rec);
--
Samba Shared Repository
More information about the samba-cvs
mailing list