set the default of plutostart/charonstart according to ./configure options

This commit is contained in:
Martin Willi
2009-03-24 15:02:12 +00:00
parent 4a6b84a934
commit e4838d02b3
3 changed files with 19 additions and 2 deletions
+8
View File
@@ -15,6 +15,14 @@ MAINTAINERCLEANFILES = lex.yy.c y.tab.c y.tab.h keywords.c
PLUTODIR=$(top_srcdir)/src/pluto PLUTODIR=$(top_srcdir)/src/pluto
SCEPCLIENTDIR=$(top_srcdir)/src/scepclient 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.yy.c: parser.l parser.y parser.h y.tab.c
$(LEX) --nounput $< $(LEX) --nounput $<
+5
View File
@@ -61,8 +61,13 @@ static void default_values(starter_config_t *cfg)
cfg->setup.hidetos = TRUE; cfg->setup.hidetos = TRUE;
cfg->setup.uniqueids = TRUE; cfg->setup.uniqueids = TRUE;
cfg->setup.interfaces = new_list("%defaultroute"); cfg->setup.interfaces = new_list("%defaultroute");
#ifdef START_CHARON
cfg->setup.charonstart = TRUE; cfg->setup.charonstart = TRUE;
#endif
#ifdef START_PLUTO
cfg->setup.plutostart = TRUE; cfg->setup.plutostart = TRUE;
#endif
cfg->conn_default.seen = LEMPTY; cfg->conn_default.seen = LEMPTY;
cfg->conn_default.startup = STARTUP_NO; cfg->conn_default.startup = STARTUP_NO;
+6 -2
View File
@@ -940,9 +940,11 @@ and
whether to start the IKEv2 Charon daemon or not. whether to start the IKEv2 Charon daemon or not.
Accepted values are Accepted values are
.B yes .B yes
(the default)
or or
.BR no . .BR no .
The default is
.B yes
if starter was compiled with IKEv2 support.
.TP .TP
.B dumpdir .B dumpdir
in what directory should things started by \fBipsec starter\fR 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. whether to start the IKEv1 Pluto daemon or not.
Accepted values are Accepted values are
.B yes .B yes
(the default)
or or
.BR no . .BR no .
The default is
.B yes
if starter was compiled with IKEv1 support.
.TP .TP
.B strictcrlpolicy .B strictcrlpolicy
defines if a fresh CRL must be available in order for the peer authentication based defines if a fresh CRL must be available in order for the peer authentication based