From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 10 Nov 2008 23:23:16 +0000 (+0000)
Subject: ITS#5789
X-Git-Tag: OPENLDAP_REL_ENG_2_4_13~55
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7770f0fdc89527115813e0a87a1022998b4b725e;p=openldap

ITS#5789
---

diff --git a/CHANGES b/CHANGES
index 32a9b466c0..d8b732e1d5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.4.13 Engineering
 	Fixed liblutil hex conversion (ITS#5699)
 	Fixed liblutil returning undefined data (ITS#5748)
 	Fixed libldap error code return (ITS#5762)
+	Fixed libldap interaction with GnuTLS CN IP-based matches (ITS#5789)
 	Fixed libldap Ipv6 detection (ITS#5739)
 	Fixed slapd acl checks on ADD (ITS#4556,ITS#5723)
 	Added slapd keyword add_content_acl for add checks (ITS#4556,ITS#5723)
diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index b042aec9f4..9b008ddb9c 100644
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -1894,6 +1894,7 @@ ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in )
 
 		} else {
 			ret = LDAP_LOCAL_ERROR;
+			if ( !len1 ) len1 = strlen( name );
 			if ( len1 == altnamesize && strncasecmp(name, altname, altnamesize) == 0 ) {
 				ret = LDAP_SUCCESS;