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

[Paul Wouters]

New commits:
commit c298aa30aa4bff596210f2f3b5364ae9d012eda9
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Feb 1 11:41:35 2013 -0500

    * updated changes

commit 187cee68e25547102699afbe522eaf081261a017
Author: Matt Rogers <mrogers at redhat.com>
Date:   Fri Feb 1 11:38:59 2013 -0500

    * #53:  ipsec auto --status does not show phase2 parameters
    
    when using (unspecified) defaults
    
    Not specifying phase2alg= leaves c->alg_info_esp NULL so the rest of the
    information was being skipped, when c->alg_info_esp was only needed to
    determine the pfsgroup in whack_log. Relocating the pfsgroup determination
    outside of the whack_log functions will let us see the rest of the info
    even if the pfsgroup is unspecified.
    
    Signed-off-by: Paul Wouters <pwouters at redhat.com>

commit b9994a9657f7b847cc66fb1ba6cf2f482c5d0542
Merge: 31645a3 8a2a75d
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Feb 1 11:14:09 2013 -0500

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

commit 31645a3f77a0d71855e14fa6c51fc6bffd720c85
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jan 31 22:04:21 2013 -0500

    * fixed typo in log message