diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-01-09 17:03:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:56 -0500 |
| commit | f0e3a0312d77086015e5662494b6be24a51b0091 (patch) | |
| tree | c3cef41cfa8d688a4404d341682ef28d68634c26 /source4/wrepl_server/wrepl_in_call.c | |
| parent | 35dffd9a109e821111dfc69cf3990c91feead367 (diff) | |
| download | samba-f0e3a0312d77086015e5662494b6be24a51b0091.tar.gz samba-f0e3a0312d77086015e5662494b6be24a51b0091.tar.bz2 samba-f0e3a0312d77086015e5662494b6be24a51b0091.zip | |
r12796: use the correct address as initiator
metze
(This used to be commit ba97e7c06af6f919a66622c1a6b6e58980ab2b9e)
Diffstat (limited to 'source4/wrepl_server/wrepl_in_call.c')
| -rw-r--r-- | source4/wrepl_server/wrepl_in_call.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/wrepl_server/wrepl_in_call.c b/source4/wrepl_server/wrepl_in_call.c index 27428106d4..8dabc2ee86 100644 --- a/source4/wrepl_server/wrepl_in_call.c +++ b/source4/wrepl_server/wrepl_in_call.c @@ -109,12 +109,11 @@ static NTSTATUS wreplsrv_in_table_query(struct wreplsrv_in_call *call) struct wreplsrv_service *service = call->wreplconn->service; struct wrepl_replication *repl_out = &call->rep_packet.message.replication; struct wrepl_table *table_out = &call->rep_packet.message.replication.info.table; - const char *our_ip = call->wreplconn->our_ip; repl_out->command = WREPL_REPL_TABLE_REPLY; return wreplsrv_fill_wrepl_table(service, call, table_out, - our_ip, True); + service->wins_db->local_owner, True); } static int wreplsrv_in_sort_wins_name(struct wrepl_wins_name *n1, @@ -126,7 +125,6 @@ static int wreplsrv_in_sort_wins_name(struct wrepl_wins_name *n1, } static NTSTATUS wreplsrv_record2wins_name(TALLOC_CTX *mem_ctx, - const char *our_address, struct wrepl_wins_name *name, struct winsdb_record *rec) { @@ -264,7 +262,7 @@ static NTSTATUS wreplsrv_in_send_request(struct wreplsrv_in_call *call) status = winsdb_record(service->wins_db, res->msgs[i], call, &rec); NT_STATUS_NOT_OK_RETURN(status); - status = wreplsrv_record2wins_name(names, call->wreplconn->our_ip, &names[i], rec); + status = wreplsrv_record2wins_name(names, &names[i], rec); NT_STATUS_NOT_OK_RETURN(status); talloc_free(rec); talloc_free(res->msgs[i]); |