ITS#5937

CHANGES

@@ -11,6 +11,7 @@ OpenLDAP 2.4.14 Engineering
 	Fixed libldap peer cert memory leak (ITS#5849)
 	Fixed libldap interaction with GnuTLS CN IP-based matches (ITS#5789)
 	Fixed libldap intermediate response behavior (ITS#5896)
+	Fixed libldap IPv6 address handling (ITS#5937)
 	Fixed libldap_r deref building (ITS#5768)
 	Fixed libldap_r slapd lockup when paused during shutdown (ITS#5841)
 	Added slapd syncrepl default retry setting (ITS#5825)

libraries/libldap/tls_g.c

@@ -575,7 +575,7 @@ tlsg_session_chkhost( LDAP *ld, tls_session *session, const char *name_in )
 #ifdef LDAP_PF_INET6
 	if (name[0] == '[' && strchr(name, ']')) {
 		char *n2 = ldap_strdup(name+1);
-		*strchr(n2, ']') = 2;
+		*strchr(n2, ']') = 0;
 		if (inet_pton(AF_INET6, n2, &addr))
 			ntype = IS_IP6;
 		LDAP_FREE(n2);

libraries/libldap/tls_m.c

@@ -404,7 +404,7 @@ tlsm_session_chkhost( LDAP *ld, tls_session *session, const char *name_in )
 #ifdef LDAP_PF_INET6
 	if (name[0] == '[' && strchr(name, ']')) {
 		char *n2 = ldap_strdup(name+1);
-		*strchr(n2, ']') = 2;
+		*strchr(n2, ']') = 0;
 		if (inet_pton(AF_INET6, n2, &addr))
 			ntype = IS_IP6;
 		LDAP_FREE(n2);

libraries/libldap/tls_o.c

@@ -494,7 +494,7 @@ tlso_session_chkhost( LDAP *ld, tls_session *sess, const char *name_in )
 #ifdef LDAP_PF_INET6
 	if (name[0] == '[' && strchr(name, ']')) {
 		char *n2 = ldap_strdup(name+1);
-		*strchr(n2, ']') = 2;
+		*strchr(n2, ']') = 0;
 		if (inet_pton(AF_INET6, n2, &addr))
 			ntype = IS_IP6;
 		LDAP_FREE(n2);