r12804: This patch reworks the Samba4 sockets layer to use a socket_address

structure that is more generic than just 'IP/port'.

It now passes make test, and has been reviewed and updated by
metze. (Thankyou *very* much).

This passes 'make test' as well as kerberos use (not currently in the
testsuite).

The original purpose of this patch was to have Samba able to pass a
socket address stucture from the BSD layer into the kerberos routines
and back again.   It also removes nbt_peer_addr, which was being used
for a similar purpose.

It is a large change, but worthwhile I feel.

Andrew Bartlett
(This used to be commit 88198c4881d8620a37086f80e4da5a5b71c5bbb2)

1 files changed, 10 insertions, 2 deletions

diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index 0409607aa9..909bedf530 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -311,6 +311,7 @@ struct composite_context *wrepl_connect_send(struct wrepl_socket *wrepl_socket,
 {
 	struct composite_context *result;
 	struct wrepl_connect_state *state;
+	struct socket_address *peer, *us;
 
 	result = talloc_zero(wrepl_socket, struct composite_context);
 	if (!result) return NULL;
@@ -328,8 +329,15 @@ struct composite_context *wrepl_connect_send(struct wrepl_socket *wrepl_socket,
 		our_ip = iface_best_ip(peer_ip);
 	}
 
-	state->creq = socket_connect_send(wrepl_socket->sock, our_ip, 0,
-					  peer_ip, WINS_REPLICATION_PORT,
+	us = socket_address_from_strings(state, wrepl_socket->sock->backend_name, 
+					 our_ip, 0);
+	if (composite_nomem(us, result)) return result;
+
+	peer = socket_address_from_strings(state, wrepl_socket->sock->backend_name, 
+					   peer_ip, WINS_REPLICATION_PORT);
+	if (composite_nomem(peer, result)) return result;
+
+	state->creq = socket_connect_send(wrepl_socket->sock, us, peer,
 					  0, wrepl_socket->event.ctx);
 	composite_continue(result, state->creq, wrepl_connect_handler, state);
 	return result;