starter: Remove START_CHARON compile flag

Since the removal of pluto this is quite superfluous. The flag itself
might be useful to avoid starting charon if the executable does not
exist for some reason (e.g. if DAEMON_NAME is incorrect).

diff --git a/src/starter/Android.mk b/src/starter/Android.mk
index c37fc1aa62859c0bbf2cfba52bb1f75f973b4c65..8c5d1a92fa599ffac55c695c0cad602d894fd2b4 100644 (file)
--- a/src/starter/Android.mk
+++ b/src/starter/Android.mk
@@ -19,7 +19,7 @@ LOCAL_C_INCLUDES += \
        $(strongswan_PATH)/src/starter \
        $(strongswan_PATH)/src/stroke
 
-LOCAL_CFLAGS := $(strongswan_CFLAGS) -DSTART_CHARON \
+LOCAL_CFLAGS := $(strongswan_CFLAGS) \
        -DIPSEC_SCRIPT='"ipsec"' \
        -DPLUGINS='"$(strongswan_STARTER_PLUGINS)"'
 

diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index f0a2be85611a70a591c298e8c8c427e164b49c6b..7f5d1ca5b6adc95e5f9edb3090f9623c05dc6f39 100644 (file)
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -40,10 +40,6 @@ EXTRA_DIST = keywords.txt ipsec.conf Android.mk
 MAINTAINERCLEANFILES = keywords.c
 BUILT_SOURCES = keywords.c parser/parser.h
 
-if USE_CHARON
-  AM_CPPFLAGS += -DSTART_CHARON
-endif
-
 if USE_LOAD_WARNING
   AM_CPPFLAGS += -DLOAD_WARNING
 endif

diff --git a/src/starter/confread.c b/src/starter/confread.c
index de9099a1b337307bd527f4f66454dcd8d759e8d5..3943f9abeccaaa728d781d732b3303866594ff59 100644 (file)
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -149,12 +149,8 @@ static void load_setup(starter_config_t *cfg, conf_parser_t *parser)
        dict->destroy(dict);
 
        /* verify the executables are actually available */
-#ifdef START_CHARON
        cfg->setup.charonstart = cfg->setup.charonstart &&
                                                         daemon_exists(daemon_name, cmd);
-#else
-       cfg->setup.charonstart = FALSE;
-#endif
 }
 
 /*
@@ -722,12 +718,9 @@ starter_config_t* confread_load(const char *file)
        INIT(cfg,
                .setup = {
                        .uniqueids = TRUE,
-
+                       .charonstart = TRUE,
                }
        );
-#ifdef START_CHARON
-       cfg->setup.charonstart = TRUE;
-#endif
 
        /* load config setup section */
        load_setup(cfg, parser);