summaryrefslogtreecommitdiffstats
path: root/source4/wrepl_server/wrepl_in_connection.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-01-09 17:03:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:56 -0500
commitf0e3a0312d77086015e5662494b6be24a51b0091 (patch)
treec3cef41cfa8d688a4404d341682ef28d68634c26 /source4/wrepl_server/wrepl_in_connection.c
parent35dffd9a109e821111dfc69cf3990c91feead367 (diff)
downloadsamba-f0e3a0312d77086015e5662494b6be24a51b0091.tar.gz
samba-f0e3a0312d77086015e5662494b6be24a51b0091.tar.xz
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_connection.c')
-rw-r--r--source4/wrepl_server/wrepl_in_connection.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index f3bb5544e34..4e93ebf7a37 100644
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -167,11 +167,6 @@ static void wreplsrv_accept(struct stream_connection *conn)
wreplconn->conn = conn;
wreplconn->service = service;
- wreplconn->our_ip = socket_get_my_addr(conn->socket, wreplconn);
- if (!wreplconn->our_ip) {
- wreplsrv_terminate_in_connection(wreplconn, "wreplsrv_accept: out of memory");
- return;
- }
peer_ip = socket_get_peer_addr(conn->socket, wreplconn);
if (!peer_ip) {
@@ -221,8 +216,6 @@ NTSTATUS wreplsrv_in_connection_merge(struct wreplsrv_partner *partner,
wrepl_in->service = service;
wrepl_in->partner = partner;
- wrepl_in->our_ip = socket_get_my_addr(sock, wrepl_in);
- NT_STATUS_HAVE_NO_MEMORY(wrepl_in->our_ip);
status = stream_new_connection_merge(service->task->event_ctx, model_ops,
sock, &wreplsrv_stream_ops, service->task->msg_ctx,