Module Name:src
Committed By: vanhu
Date: Thu Mar 4 15:13:53 UTC 2010
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: session.c
Log Message:
>From Pierre POMES: fixed admin port initialization
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/crypto/dist/ipsec-tools/src/racoon/session.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/session.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/session.c:1.26 src/crypto/dist/ipsec-tools/src/racoon/session.c:1.27
--- src/crypto/dist/ipsec-tools/src/racoon/session.c:1.26 Wed Jun 24 11:28:48 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/session.c Thu Mar 4 15:13:53 2010
@@ -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)
