ok beck@

ok miod

If a user is running sasyncd, start isakmpd with -S.
In this mode isakmpd starts off passsive and doesn't
delete SA's on shutdown.
OK ho@, hshoexer@, deraadt@

you do not want a machine that is in the middle of rc and does not have
all network daemons (that possibly increase the carp demotion counter
further) to become master just because the other one lost 2 bgp sessions
or similar for other daemons (esp sasyncd) and as such has a demotion
count of >1.
ok mcbride mpf deraadt

sparc.
ok miod@

by okan@demirmen.com, thanks!

ago.  Therefore adjust the example encryption key from 160 to 128
bits.
Noticed by jmc@.

about them;
ok djm

support these drivers at the moment, plus dmf conflicts with wsdisplay nodes).
While there, simplify and fix dhu nodes generation, so that creating invalid
nodes (e.g. MAKEDEV dhu8) does not attempt to create incomplete names.

ok deraadt, toby, pedro, david

as /dev/raid).
ok drahn@

releases...

when the time comes (not here!)

export of the protocol.  you shall not add non-protocol stuff to such
a file, period.

from eren elci; tweaked by djm
ok djm

- move TIMEOUT* defines to arpa/tftp.h, as they are used several times
in tftpd and tftp, and the values are part of the RFC definition.
- tftpd and tftp did count the total retransmission time in retries
instead in seconds.  fixed.
- tftpd rexmt timeout was hardcoded by a define and therefore didn't
changed when the timeout option was sent.  fixed.
- limit total retransmission timeout in tftp to also 255 seconds.
- replace obvious atoi()'s by strtonum().
ok claudio@

ok drahn@

re-worded and ok djm