[4/4] resolv: fix rotate option

Message ID CAMe9rOraRkMNFS-vzNnytoNCjVoJZmG+afLfbgwWtcZurk9PSQ@mail.gmail.com
State Committed
Headers

Commit Message

H.J. Lu Jan. 6, 2015, 5:36 p.m. UTC
  On Tue, Jan 6, 2015 at 9:23 AM, Joseph Myers <joseph@codesourcery.com> wrote:
> On Tue, 6 Jan 2015, H.J. Lu wrote:
>
>> On Thu, Jun 19, 2014 at 8:04 PM, Siddhesh Poyarekar <siddhesh@redhat.com> wrote:
>> > On Fri, Jun 13, 2014 at 05:32:13PM +0200, Aurelien Jarno wrote:
>
>> >> 2014-06-13  Aurelien Jarno  <aurelien@aurel32.net>
>> >>
>> >>       * resolv/res_init.c (__res_iclose): Only clear nsinit if the
>> >>       addresses have been freed.
>> >
>> > Looks good to me, but I think this deserves a separate bug report from
>> > the general 'ipv6 name resolution is broken' bug report you filed for
>> > this patchset.
>> >
>>
>> I checked it in.
>
> Where are the separate bug report requested, BZ#N notation in the
> ChangeLog entry and listing of that bug in the list of fixed bugs in NEWS,
> as per Siddhesh's review?
>

This is what I checked in.
  

Patch

diff --git a/ChangeLog b/ChangeLog
index 6ba3b8e..fdd7253 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@ 
 2015-01-06  Aurelien Jarno  <aurelien@aurel32.net>

+  [BZ #17806]
   * resolv/res_init.c (__res_iclose): Only clear nsinit if the
   addresses have been freed.

diff --git a/NEWS b/NEWS
index 49c0a2d..acb611a 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,8 @@  Version 2.21
   17583, 17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17630,
   17633, 17634, 17635, 17647, 17653, 17657, 17664, 17665, 17668, 17682,
   17717, 17719, 17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745,
-  17746, 17747, 17775, 17777, 17780, 17781, 17782, 17793, 17796, 17797
+  17746, 17747, 17775, 17777, 17780, 17781, 17782, 17793, 17796, 17797,
+  17806