Merge branch 'release/2.19/master' into ibm/2.19/master

Conflicts:
	NEWS

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index 1fde5ffe185183e7f4e9c395b1b21f64ce7be2e9,41481cd33e1c03b4d4503a3eed41aa1fe9e17732..8aa9a0dde2ac84d39856a051803e2f95683ca177
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -9,11 -9,11 +9,12 @@@ Version 2.19.
  
  * The following bugs are resolved with this release:
  
-   15946, 16545, 16574, 16617, 16618, 16619, 16623, 16657, 16683, 16689,
-   16695, 16701, 16706, 16707, 16739, 16740, 16743, 16815, 16878, 16882,
-   16885, 16916, 16932, 16943, 16958, 17031, 17048, 17062, 17069, 17079,
-   17137, 17153, 17187, 17213, 17263, 17269, 17325, 17555, 17625, 17630,
-   18007, 18032, 18104, 18287.
 -  15946, 16009, 16545, 16574, 16623, 16657, 16695, 16743, 16758, 16759,
 -  16760, 16878, 16882, 16885, 16916, 16932, 16943, 16958, 17048, 17062,
 -  17069, 17079, 17137, 17153, 17213, 17263, 17269, 17325, 17555, 17905,
 -  18007, 18032, 18080, 18240, 18287, 18508, 18665, 18905, 18928, 19018,
 -  19779, 19791, 19879, 20010, 20112.
++  15946, 16009, 16545, 16574, 16617, 16618, 16619, 16623, 16657, 16683,
++  16695, 16701, 16706, 16707, 16739, 16740, 16743, 16758, 16759, 16760,
++  16815, 16878, 16882, 16885, 16916, 16932, 16943, 16958, 17031, 17048,
++  17062, 17069, 17079, 17137, 17153, 17187, 17213, 17263, 17269, 17325,
++  17555, 17625, 17630, 17905, 18007, 18032, 18080, 18104, 18240, 18287,
++  18508, 18665, 18905, 18928, 19018, 19779, 19791, 19879, 20010, 20112.
  
  * A buffer overflow in gethostbyname_r and related functions performing DNS
    requests has been fixed.  If the NSS functions were called with a

diff --cc resolv/nss_dns/dns-network.c
Simple merge