aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/starter/Makefile.am8
-rw-r--r--src/starter/confread.c5
-rw-r--r--src/starter/ipsec.conf.58
3 files changed, 19 insertions, 2 deletions
diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index 78320b4c7..8a9ba54c9 100644
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -15,6 +15,14 @@ MAINTAINERCLEANFILES = lex.yy.c y.tab.c y.tab.h keywords.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 --git a/src/starter/confread.c b/src/starter/confread.c
index 56d6dd146..d2b1b4974 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -61,8 +61,13 @@ static void default_values(starter_config_t *cfg)
cfg->setup.hidetos = TRUE;
cfg->setup.uniqueids = TRUE;
cfg->setup.interfaces = new_list("%defaultroute");
+
+#ifdef START_CHARON
cfg->setup.charonstart = TRUE;
+#endif
+#ifdef START_PLUTO
cfg->setup.plutostart = TRUE;
+#endif
cfg->conn_default.seen = LEMPTY;
cfg->conn_default.startup = STARTUP_NO;
diff --git a/src/starter/ipsec.conf.5 b/src/starter/ipsec.conf.5
index bb6bb45a9..c9074868a 100644
--- a/src/starter/ipsec.conf.5
+++ b/src/starter/ipsec.conf.5
@@ -940,9 +940,11 @@ and
whether to start the IKEv2 Charon daemon or not.
Accepted values are
.B yes
-(the default)
or
.BR no .
+The default is
+.B yes
+if starter was compiled with IKEv2 support.
.TP
.B dumpdir
in what directory should things started by \fBipsec starter\fR
@@ -955,9 +957,11 @@ This feature is currently not yet supported by \fBipsec starter\fR.
whether to start the IKEv1 Pluto daemon or not.
Accepted values are
.B yes
-(the default)
or
.BR no .
+The default is
+.B yes
+if starter was compiled with IKEv1 support.
.TP
.B strictcrlpolicy
defines if a fresh CRL must be available in order for the peer authentication based