From 8cddf81199e96c7edc701bcb7ca782d7bcddbddd Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Fri, 30 Oct 2020 19:24:40 +0100
Subject: [PATCH 6/6] ldap: generate proper ldap uri for IPv6 addresses

When using IPv6 addresses the address must be put into brackets.

Resolves: https://gitlab.freedesktop.org/realmd/realmd/-/issues/23
---
 service/realm-ldap.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/service/realm-ldap.c b/service/realm-ldap.c
index 28c5c8a..2076d1e 100644
--- a/service/realm-ldap.c
+++ b/service/realm-ldap.c
@@ -190,6 +190,7 @@ realm_ldap_connect_anonymous (GSocketAddress *address,
 	LdapSource *ls;
 	gchar *addrname;
 	GInetSocketAddress *inet;
+	GSocketFamily family;
 	struct berval cred;
 	Sockbuf *sb = NULL;
 	gsize native_len;
@@ -204,6 +205,7 @@ realm_ldap_connect_anonymous (GSocketAddress *address,
 	inet = G_INET_SOCKET_ADDRESS (address);
 	addrname = g_inet_address_to_string (g_inet_socket_address_get_address (inet));
 	port = g_inet_socket_address_get_port (inet);
+	family = g_inet_address_get_family (g_inet_socket_address_get_address (inet));
 	if (port == 0)
 		port = 389;
 
@@ -239,9 +241,17 @@ realm_ldap_connect_anonymous (GSocketAddress *address,
 		if (!g_unix_set_fd_nonblocking (ls->sock, FALSE, NULL))
 			g_warning ("couldn't set to blocking");
 
-		url = g_strdup_printf ("%s://%s:%d",
-		                       use_ldaps ? "ldaps" : "ldap",
-		                       addrname, port);
+		if (family == G_SOCKET_FAMILY_IPV4) {
+			url = g_strdup_printf ("%s://%s:%d",
+			                       use_ldaps ? "ldaps" : "ldap",
+			                       addrname, port);
+		} else if (family == G_SOCKET_FAMILY_IPV6) {
+			url = g_strdup_printf ("%s://[%s]:%d",
+			                       use_ldaps ? "ldaps" : "ldap",
+			                       addrname, port);
+		} else {
+			url = NULL;
+		}
 		rc = ldap_init_fd (ls->sock, 1, url, &ls->ldap);
 		g_free (url);
 
-- 
2.26.2