Author: metze Date: 2006-01-02 16:14:08 +0000 (Mon, 02 Jan 2006) New Revision: 12674
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12674 Log: make use of the winsdb functions metze Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_out_push.c branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c Changeset: Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_out_push.c =================================================================== --- branches/SAMBA_4_0/source/wrepl_server/wrepl_out_push.c 2006-01-02 14:27:54 UTC (rev 12673) +++ branches/SAMBA_4_0/source/wrepl_server/wrepl_out_push.c 2006-01-02 16:14:08 UTC (rev 12674) @@ -25,6 +25,7 @@ #include "wrepl_server/wrepl_server.h" #include "libcli/composite/composite.h" #include "wrepl_server/wrepl_out_helpers.h" +#include "nbt_server/wins/winsdb.h" static void wreplsrv_out_partner_push(struct wreplsrv_partner *partner, BOOL propagate); @@ -123,7 +124,7 @@ uint64_t seqnumber; uint32_t change_count; - seqnumber = wreplsrv_local_db_seqnumber(service); + seqnumber = winsdb_get_seqnumber(service->wins_db); for (partner = service->partners; partner; partner = partner->next) { /* if it's not a push partner, go to the next partner */ Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c =================================================================== --- branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c 2006-01-02 14:27:54 UTC (rev 12673) +++ branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c 2006-01-02 16:14:08 UTC (rev 12674) @@ -171,60 +171,9 @@ uint64_t wreplsrv_local_max_version(struct wreplsrv_service *service) { - int ret; - struct ldb_context *ldb = service->wins_db->ldb; - struct ldb_dn *dn; - struct ldb_result *res = NULL; - TALLOC_CTX *tmp_ctx = talloc_new(service); - uint64_t maxVersion = 0; - - dn = ldb_dn_explode(tmp_ctx, "CN=VERSION"); - if (!dn) goto failed; - - /* find the record in the WINS database */ - ret = ldb_search(ldb, dn, LDB_SCOPE_BASE, - NULL, NULL, &res); - if (ret != LDB_SUCCESS) goto failed; - talloc_steal(tmp_ctx, res); - if (res->count > 1) goto failed; - - if (res->count == 1) { - maxVersion = ldb_msg_find_uint64(res->msgs[0], "maxVersion", 0); - } - -failed: - talloc_free(tmp_ctx); - return maxVersion; + return winsdb_get_maxVersion(service->wins_db); } -uint64_t wreplsrv_local_db_seqnumber(struct wreplsrv_service *service) -{ - int ret; - struct ldb_context *ldb = service->wins_db->ldb; - struct ldb_dn *dn; - struct ldb_result *res = NULL; - TALLOC_CTX *tmp_ctx = talloc_new(service); - uint64_t seqnumber = 0; - - dn = ldb_dn_explode(tmp_ctx, "@BASEINFO"); - if (!dn) goto failed; - - /* find the record in the WINS database */ - ret = ldb_search(ldb, dn, LDB_SCOPE_BASE, - NULL, NULL, &res); - if (ret != LDB_SUCCESS) goto failed; - talloc_steal(tmp_ctx, res); - if (res->count > 1) goto failed; - - if (res->count == 1) { - seqnumber = ldb_msg_find_uint64(res->msgs[0], "sequenceNumber", 0); - } - -failed: - talloc_free(tmp_ctx); - return seqnumber; -} - NTSTATUS wreplsrv_fill_wrepl_table(struct wreplsrv_service *service, TALLOC_CTX *mem_ctx, struct wrepl_table *table_out,
