[Swan-commit] Changes to ref refs/heads/master

[Paul Wouters]

New commits:
commit bd04be397fbfb4c7049919121833e8a4e61df039
Merge: 6dd4196 b47b6c9
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Jan 26 19:51:02 2013 -0500

    Merge branch 'master' of vault.foobar.fi:/srv/src/libreswan

commit 6dd419682c44117fc5dc4cb83b73659da9393d4e
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Jan 26 19:14:20 2013 -0500

    * testing: two configurations to compile pluto for testing
    
    minimal: disable everything but NETKEY
    everything: enable everything except taproom and dmalloc

commit 4fa3a57ece83dfefa57543bb4123b84c388add7b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Jan 26 19:11:43 2013 -0500

    * taproom: minor fixes to taproom
    
    Fixed some missing "goto" statements for taproom. Ifdef'ed the
    TCL calls in IKEv2 as they have never been tested or run (taproom
    predates ikev2) - but programs/pluto/tpm/ needs to be fixed or
    removed. (I think removal is best - code hasn't compiled or run
    since about 2007, no one uses it)

commit 7e10c81840750c3a76b209e401a9a029ad069c83
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Jan 26 18:53:51 2013 -0500

    * XAUTH: missing ifdef's around two blocks dealing with XAUTH