[Swan-commit] Changes to ref refs/heads/3.5_modecfgdomain

[Paul Wouters]

New commits:
commit 3d37e8b05a949c607a3d04d2cda5d5a67568b2ed
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Oct 10 14:32:55 2013 -0400

    Remove unused define NO_EXTRA_IKE

commit a4bbc4162d4feb68c68b516cf23ce80fd1114d99
Merge: 22f895a 690e5de
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Oct 10 14:26:07 2013 -0400

    Merge branch 'master' into 3.5_modecfgdomain
    
    Conflicts:
    	lib/libswan/constants.c

commit 690e5deff9b7618fd814b34feab01e271689234b
Author: Tuomo Soini <tis at foobar.fi>
Date:   Wed Oct 9 18:36:48 2013 +0300

    hub-spoke.conf: remove broken reference to old bug

commit 73de7ac59b06553e016aadb3da964647c029d4e9
Merge: be6695a c4b18e5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 9 10:30:27 2013 -0400

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

commit be6695a9cf7014ccb5870bea1f890230e1bb910f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 9 10:24:37 2013 -0400

    update changes

commit 3a141a536267509c9fb08636d2f6d5de18797ed0
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Oct 9 10:14:22 2013 -0400

    NSS: let pluto open the NSS db in /etc/ipsec.d as read-only
    
    SElinux policies are blocking opening readwrite, and pluto does not
    write anything to the NSS db.

commit c4b18e5cb8c300598a0a7cd4d7a45ebdaf25064e
Author: Tuomo Soini <tis at foobar.fi>
Date:   Wed Oct 9 08:40:45 2013 +0300

    ipsec.conf: ipv4 networks before ipv6 networks - easier to read

commit 78beecfbc289b972c8c586f258fa312dcf134c75
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Oct 8 21:41:43 2013 -0400

    updated changes

commit 106b519bcea0ec790c5b4d9983c8c67a124f8277
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Oct 8 21:39:22 2013 -0400

    nat-traversal: Added 100.64.0.0/10 to virtual_private
    
    This is the Shared Address Space address from RFC 6598

commit 858f62bfd55777975fd023c07708176eeee9f039
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 8 13:31:06 2013 -0400

    - don't require xauth_attr_names and modecfg_attr_names to compensate for sloppy handling of Attribute Format bit
    - better comment Attribute Format / Attribute Type masks

commit f9e00b837f9e480319a3f04a3845afbe7342eb5e
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 8 13:19:30 2013 -0400

    remove extern declarations of things that are now file static

commit 4fd0705f14e3fb610e64127858343b326ce6ff45
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Tue Oct 8 12:46:31 2013 -0400

    - make as many definitions as possible file static
    - #if 0 arround some unused definitions