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

[Paul Wouters]

New commits:
commit dcdb2c41398512875ece279da8d7e90240205a1c
Merge: ff61481 acd66d5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 11 11:41:25 2014 -0400

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

commit ff61481716a9f5d5fcb94cdb51ec482b8f8a3227
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 11 11:37:39 2014 -0400

    Fixed remaining stf_status vs notification_t vs v2_notification_t issues
    
    Mostly tried to return stf_status, as that fixed a few cases were we
    should but did not return STF_INTERNAL_ERROR. There were also two
    cases where we returned FALSE, despite the caller expecting a notification_t
    and NOTHING_WRONG == 0 == FALSE
    
    The only two functions left that convert between the two notification types
    are
    
    - accept_KE()  (used by both ikev1 and ikev2, should be split)
    - accept_v2_nonce (uses RETURN_STF_FAILURE that uses notification_t)

commit e44a53ed398ba84719920cd9e536099f62c653d5
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 11 10:51:03 2014 -0400

    fix two more v2_notification vs stf_status statements

commit 7ec6d7cae3a350d1c42f1b3940690f201acd3e03
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 11 10:46:11 2014 -0400

    include nat_traversal.h in ikev2_parent.c

commit 20a75e7a3747343d634ab550db91c247e1de3232
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 11 10:45:04 2014 -0400

    fix case where we returned a v2_notification_t instead of a stf_status

commit bfefb81e2bccb8af7231c31b10414e2a4b245f95
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 11 10:43:17 2014 -0400

    fix an NOTHING_WRONG to v2N_NOTHING_WRONG

commit 62da4ddf214fb35b926a93c0d6257c25848ff6c2
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 11 10:41:20 2014 -0400

    tweak to sscanf to suppress data argument not used by format string

commit 680482ec7f9e1dbe90730ef403d99c59478b1b00
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 11 10:39:39 2014 -0400

    remove strange logging prefix spotted by clang

commit 635f63d23cce90fc24b237fecf66f64580be16c0
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 11 10:34:36 2014 -0400

    remove some redundant parenthesis (clang warning)

commit 2c8be8e929af8d5b1737189a44b1cd7bc74b618b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 11 10:30:19 2014 -0400

    Remove ub_resolve_free() call on uninitialised value (spotted by clang)