diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-12-30 21:12:15 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:05 -0500 |
| commit | 905c3ff8e1e63f2151f63552e556086968424118 (patch) | |
| tree | e779dacb6c33f939ccb67effc8cabbfca2ebbbc8 /source4/wrepl_server/wrepl_scavenging.c | |
| parent | 0391b1cb3a1527aed5beefbdda67a6ce5062bbab (diff) | |
| download | samba-905c3ff8e1e63f2151f63552e556086968424118.tar.gz samba-905c3ff8e1e63f2151f63552e556086968424118.tar.bz2 samba-905c3ff8e1e63f2151f63552e556086968424118.zip | |
r12618: use our primary interface address or the "winsdb:local_owner" -address
as winsOwner: attrbute for owned records
metze
(This used to be commit 37dece8304c0b9887740f4d4e8096732045a1785)
Diffstat (limited to 'source4/wrepl_server/wrepl_scavenging.c')
| -rw-r--r-- | source4/wrepl_server/wrepl_scavenging.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/wrepl_server/wrepl_scavenging.c b/source4/wrepl_server/wrepl_scavenging.c index bc25354e3c..24ef974f2d 100644 --- a/source4/wrepl_server/wrepl_scavenging.c +++ b/source4/wrepl_server/wrepl_scavenging.c @@ -51,7 +51,7 @@ static NTSTATUS wreplsrv_scavenging_owned_records(struct wreplsrv_service *servi filter = talloc_asprintf(tmp_mem, "(&(winsOwner=%s)(objectClass=winsRecord)" "(expireTime<=%s)(!(isStatic=1)))", - WINSDB_OWNER_LOCAL, now_timestr); + service->wins_db->local_owner, now_timestr); NT_STATUS_HAVE_NO_MEMORY(filter); ret = ldb_search(service->wins_db->ldb, NULL, LDB_SCOPE_SUBTREE, filter, NULL, &res); if (ret != LDB_SUCCESS) return NT_STATUS_INTERNAL_DB_CORRUPTION; @@ -63,7 +63,7 @@ static NTSTATUS wreplsrv_scavenging_owned_records(struct wreplsrv_service *servi delete_tombstones = timeval_expired(&tombstone_extra_time); for (i=0; i < res->count; i++) { - status = winsdb_record(res->msgs[i], tmp_mem, &rec); + status = winsdb_record(service->wins_db, res->msgs[i], tmp_mem, &rec); NT_STATUS_NOT_OK_RETURN(status); if (rec->is_static) { @@ -159,7 +159,7 @@ static NTSTATUS wreplsrv_scavenging_replica_non_active_records(struct wreplsrv_s filter = talloc_asprintf(tmp_mem, "(&(!(winsOwner=%s))(objectClass=winsRecord)" "(!(recordState=%u))(expireTime<=%s)(!(isStatic=1)))", - WINSDB_OWNER_LOCAL, WREPL_STATE_ACTIVE, now_timestr); + service->wins_db->local_owner, WREPL_STATE_ACTIVE, now_timestr); NT_STATUS_HAVE_NO_MEMORY(filter); ret = ldb_search(service->wins_db->ldb, NULL, LDB_SCOPE_SUBTREE, filter, NULL, &res); if (ret != LDB_SUCCESS) return NT_STATUS_INTERNAL_DB_CORRUPTION; @@ -171,7 +171,7 @@ static NTSTATUS wreplsrv_scavenging_replica_non_active_records(struct wreplsrv_s delete_tombstones = timeval_expired(&tombstone_extra_time); for (i=0; i < res->count; i++) { - status = winsdb_record(res->msgs[i], tmp_mem, &rec); + status = winsdb_record(service->wins_db, res->msgs[i], tmp_mem, &rec); NT_STATUS_NOT_OK_RETURN(status); if (rec->is_static) { @@ -262,14 +262,14 @@ static NTSTATUS wreplsrv_scavenging_replica_active_records(struct wreplsrv_servi filter = talloc_asprintf(tmp_mem, "(&(!(winsOwner=%s))(objectClass=winsRecord)" "(recordState=%u)(expireTime<=%s)(!(isStatic=1)))", - WINSDB_OWNER_LOCAL, WREPL_STATE_ACTIVE, now_timestr); + service->wins_db->local_owner, WREPL_STATE_ACTIVE, now_timestr); NT_STATUS_HAVE_NO_MEMORY(filter); ret = ldb_search(service->wins_db->ldb, NULL, LDB_SCOPE_SUBTREE, filter, NULL, &res); if (ret != LDB_SUCCESS) return NT_STATUS_INTERNAL_DB_CORRUPTION; talloc_steal(tmp_mem, res); for (i=0; i < res->count; i++) { - status = winsdb_record(res->msgs[i], tmp_mem, &rec); + status = winsdb_record(service->wins_db, res->msgs[i], tmp_mem, &rec); NT_STATUS_NOT_OK_RETURN(status); if (rec->is_static) { |