From 807402e4e9ac43d0fe7a7533698102a74e23844b Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Fri, 27 May 2011 11:44:16 +0200 Subject: Properly support IPv6 in LDAP URIs for IPA and LDAP providers Add utility function to return IP address as string Add a utility function to escape IPv6 address for use in URIs Use escaped IP addresses in LDAP provider Escape IPv6 IP addresses in the IPA provider https://fedorahosted.org/sssd/ticket/880 Fix bad merge We merged in a patch, but missed that it missed a dependency added by another earlier patch. --- src/providers/krb5/krb5_common.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/providers/krb5') diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c index 434fc7fbc..06c3cbac6 100644 --- a/src/providers/krb5/krb5_common.c +++ b/src/providers/krb5/krb5_common.c @@ -384,16 +384,9 @@ static void krb5_resolve_callback(void *private_data, struct fo_server *server) return; } - address = talloc_zero_size(krb5_service, 128); + address = resolv_get_string_address(krb5_service, srvaddr); if (address == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); - return; - } - - if (inet_ntop(srvaddr->h_addrtype, srvaddr->h_addr_list[0], - address, 128) == NULL) { - ret = errno; - DEBUG(1, ("inet_ntop failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, ("resolv_get_string_address failed.\n")); return; } -- cgit