Fix "ntpd bind() failure: Can't assign requested address" for disabled IPv6 addresses.

[hiren]

Summary

ntpd tries to bind to IPv6 interfaces in 'tentative' state and fails as IPv6 is actually disabled.
Proposed patch makes ntpd ignore tentative addresses.

Submitted by: [e-mail] <Hajimu UMEMOTO>

[bz]

Fix the whitespace issues; functionally it seems fine.

contrib/ntp/ntpd/ntp_io.c

1185

Normally I would not initialise exclude to 0 before the first #if defined but the general code in this file seems to do otherwise so that's fine.

1207

The above looks like a copy and paste error with regards to indentation; the #* should start the the beginning of the line and the other lines should be properly indented.

[gnn]

Shouldn't line 1203 be a #else or am I missing some context?

[bz]

In D1527#7, @gnn wrote:

Shouldn't line 1203 be a #else or am I missing some context?

nope; if you have one flag add it to the exclude list. if you have another flag add it to the exclude list. No #else please; this needs to be additive; we want to fail on either of the two (well really three as IN6_IFF_NOTREADY is tentative and duplicated) flags.

[gnn]

OK then that last #endif closes the #if at the top? If so we need /* comments */ after the #endifs

[bz]

still only whitespace but maybe re-roll the diff quickly and we'll be happy to both accept

contrib/ntp/ntpd/ntp_io.c

1203

translating from gnn:
#endif /* !IN6_IFF_ANYCAST */

1206

#endif /* ! IN6_IFF_NOTREADY */

[hiren]

Adding comments for #endif and fixing a whitespace issue.

[bz]

indentation still wrong

contrib/ntp/ntpd/ntp_io.c

1201–1207

indentation of the entire block is still wrong

1206

and you helpfully copied and pasted the blank I seem to have left after the !; remove that as well please

[hiren]

Actaully indent the #if/#endifs correctly (hopefully) and remove a space that bz@ put to catch my blind copy/paste skills. ;-)

[bz]

And whoever is maintaining ntpd make sure it goes upstream as well.

[hiren]

Closed by commit rS277202 (authored by @hiren).