summaryrefslogtreecommitdiff
path: root/source4/nbt_server
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-08-13 08:00:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:15:31 -0500
commita23b63a8e54db7d0ec98ad95cdca11dd4d039e17 (patch)
treeb5a38a7ca5dd1347097fe14b9f80df25fa3e4594 /source4/nbt_server
parent8492a45f8a936943c9ddd0fd400871b78308a23d (diff)
downloadsamba-a23b63a8e54db7d0ec98ad95cdca11dd4d039e17.tar.gz
samba-a23b63a8e54db7d0ec98ad95cdca11dd4d039e17.tar.bz2
samba-a23b63a8e54db7d0ec98ad95cdca11dd4d039e17.zip
r17516: Change helper function names to make more clear what they are meant to do
(This used to be commit ad75cf869550af66119d0293503024d41d834e02)
Diffstat (limited to 'source4/nbt_server')
-rw-r--r--source4/nbt_server/wins/winsdb.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c
index 53fe71c985..fc41536377 100644
--- a/source4/nbt_server/wins/winsdb.c
+++ b/source4/nbt_server/wins/winsdb.c
@@ -52,7 +52,7 @@ uint64_t winsdb_get_maxVersion(struct winsdb_handle *h)
if (res->count > 1) goto failed;
if (res->count == 1) {
- maxVersion = ldb_msg_find_uint64(res->msgs[0], "maxVersion", 0);
+ maxVersion = ldb_msg_find_attr_as_uint64(res->msgs[0], "maxVersion", 0);
}
failed:
@@ -90,7 +90,7 @@ uint64_t winsdb_set_maxVersion(struct winsdb_handle *h, uint64_t newMaxVersion)
talloc_steal(tmp_ctx, res);
if (res->count == 1) {
- oldMaxVersion = ldb_msg_find_uint64(res->msgs[0], "maxVersion", 0);
+ oldMaxVersion = ldb_msg_find_attr_as_uint64(res->msgs[0], "maxVersion", 0);
}
if (newMaxVersion == 0) {
@@ -149,7 +149,7 @@ uint64_t winsdb_get_seqnumber(struct winsdb_handle *h)
if (res->count > 1) goto failed;
if (res->count == 1) {
- seqnumber = ldb_msg_find_uint64(res->msgs[0], "sequenceNumber", 0);
+ seqnumber = ldb_msg_find_attr_as_uint64(res->msgs[0], "sequenceNumber", 0);
}
failed:
@@ -639,14 +639,14 @@ NTSTATUS winsdb_record(struct winsdb_handle *h, struct ldb_message *msg, TALLOC_
/* parse it into a more convenient winsdb_record structure */
rec->name = name;
- rec->type = ldb_msg_find_int(msg, "recordType", WREPL_TYPE_UNIQUE);
- rec->state = ldb_msg_find_int(msg, "recordState", WREPL_STATE_RELEASED);
- rec->node = ldb_msg_find_int(msg, "nodeType", WREPL_NODE_B);
- rec->is_static = ldb_msg_find_int(msg, "isStatic", 0);
- rec->expire_time = ldb_string_to_time(ldb_msg_find_string(msg, "expireTime", NULL));
- rec->version = ldb_msg_find_uint64(msg, "versionID", 0);
- rec->wins_owner = ldb_msg_find_string(msg, "winsOwner", NULL);
- rec->registered_by = ldb_msg_find_string(msg, "registeredBy", NULL);
+ rec->type = ldb_msg_find_attr_as_int(msg, "recordType", WREPL_TYPE_UNIQUE);
+ rec->state = ldb_msg_find_attr_as_int(msg, "recordState", WREPL_STATE_RELEASED);
+ rec->node = ldb_msg_find_attr_as_int(msg, "nodeType", WREPL_NODE_B);
+ rec->is_static = ldb_msg_find_attr_as_int(msg, "isStatic", 0);
+ rec->expire_time = ldb_string_to_time(ldb_msg_find_attr_as_string(msg, "expireTime", NULL));
+ rec->version = ldb_msg_find_attr_as_uint64(msg, "versionID", 0);
+ rec->wins_owner = ldb_msg_find_attr_as_string(msg, "winsOwner", NULL);
+ rec->registered_by = ldb_msg_find_attr_as_string(msg, "registeredBy", NULL);
talloc_steal(rec, rec->wins_owner);
talloc_steal(rec, rec->registered_by);