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/gensec_krb5.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/gensec_krb5.c')
| -rw-r--r-- | source4/auth/gensec/gensec_krb5.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c index ff26018ae2..46b8181de7 100644 --- a/source4/auth/gensec/gensec_krb5.c +++ b/source4/auth/gensec/gensec_krb5.c @@ -90,8 +90,7 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security, bool krb5_error_code ret; struct gensec_krb5_state *gensec_krb5_state; struct cli_credentials *creds; - const struct socket_address *peer_addr; - const struct tsocket_address *tlocal_addr; + const struct tsocket_address *tlocal_addr, *tremote_addr; krb5_address my_krb5_addr, peer_krb5_addr; creds = gensec_get_credentials(gensec_security); @@ -165,10 +164,19 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security, bool } } - peer_addr = gensec_get_peer_addr(gensec_security); - if (peer_addr && peer_addr->sockaddr) { - ret = krb5_sockaddr2address(gensec_krb5_state->smb_krb5_context->krb5_context, - peer_addr->sockaddr, &peer_krb5_addr); + tremote_addr = gensec_get_remote_address(gensec_security); + if (tremote_addr) { + ssize_t socklen; + struct sockaddr_storage ss; + + socklen = tsocket_address_bsd_sockaddr(tremote_addr, + (struct sockaddr *) &ss, + sizeof(struct sockaddr_storage)); + if (socklen < 0) { + return NT_STATUS_INTERNAL_ERROR; + } + ret = krb5_sockaddr2address(gensec_krb5_state->smb_krb5_context->krb5_context, + (const struct sockaddr *) &ss, &peer_krb5_addr); if (ret) { DEBUG(1,("gensec_krb5_start: krb5_sockaddr2address (local) failed (%s)\n", smb_get_krb5_error_message(gensec_krb5_state->smb_krb5_context->krb5_context, @@ -181,7 +189,7 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security, bool ret = krb5_auth_con_setaddrs(gensec_krb5_state->smb_krb5_context->krb5_context, gensec_krb5_state->auth_context, tlocal_addr ? &my_krb5_addr : NULL, - peer_addr ? &peer_krb5_addr : NULL); + tremote_addr ? &peer_krb5_addr : NULL); if (ret) { DEBUG(1,("gensec_krb5_start: krb5_auth_con_setaddrs failed (%s)\n", smb_get_krb5_error_message(gensec_krb5_state->smb_krb5_context->krb5_context, |