Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/crypto/dist/ipsec-tools/src/racoon From Pierre POMES: fixed ...



details:   https://anonhg.NetBSD.org/src/rev/398b01e9737e
branches:  trunk
changeset: 752700:398b01e9737e
user:      vanhu <vanhu%NetBSD.org@localhost>
date:      Thu Mar 04 15:13:53 2010 +0000

description:
>From Pierre POMES: fixed admin port initialization

diffstat:

 crypto/dist/ipsec-tools/src/racoon/session.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 1e0dc8a344b5 -r 398b01e9737e crypto/dist/ipsec-tools/src/racoon/session.c
--- a/crypto/dist/ipsec-tools/src/racoon/session.c      Thu Mar 04 13:11:14 2010 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/session.c      Thu Mar 04 15:13:53 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: session.c,v 1.26 2009/06/24 11:28:48 tteras Exp $      */
+/*     $NetBSD: session.c,v 1.27 2010/03/04 15:13:53 vanhu Exp $       */
 
 /*     $KAME: session.c,v 1.32 2003/09/24 02:01:17 jinmei Exp $        */
 
@@ -170,11 +170,6 @@
        if (pfkey_init() < 0)
                errx(1, "failed to initialize pfkey socket");
 
-#ifdef ENABLE_ADMINPORT
-       if (admin_init() < 0)
-               errx(1, "failed to initialize admin port socket");
-#endif
-
        if (isakmp_init() < 0)
                errx(1, "failed to initialize ISAKMP structures");
 
@@ -204,6 +199,12 @@
                errx(1, "failed to parse configuration file.");
        restore_params();
 
+#ifdef ENABLE_ADMINPORT
+       if (admin_init() < 0)
+               errx(1, "failed to initialize admin port socket");
+#endif
+
+
 #ifdef ENABLE_HYBRID
        if(isakmp_cfg_config.network4 && isakmp_cfg_config.pool_size == 0)
                if ((error = isakmp_cfg_resize_pool(ISAKMP_CFG_MAX_CNX)) != 0)



Home | Main Index | Thread Index | Old Index