diff options
| author | Andreas Schneider <asn@redhat.com> | 2009-12-16 16:41:21 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-12-16 20:28:38 +0100 |
| commit | 1e5488859a66d25a0dedf0e2f9b545fb7acf1fa2 (patch) | |
| tree | 6d420404d24e795bf7ddcbdfe7603359129f9cf6 /source4/auth/gensec/cyrus_sasl.c | |
| parent | ac2d31e24cfa24f6674b645b3661a1a2ce9ab060 (diff) | |
| download | samba-1e5488859a66d25a0dedf0e2f9b545fb7acf1fa2.tar.gz samba-1e5488859a66d25a0dedf0e2f9b545fb7acf1fa2.tar.bz2 samba-1e5488859a66d25a0dedf0e2f9b545fb7acf1fa2.zip | |
s4-gensec: Replace gensec_get_peer_addr with new tsocket based fn.
Diffstat (limited to 'source4/auth/gensec/cyrus_sasl.c')
| -rw-r--r-- | source4/auth/gensec/cyrus_sasl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/auth/gensec/cyrus_sasl.c b/source4/auth/gensec/cyrus_sasl.c index 39b11ff3d0..f56386784e 100644 --- a/source4/auth/gensec/cyrus_sasl.c +++ b/source4/auth/gensec/cyrus_sasl.c @@ -118,8 +118,8 @@ static NTSTATUS gensec_sasl_client_start(struct gensec_security *gensec_security struct gensec_sasl_state *gensec_sasl_state; const char *service = gensec_get_target_service(gensec_security); const char *target_name = gensec_get_target_hostname(gensec_security); - struct socket_address *remote_socket_addr = gensec_get_peer_addr(gensec_security); const struct tsocket_address *tlocal_addr = gensec_get_local_address(gensec_security); + const struct tsocket_address *tremote_addr = gensec_get_remote_address(gensec_security); char *local_addr = NULL; char *remote_addr = NULL; int sasl_ret; @@ -161,11 +161,11 @@ static NTSTATUS gensec_sasl_client_start(struct gensec_security *gensec_security tsocket_address_inet_port(tlocal_addr)); } - if (remote_socket_addr) { - remote_addr = talloc_asprintf(gensec_sasl_state, - "%s;%d", - remote_socket_addr->addr, - remote_socket_addr->port); + if (tremote_addr) { + remote_addr = talloc_asprintf(gensec_sasl_state, + "%s;%d", + tsocket_address_inet_addr_string(tremote_addr, gensec_sasl_state), + tsocket_address_inet_port(tremote_addr)); } gensec_sasl_state->step = 0; |