From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 18 Sep 2001 18:09:34 +0000 (+0000)
Subject: Sync with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_0_15~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ced32db1004dc7d83ed7771b86cf93286436b40;p=thirdparty%2Fopenldap.git

Sync with HEAD
---

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index ac7fc6a987..fe3fc6cdb3 100644
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -1055,6 +1055,9 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
  		host = conn->lconn_server->lud_host;
 	}
 
+	/* avoid NULL host */
+	if( host == NULL ) host = "localhost";
+
 	(void) ldap_pvt_tls_init();
 
 	/*
@@ -1069,11 +1072,9 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
 	assert( ssl != NULL );
 
 	/* 
-	 * compare host with name(s) in certificate. avoid NULL host
+	 * compare host with name(s) in certificate
 	 */
 
-	if( host == NULL )
-		host = "localhost";
 	ld->ld_errno = ldap_pvt_tls_check_hostname( ssl, host );
 	if (ld->ld_errno != LDAP_SUCCESS) {
 		return ld->ld_errno;
diff --git a/servers/slapd/schema/misc.schema b/servers/slapd/schema/misc.schema
index bd8bd4042a..c1e11183b5 100644
--- a/servers/slapd/schema/misc.schema
+++ b/servers/slapd/schema/misc.schema
@@ -30,7 +30,7 @@ attributetype ( 2.16.840.1.113730.3.1.47
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
 	SINGLE-VALUE )
 
-#no assigned OID
+# OID needs to be determined
 #objectclass ( 2.16.840.1.113730.3.2.TBD
 #	NAME 'inetLocalMailRecipient'
 #	DESC 'Internet local mail recipient'