summaryrefslogtreecommitdiff
path: root/programs/pluto/demux.c
diff options
context:
space:
mode:
authorRene Mayrhofer <rene@mayrhofer.eu.org>2006-06-26 11:32:54 +0000
committerRene Mayrhofer <rene@mayrhofer.eu.org>2006-06-26 11:32:54 +0000
commit6782d06a206e8aa8304d4ec9518361aecd1b9472 (patch)
tree8ea2727105be2e0191d89f7a101f43ba8b59c810 /programs/pluto/demux.c
parentaa0f5b38aec14428b4b80e06f90ff781f8bca5f1 (diff)
downloadvyos-strongswan-6782d06a206e8aa8304d4ec9518361aecd1b9472.tar.gz
vyos-strongswan-6782d06a206e8aa8304d4ec9518361aecd1b9472.zip
Load /tmp/tmp.dFxzTv5957/strongswan-2.7.2 into
branches/source-dist/debian/strongswan.
Diffstat (limited to 'programs/pluto/demux.c')
-rw-r--r--programs/pluto/demux.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/programs/pluto/demux.c b/programs/pluto/demux.c
index 2f8fb9a8f..db7f1c4a6 100644
--- a/programs/pluto/demux.c
+++ b/programs/pluto/demux.c
@@ -12,7 +12,7 @@
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
- * RCSID $Id: demux.c,v 1.13 2005/02/18 21:08:59 as Exp $
+ * RCSID $Id: demux.c,v 1.14 2006/06/22 11:58:25 as Exp $
*/
/* Ordering Constraints on Payloads
@@ -2397,7 +2397,8 @@ complete_state_transition(struct msg_digest **mdp, stf_status result)
* whatever retrying was in place, remains in place.
*/
whack_log(RC_NOTIFICATION + md->note
- , "%s: %s", enum_name(&state_names, st->st_state)
+ , "%s: %s"
+ , enum_name(&state_names, (st == NULL)? STATE_MAIN_R0:st->st_state)
, enum_name(&notification_names, md->note));
SEND_NOTIFICATION(md->note);