Sync with HEAD

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index ac7fc6a987b0722570668e98caf135ba14f2a2e9..fe3fc6cdb324e854b166fdf2fdbeb2c09fada8a0 100644 (file)
--- 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 bd8bd4042a2a0a5c3374a779d6677a6f1a78b36f..c1e11183b5fb045335779d280fc0ee33f78083f9 100644 (file)
--- 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'