diff options
Diffstat (limited to 'source4/wrepl_server')
| -rw-r--r-- | source4/wrepl_server/wrepl_in_call.c | 3 | ||||
| -rw-r--r-- | source4/wrepl_server/wrepl_in_connection.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/wrepl_server/wrepl_in_call.c b/source4/wrepl_server/wrepl_in_call.c index 8dabc2ee86..46ee25b7ad 100644 --- a/source4/wrepl_server/wrepl_in_call.c +++ b/source4/wrepl_server/wrepl_in_call.c @@ -401,8 +401,9 @@ static NTSTATUS wreplsrv_in_replication(struct wreplsrv_in_call *call) } if (!call->wreplconn->partner) { + struct socket_address *partner_ip = socket_get_peer_addr(call->wreplconn->conn->socket, call); DEBUG(1,("Failing WINS replication from non-partner %s\n", - socket_get_peer_addr(call->wreplconn->conn->socket, call))); + partner_ip ? partner_ip->addr : NULL)); return wreplsrv_in_stop_assoc_ctx(call); } diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c index 4e93ebf7a3..80e443ace7 100644 --- a/source4/wrepl_server/wrepl_in_connection.c +++ b/source4/wrepl_server/wrepl_in_connection.c @@ -143,7 +143,7 @@ static void wreplsrv_accept(struct stream_connection *conn) { struct wreplsrv_service *service = talloc_get_type(conn->private, struct wreplsrv_service); struct wreplsrv_in_connection *wreplconn; - const char *peer_ip; + struct socket_address *peer_ip; wreplconn = talloc_zero(conn, struct wreplsrv_in_connection); if (!wreplconn) { @@ -170,11 +170,11 @@ static void wreplsrv_accept(struct stream_connection *conn) peer_ip = socket_get_peer_addr(conn->socket, wreplconn); if (!peer_ip) { - wreplsrv_terminate_in_connection(wreplconn, "wreplsrv_accept: out of memory"); + wreplsrv_terminate_in_connection(wreplconn, "wreplsrv_accept: could not obtain peer IP from kernel"); return; } - wreplconn->partner = wreplsrv_find_partner(service, peer_ip); + wreplconn->partner = wreplsrv_find_partner(service, peer_ip->addr); conn->private = wreplconn; |