From: Volker Lendecke <vl@samba.org>
Date: Fri, 15 Jun 2012 07:18:17 +0000 (+0200)
Subject: dbwrap: dbwrap_change_uint32_atomic->dbwrap_change_uint32_atomic_bystring
X-Git-Tag: samba-4.0.0beta2~117
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=37ad03f91d28c39533ece09384a12e63603c3e8a;p=ddiss%2Fsamba.git

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 d0df1e5afa3..69683ca0f32 100644
--- 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 21f2a809509..2af170a10e4 100644
--- 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 a890914a47f..26811a863c9 100644
--- 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 1c2e3467b25..669caf520a6 100644
--- 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));