FreeBSD_HEAD_i386 - Build #3107 - Fixed

FreeBSD_HEAD_i386 - Build #3107 - Fixed:

Build information: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD_i386/3107/
Full change log: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD_i386/3107/changes
Full build log: https://jenkins.FreeBSD.org/job/FreeBSD_HEAD_i386/3107/console

Change summaries:

299493 by cem:
Revert r299467 to fix the kernel build.

$ svn merge -c -299467 .

Approved by:	build being broken for six hours

299492 by Steven Kreuzer:
Document r298695, ntp updated to 4.2.8p7.

Approved by:	gjb_at_ (implicit with re_at_ hat on)

299491 by cem:
route6d(8): Fix potential double-free

In the case that the subsequent sysctl(3) call failed, 'buf' could be free(3)ed
repeatedly.  It isn't clear to me that that case is possible, but be clear and
do the right thing in case it is.

Reported by:	Coverity
CID:		272537
Sponsored by:	EMC / Isilon Storage Division

299490 by cem:
camcontrol(8): Fix another trivial double-free

Reported by:	Coverity
CID:		1331222
Sponsored by:	EMC / Isilon Storage Division

299489 by cem:
camcontrol(8): Fix trival double-free

Reported by:	Coverity
CID:		1331223
Sponsored by:	EMC / Isilon Storage Division

299484 by cem:
random(6): Fix double-close

In the case where a file lacks a trailing newline, there is some "evil" code to
reverse goto the tokenizing code ("make_token") for the final token in the
file.  In this case, 'fd' is closed more than once.  Use a negative sentinel
value to guard close(2), preventing the double close.

Ideally, this code would be restructured to avoid this ugly construction.

Reported by:	Coverity
CID:		1006123
Sponsored by:	EMC / Isilon Storage Division