diff options
| author | Simo Sorce <idra@samba.org> | 2006-08-13 08:00:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:15:31 -0500 |
| commit | a23b63a8e54db7d0ec98ad95cdca11dd4d039e17 (patch) | |
| tree | b5a38a7ca5dd1347097fe14b9f80df25fa3e4594 /source4/wrepl_server | |
| parent | 8492a45f8a936943c9ddd0fd400871b78308a23d (diff) | |
| download | samba-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/wrepl_server')
| -rw-r--r-- | source4/wrepl_server/wrepl_server.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c index f32c4bb9bf..d18f7e8517 100644 --- a/source4/wrepl_server/wrepl_server.c +++ b/source4/wrepl_server/wrepl_server.c @@ -58,7 +58,7 @@ static uint64_t wins_config_db_get_seqnumber(struct ldb_context *ldb) 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: @@ -154,7 +154,7 @@ NTSTATUS wreplsrv_load_partners(struct wreplsrv_service *service) for (i=0; i < res->count; i++) { const char *address; - address = ldb_msg_find_string(res->msgs[i], "address", NULL); + address = ldb_msg_find_attr_as_string(res->msgs[i], "address", NULL); if (!address) { goto failed; } @@ -181,19 +181,19 @@ NTSTATUS wreplsrv_load_partners(struct wreplsrv_service *service) DLIST_ADD_END(service->partners, partner, struct wreplsrv_partner *); } - partner->name = ldb_msg_find_string(res->msgs[i], "name", partner->address); + partner->name = ldb_msg_find_attr_as_string(res->msgs[i], "name", partner->address); talloc_steal(partner, partner->name); - partner->our_address = ldb_msg_find_string(res->msgs[i], "ourAddress", NULL); + partner->our_address = ldb_msg_find_attr_as_string(res->msgs[i], "ourAddress", NULL); talloc_steal(partner, partner->our_address); - partner->type = ldb_msg_find_uint(res->msgs[i], "type", WINSREPL_PARTNER_BOTH); - partner->pull.interval = ldb_msg_find_uint(res->msgs[i], "pullInterval", + partner->type = ldb_msg_find_attr_as_uint(res->msgs[i], "type", WINSREPL_PARTNER_BOTH); + partner->pull.interval = ldb_msg_find_attr_as_uint(res->msgs[i], "pullInterval", WINSREPL_DEFAULT_PULL_INTERVAL); - partner->pull.retry_interval = ldb_msg_find_uint(res->msgs[i], "pullRetryInterval", + partner->pull.retry_interval = ldb_msg_find_attr_as_uint(res->msgs[i], "pullRetryInterval", WINSREPL_DEFAULT_PULL_RETRY_INTERVAL); - partner->push.change_count = ldb_msg_find_uint(res->msgs[i], "pushChangeCount", + partner->push.change_count = ldb_msg_find_attr_as_uint(res->msgs[i], "pushChangeCount", WINSREPL_DEFAULT_PUSH_CHANGE_COUNT); - partner->push.use_inform = ldb_msg_find_uint(res->msgs[i], "pushUseInform", False); + partner->push.use_inform = ldb_msg_find_attr_as_uint(res->msgs[i], "pushUseInform", False); DEBUG(3,("wreplsrv_load_partners: found partner: %s type: 0x%X\n", partner->address, partner->type)); @@ -381,8 +381,8 @@ static NTSTATUS wreplsrv_load_table(struct wreplsrv_service *service) talloc_steal(tmp_ctx, res); for (i=0; i < res->count; i++) { - wins_owner = ldb_msg_find_string(res->msgs[i], "winsOwner", NULL); - version = ldb_msg_find_uint64(res->msgs[i], "versionID", 0); + wins_owner = ldb_msg_find_attr_as_string(res->msgs[i], "winsOwner", NULL); + version = ldb_msg_find_attr_as_uint64(res->msgs[i], "versionID", 0); status = wreplsrv_add_table(service, service, &service->table, |