Import dnssrv free fix from head

diff --git a/CHANGES b/CHANGES
index 830a403a482b18332d5349c67d769d886f37d907..b547eb72a9c7149d480b52035266e94a3d162816 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,10 @@ OpenLDAP 2.0 Change Log
 OpenLDAP 2.0.20 Engineering
        Fixed slapd ACL peername/sockname exact match bug (ITS#1516)
        Fixed -lldap cache debug bug (ITS#1501)
-       Updated BerkeleyDB 4 support
+       Fixed -lldap dnssrv free bug
+       Build environment
+               Updated BerkeleyDB 4 support
+               Updated schema files
 
 OpenLDAP 2.0.19 Release
        Fixed back-ldbm not filter indexing (ITS#1405)

diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c
index 2ae700d4183f26dd41a8975b7c4b2fd57d07caff..00de1dae58fdd90627ed454ee8de49a443536688 100644 (file)
--- a/libraries/libldap/dnssrv.c
+++ b/libraries/libldap/dnssrv.c
@@ -210,8 +210,7 @@ int ldap_domain2hostlist(
 
     request = LDAP_MALLOC(strlen(domain) + sizeof("_ldap._tcp."));
     if (request == NULL) {
-       rc = LDAP_NO_MEMORY;
-       goto out;
+       return LDAP_NO_MEMORY;
     }
     sprintf(request, "_ldap._tcp.%s", domain);