dbwrap: dbwrap_change_uint32_atomic->dbwrap_change_uint32_atomic_bystring

Signed-off-by: Michael Adam <obnox@samba.org>

diff --git a/lib/dbwrap/dbwrap.h b/lib/dbwrap/dbwrap.h
index d0df1e5afa3b7f8858e42306b1ec5b7c4a9c2381..69683ca0f322965d27a36a808b48d16c0feda04e 100644 (file)
--- a/lib/dbwrap/dbwrap.h
+++ b/lib/dbwrap/dbwrap.h
@@ -93,8 +93,10 @@ NTSTATUS dbwrap_fetch_uint32_bystring(struct db_context *db,
                                      const char *keystr, uint32_t *val);
 NTSTATUS dbwrap_store_uint32_bystring(struct db_context *db,
                                      const char *keystr, uint32_t v);
-NTSTATUS dbwrap_change_uint32_atomic(struct db_context *db, const char *keystr,
-                                    uint32_t *oldval, uint32_t change_val);
+NTSTATUS dbwrap_change_uint32_atomic_bystring(struct db_context *db,
+                                             const char *keystr,
+                                             uint32_t *oldval,
+                                             uint32_t change_val);
 NTSTATUS dbwrap_trans_change_uint32_atomic(struct db_context *db,
                                           const char *keystr,
                                           uint32_t *oldval,

diff --git a/lib/dbwrap/dbwrap_util.c b/lib/dbwrap/dbwrap_util.c
index 21f2a809509e21d69f718df32bac9f045182b64c..2af170a10e4f77ae09bf553fedac4ae93ff403ab 100644 (file)
--- a/lib/dbwrap/dbwrap_util.c
+++ b/lib/dbwrap/dbwrap_util.c
@@ -180,8 +180,10 @@ done:
        return ret;
 }
 
-NTSTATUS dbwrap_change_uint32_atomic(struct db_context *db, const char *keystr,
-                                    uint32_t *oldval, uint32_t change_val)
+NTSTATUS dbwrap_change_uint32_atomic_bystring(struct db_context *db,
+                                             const char *keystr,
+                                             uint32_t *oldval,
+                                             uint32_t change_val)
 {
        NTSTATUS ret;
        struct dbwrap_change_uint32_atomic_context state;

diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index a890914a47f29fce1b382ae1b3f9c36b45fa5ae6..26811a863c9362013a717dae5047ce7baf8def91 100644 (file)
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -94,7 +94,7 @@ static NTSTATUS idmap_autorid_get_domainrange_action(struct db_context *db,
        }
 
        /* increase the HWM */
-       ret = dbwrap_change_uint32_atomic(db, HWM, &domainnum, 1);
+       ret = dbwrap_change_uint32_atomic_bystring(db, HWM, &domainnum, 1);
        if (!NT_STATUS_IS_OK(ret)) {
                DEBUG(1, ("Fatal error while fetching a new "
                          "domain range value!\n"));

diff --git a/source3/winbindd/idmap_tdb_common.c b/source3/winbindd/idmap_tdb_common.c
index 1c2e3467b25f80d3541b5d666deaf73a5cdc1e28..669caf520a64fa5898f70f854085380772bbd07d 100644 (file)
--- a/source3/winbindd/idmap_tdb_common.c
+++ b/source3/winbindd/idmap_tdb_common.c
@@ -71,7 +71,7 @@ static NTSTATUS idmap_tdb_common_allocate_id_action(struct db_context *db,
        }
 
        /* fetch a new id and increment it */
-       ret = dbwrap_change_uint32_atomic(db, state->hwmkey, &hwm, 1);
+       ret = dbwrap_change_uint32_atomic_bystring(db, state->hwmkey, &hwm, 1);
        if (!NT_STATUS_IS_OK(ret)) {
                DEBUG(1, ("Fatal error while fetching a new %s value\n!",
                          state->hwmtype));