* testing : hack to get make check run for pluto tests. disbled kvm
  checks. change the TESTLIST command to kvmplutotest
Merge branch 'master' of ssh://vault.foobar.fi/srv/src/libreswan
*testing : skip the umlplutotest  don't run final.sh twice on initiator
* pluto: increased sadetails string from 128 to 256 so XAUTHuser isn't cut off

The size of sadetails is for the message that is printed when the IPsec SA comes
up, and is passed via fmt_ipsec_sa_established(). Since we now log the XAUTH user
name, this 128 character limit was causing the line to be cut of at 128, leaving
out the partial XAUTH user name (especially when NAT was used and the NATOA/NATD
info was also printed)

It now looks like:

Apr  3 16:36:12: "iphone-general"[6] 76.10.157.78 #6: STATE_QUICK_R2: IPsec SA established tunnel mode {ESP=>0x0d0f1c0c <0x8600e9d1 xfrm=AES_256-HMAC_SHA1 NATOA=none NATD=none DPD=none XAUTHuser=B6188A01A77A6825B535A5A20D5E44E013BFF326}
* pluto: sadetails of 256 is actually also not enough, raised to 512
* pluto: constants.c: jam_str: fix typo in comment
* IKEv1: fragmentation check for null state was too late.

We would have already tried to dereference it
Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan
Merge branch 'fweimer'
* pluto: clarify Commit Flag log message
*testing : swan-prep creates OUTPUT/<hostname>.pluto.log with right
permissions
* testing :  fixed sed line Restart=no
Merge branch 'master' of ssh://vault.foobar.fi/srv/src/libreswan
* pluto: Log out own vendorid as "received" instead of "ignored"
* starterwhack: fix format string in starter_log() to use %d for int
* oeconns: fix format string which was missing a %s.
* pluto: added per-conn nat_keepalive=  (whack --no-nat_keepalive)

Add an option nat_keepalive= to allow disabling keep alives by
specifying nat_keepalive=no. The default (yes) causes the same
behaviour as we have currently without the option.

This option takes precedence over the global force_keepalive= option

Note: I don't fully understand the purpose of the global option, it
would send NAT-T KA packets when "they are NATed" where as normally
we only send NAT-T KA packets when "we are NATed". Is there an actual
use case for this?

To ensure we don't change the current behaviour, the whack option
does the negative, eg --no-nat-keepalives, so that not specifying it
gives the proper default behaviour of doing regular NAT-KA packets.

NOTE: We currently always send these packets, even when there is
traffic flowing over the IPsec SA (and thus over port 4500 so the
NAT router would keep the port mapping open anyway)
Merge branch 'master' of vault.libreswan.fi:/srv/src/libreswan