[strongSwan] [patch] Start charon/pluto only if they were built

2009-03-24 Thread Thomas Jarosch
Hello together,

attached is a patch to start charon/pluto only if they were built.

Best regards,
Thomas Jarosch

diff -u -r -p strongswan-4.2.13/src/starter/Makefile.am strongswan.starter/src/starter/Makefile.am
--- strongswan-4.2.13/src/starter/Makefile.am	Tue Dec 23 07:24:01 2008
+++ strongswan.starter/src/starter/Makefile.am	Tue Mar 24 15:04:40 2009
@@ -15,6 +15,14 @@ MAINTAINERCLEANFILES = lex.yy.c y.tab.c 
 PLUTODIR=$(top_srcdir)/src/pluto
 SCEPCLIENTDIR=$(top_srcdir)/src/scepclient
 
+if USE_PLUTO
+  AM_CFLAGS += -DSTART_PLUTO
+endif
+
+if USE_CHARON
+  AM_CFLAGS += -DSTART_CHARON
+endif
+
 lex.yy.c:	parser.l parser.y parser.h y.tab.c
 		$(LEX) --nounput $ 
 
diff -u -r -p strongswan-4.2.13/src/starter/confread.c strongswan.starter/src/starter/confread.c
--- strongswan-4.2.13/src/starter/confread.c	Tue Mar 24 11:59:44 2009
+++ strongswan.starter/src/starter/confread.c	Tue Mar 24 15:06:14 2009
@@ -61,8 +61,18 @@ static void default_values(starter_confi
 	cfg-setup.hidetos = TRUE;
 	cfg-setup.uniqueids   = TRUE;
 	cfg-setup.interfaces  = new_list(%defaultroute);
+
+#ifdef START_CHARON
 	cfg-setup.charonstart = TRUE;
+#else
+ 	cfg-setup.charonstart = FALSE;
+#endif
+
+#ifdef START_PLUTO
 	cfg-setup.plutostart  = TRUE;
+#else
+ 	cfg-setup.plutostart  = FALSE;
+#endif
 
 	/* limit certificate requests
 	 * magic values:  -1: unlimited -2: use pluto default */
___
Users mailing list
Users@lists.strongswan.org
https://lists.strongswan.org/mailman/listinfo/users


Re: [strongSwan] [patch] Start charon/pluto only if they were built

2009-03-24 Thread Martin Willi
Hi,

 attached is a patch to start charon/pluto only if they were built.

Applied in a slightly modified version [1] to trunk, thanks!

Regards,
Martin

[1]http://trac.strongswan.org/changeset/5002



___
Users mailing list
Users@lists.strongswan.org
https://lists.strongswan.org/mailman/listinfo/users