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

[abartlet/samba.git/.git] / source3 / lib / dbwrap_util.c

diff --git a/source3/lib/dbwrap_util.c b/source3/lib/dbwrap_util.c
index 5e02d47290592bca6872affe9b949f91da5e662c..74b22655e2ba30d0785ceb3e4fc6ca5806b297ee 100644 (file)
--- a/source3/lib/dbwrap_util.c
+++ b/source3/lib/dbwrap_util.c
@@ -106,36 +106,81 @@ int dbwrap_store_uint32(struct db_context *db, const char *keystr, uint32_t v)
  * return old value in *oldval.
  * store *oldval + change_val to db.
  */
-NTSTATUS dbwrap_change_uint32_atomic(struct db_context *db, const char *keystr,
-                                    uint32_t *oldval, uint32_t change_val)
+
+struct dbwrap_change_uint32_atomic_context {
+       const char *keystr;
+       uint32_t *oldval;
+       uint32_t change_val;
+};
+
+static NTSTATUS dbwrap_change_uint32_atomic_action(struct db_context *db,
+                                                  void *private_data)
 {
        struct db_record *rec;
        uint32 val = -1;
-       TDB_DATA data;
+       uint32_t v_store;
        NTSTATUS ret;
+       struct dbwrap_change_uint32_atomic_context *state;
+
+       state = (struct dbwrap_change_uint32_atomic_context *)private_data;
 
-       if (!(rec = db->fetch_locked(db, NULL,
-                                    string_term_tdb_data(keystr)))) {
+       rec = db->fetch_locked(db, NULL, string_term_tdb_data(state->keystr));
+       if (!rec) {
                return NT_STATUS_UNSUCCESSFUL;
        }
 
        if (rec->value.dptr == NULL) {
-               val = *oldval;
+               val = *(state->oldval);
        } else if (rec->value.dsize == sizeof(val)) {
                val = IVAL(rec->value.dptr, 0);
-               *oldval = val;
+               *(state->oldval) = val;
        } else {
-               return NT_STATUS_UNSUCCESSFUL;
+               ret = NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
-       val += change_val;
+       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);
+       return ret;
+}
+
+NTSTATUS dbwrap_change_uint32_atomic(struct db_context *db, const char *keystr,
+                                    uint32_t *oldval, uint32_t change_val)
+{
+       NTSTATUS ret;
+       struct dbwrap_change_uint32_atomic_context state;
+
+       state.keystr = keystr;
+       state.oldval = oldval;
+       state.change_val = change_val;
+
+       ret = dbwrap_change_uint32_atomic_action(db, &state);
+
+       return ret;
+}
+
+NTSTATUS dbwrap_trans_change_uint32_atomic(struct db_context *db,
+                                          const char *keystr,
+                                          uint32_t *oldval,
+                                          uint32_t change_val)
+{
+       NTSTATUS ret;
+       struct dbwrap_change_uint32_atomic_context state;
+
+       state.keystr = keystr;
+       state.oldval = oldval;
+       state.change_val = change_val;
+
+       ret = dbwrap_trans_do(db, dbwrap_change_uint32_atomic_action, &state);
 
        return ret;
 }
@@ -147,37 +192,83 @@ NTSTATUS dbwrap_change_uint32_atomic(struct db_context *db, const char *keystr,
  * return old value in *oldval.
  * store *oldval + change_val to db.
  */
-int32 dbwrap_change_int32_atomic(struct db_context *db, const char *keystr,
-                                int32 *oldval, int32 change_val)
+
+struct dbwrap_change_int32_atomic_context {
+       const char *keystr;
+       int32_t *oldval;
+       int32_t change_val;
+};
+
+static NTSTATUS dbwrap_change_int32_atomic_action(struct db_context *db,
+                                                 void *private_data)
 {
        struct db_record *rec;
-       int32 val = -1;
-       TDB_DATA data;
+       int32_t val = -1;
+       int32_t v_store;
+       NTSTATUS ret;
+       struct dbwrap_change_int32_atomic_context *state;
 
-       if (!(rec = db->fetch_locked(db, NULL,
-                                    string_term_tdb_data(keystr)))) {
-               return -1;
+       state = (struct dbwrap_change_int32_atomic_context *)private_data;
+
+       rec = db->fetch_locked(db, NULL, string_term_tdb_data(state->keystr));
+       if (!rec) {
+               return NT_STATUS_UNSUCCESSFUL;
        }
 
        if (rec->value.dptr == NULL) {
-               val = *oldval;
+               val = *(state->oldval);
        } else if (rec->value.dsize == sizeof(val)) {
                val = IVAL(rec->value.dptr, 0);
-               *oldval = val;
+               *(state->oldval) = val;
        } else {
-               return -1;
+               ret = NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
-       val += change_val;
+       val += state->change_val;
 
-       data.dsize = sizeof(val);
-       data.dptr = (uint8 *)&val;
+       SIVAL(&v_store, 0, val);
 
-       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);
+       return ret;
+}
+
+NTSTATUS dbwrap_change_int32_atomic(struct db_context *db, const char *keystr,
+                                   int32_t *oldval, int32_t change_val)
+{
+       NTSTATUS ret;
+       struct dbwrap_change_int32_atomic_context state;
+
+       state.keystr = keystr;
+       state.oldval = oldval;
+       state.change_val = change_val;
+
+       ret = dbwrap_change_int32_atomic_action(db, &state);
+
+       return ret;
+}
 
-       return 0;
+NTSTATUS dbwrap_trans_change_int32_atomic(struct db_context *db,
+                                         const char *keystr,
+                                         int32_t *oldval,
+                                         int32_t change_val)
+{
+       NTSTATUS ret;
+       struct dbwrap_change_int32_atomic_context state;
+
+       state.keystr = keystr;
+       state.oldval = oldval;
+       state.change_val = change_val;
+
+       ret = dbwrap_trans_do(db, dbwrap_change_int32_atomic_action, &state);
+
+       return ret;
 }
 
 struct dbwrap_store_context {