Imported Upstream version 5.2.0

29 files changed, 6915 insertions, 4453 deletions

diff --git a/src/starter/Android.mk b/src/starter/Android.mk
index c2260be51..c37fc1aa6 100644
--- a/src/starter/Android.mk
+++ b/src/starter/Android.mk
@@ -3,11 +3,11 @@ include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am (update for LEX/YACC)
 starter_SOURCES := \
-parser.c lexer.c ipsec-parser.h netkey.c args.h netkey.h \
-starterstroke.c confread.c \
-starterstroke.h confread.h args.c \
-keywords.c files.h keywords.h cmp.c starter.c cmp.h invokecharon.c \
-invokecharon.h klips.c klips.h
+starter.c files.h \
+parser/parser.c parser/lexer.c parser/conf_parser.c parser/conf_parser.h \
+args.c args.h confread.c confread.h keywords.c keywords.h cmp.c cmp.h \
+invokecharon.c invokecharon.h starterstroke.c starterstroke.h \
+netkey.c netkey.h klips.c klips.h
 
 LOCAL_SRC_FILES := $(filter %.c,$(starter_SOURCES))
 
@@ -16,9 +16,11 @@ LOCAL_SRC_FILES := $(filter %.c,$(starter_SOURCES))
 LOCAL_C_INCLUDES += \
 	$(strongswan_PATH)/src/libhydra \
 	$(strongswan_PATH)/src/libstrongswan \
+	$(strongswan_PATH)/src/starter \
 	$(strongswan_PATH)/src/stroke
 
 LOCAL_CFLAGS := $(strongswan_CFLAGS) -DSTART_CHARON \
+	-DIPSEC_SCRIPT='"ipsec"' \
 	-DPLUGINS='"$(strongswan_STARTER_PLUGINS)"'
 
 LOCAL_MODULE := starter
diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index 48110dd02..f0a2be856 100644
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -1,15 +1,22 @@
+SUBDIRS = . tests
+
 ipsec_PROGRAMS = starter
 starter_SOURCES = \
-parser.y lexer.l ipsec-parser.h netkey.c args.h netkey.h \
-starterstroke.c confread.c \
-starterstroke.h confread.h args.c \
-keywords.c files.h keywords.h cmp.c starter.c cmp.h invokecharon.c \
-invokecharon.h klips.c klips.h
+starter.c files.h \
+args.c args.h confread.c confread.h keywords.c keywords.h cmp.c cmp.h \
+invokecharon.c invokecharon.h starterstroke.c starterstroke.h \
+netkey.c netkey.h klips.c klips.h
+
+# parser is also used by tests
+noinst_LTLIBRARIES = libstarter.la
+libstarter_la_SOURCES = \
+parser/parser.y parser/lexer.l parser/conf_parser.c parser/conf_parser.h
 
 AM_CPPFLAGS = \
 	-I${linux_headers} \
 	-I$(top_srcdir)/src/libstrongswan \
 	-I$(top_srcdir)/src/libhydra \
+	-I$(top_srcdir)/src/starter \
 	-I$(top_srcdir)/src/stroke \
 	-DIPSEC_DIR=\"${ipsecdir}\" \
 	-DIPSEC_CONFDIR=\"${sysconfdir}\" \
@@ -23,10 +30,15 @@ AM_CPPFLAGS = \
 
 AM_YFLAGS = -v -d
 
-starter_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libhydra/libhydra.la $(SOCKLIB) $(PTHREADLIB)
+starter_LDADD = \
+	$(top_builddir)/src/libstrongswan/libstrongswan.la \
+	$(top_builddir)/src/libhydra/libhydra.la \
+	libstarter.la \
+	$(SOCKLIB) $(PTHREADLIB)
+
 EXTRA_DIST = keywords.txt ipsec.conf Android.mk
 MAINTAINERCLEANFILES = keywords.c
-BUILT_SOURCES = parser.h
+BUILT_SOURCES = keywords.c parser/parser.h
 
 if USE_CHARON
   AM_CPPFLAGS += -DSTART_CHARON
@@ -36,7 +48,7 @@ if USE_LOAD_WARNING
   AM_CPPFLAGS += -DLOAD_WARNING
 endif
 
-if USE_TOOLS
+if USE_SCEPCLIENT
   AM_CPPFLAGS += -DGENERATE_SELFCERT
 endif
 
diff --git a/src/starter/Makefile.in b/src/starter/Makefile.in
index 3f3200d64..8beb47c30 100644
--- a/src/starter/Makefile.in
+++ b/src/starter/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -14,6 +14,7 @@
 
 @SET_MAKE@
 
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -81,11 +82,11 @@ host_triplet = @host@
 ipsec_PROGRAMS = starter$(EXEEXT)
 @USE_CHARON_TRUE@am__append_1 = -DSTART_CHARON
 @USE_LOAD_WARNING_TRUE@am__append_2 = -DLOAD_WARNING
-@USE_TOOLS_TRUE@am__append_3 = -DGENERATE_SELFCERT
+@USE_SCEPCLIENT_TRUE@am__append_3 = -DGENERATE_SELFCERT
 subdir = src/starter
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am parser.h \
-	parser.c lexer.c $(top_srcdir)/depcomp $(top_srcdir)/ylwrap \
-	README
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	parser/parser.h parser/parser.c parser/lexer.c \
+	$(top_srcdir)/depcomp $(top_srcdir)/ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \
 	$(top_srcdir)/m4/config/ltoptions.m4 \
@@ -103,22 +104,28 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libstarter_la_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libstarter_la_OBJECTS = parser/parser.lo parser/lexer.lo \
+	parser/conf_parser.lo
+libstarter_la_OBJECTS = $(am_libstarter_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
 am__installdirs = "$(DESTDIR)$(ipsecdir)"
 PROGRAMS = $(ipsec_PROGRAMS)
-am_starter_OBJECTS = parser.$(OBJEXT) lexer.$(OBJEXT) netkey.$(OBJEXT) \
-	starterstroke.$(OBJEXT) confread.$(OBJEXT) args.$(OBJEXT) \
-	keywords.$(OBJEXT) cmp.$(OBJEXT) starter.$(OBJEXT) \
-	invokecharon.$(OBJEXT) klips.$(OBJEXT)
+am_starter_OBJECTS = starter.$(OBJEXT) args.$(OBJEXT) \
+	confread.$(OBJEXT) keywords.$(OBJEXT) cmp.$(OBJEXT) \
+	invokecharon.$(OBJEXT) starterstroke.$(OBJEXT) \
+	netkey.$(OBJEXT) klips.$(OBJEXT)
 starter_OBJECTS = $(am_starter_OBJECTS)
 am__DEPENDENCIES_1 =
 starter_DEPENDENCIES =  \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la \
-	$(top_builddir)/src/libhydra/libhydra.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
+	$(top_builddir)/src/libhydra/libhydra.la libstarter.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -170,13 +177,29 @@ AM_V_YACC = $(am__v_YACC_@AM_V@)
 am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
 am__v_YACC_0 = @echo "  YACC    " $@;
 am__v_YACC_1 = 
-SOURCES = $(starter_SOURCES)
-DIST_SOURCES = $(starter_SOURCES)
+SOURCES = $(libstarter_la_SOURCES) $(starter_SOURCES)
+DIST_SOURCES = $(libstarter_la_SOURCES) $(starter_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -196,7 +219,33 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
@@ -259,6 +308,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_LIB = @OPENSSL_LIB@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -277,6 +327,7 @@ PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGIN_CFLAGS = @PLUGIN_CFLAGS@
 PTHREADLIB = @PTHREADLIB@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
@@ -304,6 +355,7 @@ abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+aikgen_plugins = @aikgen_plugins@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -395,6 +447,7 @@ srcdir = @srcdir@
 starter_plugins = @starter_plugins@
 strongswan_conf = @strongswan_conf@
 strongswan_options = @strongswan_options@
+swanctldir = @swanctldir@
 sysconfdir = @sysconfdir@
 systemdsystemunitdir = @systemdsystemunitdir@
 t_plugins = @t_plugins@
@@ -405,29 +458,41 @@ top_srcdir = @top_srcdir@
 urandom_device = @urandom_device@
 xml_CFLAGS = @xml_CFLAGS@
 xml_LIBS = @xml_LIBS@
+SUBDIRS = . tests
 starter_SOURCES = \
-parser.y lexer.l ipsec-parser.h netkey.c args.h netkey.h \
-starterstroke.c confread.c \
-starterstroke.h confread.h args.c \
-keywords.c files.h keywords.h cmp.c starter.c cmp.h invokecharon.c \
-invokecharon.h klips.c klips.h
+starter.c files.h \
+args.c args.h confread.c confread.h keywords.c keywords.h cmp.c cmp.h \
+invokecharon.c invokecharon.h starterstroke.c starterstroke.h \
+netkey.c netkey.h klips.c klips.h
+
+
+# parser is also used by tests
+noinst_LTLIBRARIES = libstarter.la
+libstarter_la_SOURCES = \
+parser/parser.y parser/lexer.l parser/conf_parser.c parser/conf_parser.h
 
 AM_CPPFLAGS = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
-	-I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/stroke \
-	-DIPSEC_DIR=\"${ipsecdir}\" -DIPSEC_CONFDIR=\"${sysconfdir}\" \
-	-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_EAPDIR=\"${eapdir}\" \
+	-I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/starter \
+	-I$(top_srcdir)/src/stroke -DIPSEC_DIR=\"${ipsecdir}\" \
+	-DIPSEC_CONFDIR=\"${sysconfdir}\" -DIPSEC_PIDDIR=\"${piddir}\" \
+	-DIPSEC_EAPDIR=\"${eapdir}\" \
 	-DIPSEC_SCRIPT=\"${ipsec_script}\" \
 	-DDEV_RANDOM=\"${random_device}\" \
 	-DDEV_URANDOM=\"${urandom_device}\" \
 	-DPLUGINS=\""${starter_plugins}\"" -DDEBUG $(am__append_1) \
 	$(am__append_2) $(am__append_3)
 AM_YFLAGS = -v -d
-starter_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(top_builddir)/src/libhydra/libhydra.la $(SOCKLIB) $(PTHREADLIB)
+starter_LDADD = \
+	$(top_builddir)/src/libstrongswan/libstrongswan.la \
+	$(top_builddir)/src/libhydra/libhydra.la \
+	libstarter.la \
+	$(SOCKLIB) $(PTHREADLIB)
+
 EXTRA_DIST = keywords.txt ipsec.conf Android.mk
 MAINTAINERCLEANFILES = keywords.c
-BUILT_SOURCES = parser.h
+BUILT_SOURCES = keywords.c parser/parser.h
 all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .l .lo .o .obj .y
@@ -461,6 +526,35 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+parser/parser.h: parser/parser.c
+	@if test ! -f $@; then rm -f parser/parser.c; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) parser/parser.c; else :; fi
+parser/$(am__dirstamp):
+	@$(MKDIR_P) parser
+	@: > parser/$(am__dirstamp)
+parser/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) parser/$(DEPDIR)
+	@: > parser/$(DEPDIR)/$(am__dirstamp)
+parser/parser.lo: parser/$(am__dirstamp) \
+	parser/$(DEPDIR)/$(am__dirstamp)
+parser/lexer.lo: parser/$(am__dirstamp) \
+	parser/$(DEPDIR)/$(am__dirstamp)
+parser/conf_parser.lo: parser/$(am__dirstamp) \
+	parser/$(DEPDIR)/$(am__dirstamp)
+
+libstarter.la: $(libstarter_la_OBJECTS) $(libstarter_la_DEPENDENCIES) $(EXTRA_libstarter_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK)  $(libstarter_la_OBJECTS) $(libstarter_la_LIBADD) $(LIBS)
 install-ipsecPROGRAMS: $(ipsec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(ipsec_PROGRAMS)'; test -n "$(ipsecdir)" || list=; \
@@ -510,9 +604,6 @@ clean-ipsecPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-parser.h: parser.c
-	@if test ! -f $@; then rm -f parser.c; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) parser.c; else :; fi
 
 starter$(EXEEXT): $(starter_OBJECTS) $(starter_DEPENDENCIES) $(EXTRA_starter_DEPENDENCIES) 
 	@rm -f starter$(EXEEXT)
@@ -520,6 +611,8 @@ starter$(EXEEXT): $(starter_OBJECTS) $(starter_DEPENDENCIES) $(EXTRA_starter_DEP
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f parser/*.$(OBJEXT)
+	-rm -f parser/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -530,11 +623,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/invokecharon.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keywords.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klips.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lexer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netkey.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/starter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/starterstroke.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@parser/$(DEPDIR)/conf_parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@parser/$(DEPDIR)/lexer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@parser/$(DEPDIR)/parser.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -571,15 +665,63 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
+	-rm -rf parser/.libs parser/_libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
+tags: tags-recursive
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
@@ -592,7 +734,7 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-am
+ctags: ctags-recursive
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
@@ -605,7 +747,7 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
+cscopelist: cscopelist-recursive
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
@@ -654,24 +796,50 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
 check-am: all-am
 check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
+installdirs: installdirs-recursive
+installdirs-am:
 	for dir in "$(DESTDIR)$(ipsecdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-am
+installcheck: installcheck-recursive
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
@@ -689,99 +857,102 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f parser/$(DEPDIR)/$(am__dirstamp)
+	-rm -f parser/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f lexer.c
-	-rm -f parser.c
-	-rm -f parser.h
+	-rm -f parser/lexer.c
+	-rm -f parser/parser.c
+	-rm -f parser/parser.h
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
+clean: clean-recursive
 
 clean-am: clean-generic clean-ipsecPROGRAMS clean-libtool \
-	mostlyclean-am
+	clean-noinstLTLIBRARIES mostlyclean-am
 
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR) parser/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
-dvi: dvi-am
+dvi: dvi-recursive
 
 dvi-am:
 
-html: html-am
+html: html-recursive
 
 html-am:
 
-info: info-am
+info: info-recursive
 
 info-am:
 
 install-data-am: install-ipsecPROGRAMS
 
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am: install-exec-local
 
-install-html: install-html-am
+install-html: install-html-recursive
 
 install-html-am:
 
-install-info: install-info-am
+install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
-install-ps: install-ps-am
+install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR) parser/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
-pdf: pdf-am
+pdf: pdf-recursive
 
 pdf-am:
 
-ps: ps-am
+ps: ps-recursive
 
 ps-am:
 
 uninstall-am: uninstall-ipsecPROGRAMS
 
-.MAKE: all check install install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-ipsecPROGRAMS clean-libtool cscopelist-am ctags ctags-am \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-local install-html \
-	install-html-am install-info install-info-am \
+.MAKE: $(am__recursive_targets) all check install install-am \
+	install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-ipsecPROGRAMS clean-libtool \
+	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-html install-html-am install-info install-info-am \
 	install-ipsecPROGRAMS install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-ipsecPROGRAMS
diff --git a/src/starter/README b/src/starter/README
deleted file mode 100644
index 4aff64978..000000000
--- a/src/starter/README
+++ /dev/null
@@ -1,101 +0,0 @@
-
-IPsec Starter -- Version 0.2        [Contributed by Arkoon Network Security]
-============================        [                http://www.arkoon.net/]
-
-IPsec Starter is aimed to replace all the scripts which are used to
-start and stop strongSwan and to do that in a quicker and a smarter way.
-
-IPsec Starter can also reload the configuration file (kill --HUP or periodicaly)
-and apply the changes.
-
-Usage:
-  starter [--debug] [--auto_update <x seconds>]
-    --debug:       enable debugging output
-    --no_fork:     all msg (including pluto) are sent to the console
-    --auto_update: reload the config file (like kill -HUP) every x seconds
-                   and determine any configuration changes
-
-FEATURES
---------
-
-o Load modules of the native Linux 2.6 IPsec stack
-
-o Launch and monitor pluto
-
-o Add, initiate, route and del connections
-
-o Attach and detach interfaces according to config file
-
-o kill -HUP can be used to reload the config file. New connections will be
-  added, old ones will be removed and modified ones will be reloaded.
-  Interfaces/Klips/Pluto will be reloaded if necessary.
-
-o Full support of the %defaultroute wildcard parameter.
-
-o save own pid in /var/run/starter
-
-o Upon reloading, dynamic DNS addr will be resolved and reloaded. Use
-  --auto_update to periodicaly check dynamic DNS changes.
-
-o kill -USR1 can be used to reload all connections (delete then add and
-  route/initiate)
-
-o /var/run/dynip/xxxx can be used to use a virtual interface name in
-  ipsec.conf. By example, when adsl can be ppp0, ppp1, ... :
-    ipsec.conf:             interfaces="ipsec0=adsl"
-  And use /etc/ppp/ip-up to create /var/run/dynip/adsl
-    /var/run/dynip/adsl:    IP_PHYS=ppp0
-
-o %auto can be used to automaticaly name the connections
-
-o kill -TERM can be used to stop FS. pluto will be stopped.
-
-o Can be used to start strongSwan and load lots of connections in a few
-  seconds.
-
-TODO
-----
-
-o handle wildcards in include lines -- use glob() fct
-    ex: include /etc/ipsec.*.conf
-
-o handle duplicates keywords and sections
-
-o 'also' keyword not supported
-
-o manually keyed connections
-
-o IPv6
-
-o Documentation
-
-
-CHANGES
--------
-
-o Version 0.1 -- 2002.01.14 -- First public release
-
-o Version 0.2 -- 2002.09.04 -- Various enhancements
-                               FreeS/WAN 1.98b, x509 0.9.14, algo 0.8.0
-
-o Version 0.2d -- 2004.01.13 -- Adaptions for Openswan 1.0.0
-                                by Stephan Scholz <sscholz@astaro.com>
-
-o Version 0.2e -- 2004.10.14 -- Added support for change of interface address
-                                by Stephan Scholz <sscholz@astaro.com>
-
-o Version 0.2s -- 2005-12-02 -- Ported to strongSwan
-                                by Stephan Scholz <sscholz@astaro.com>
-
-o Version 0.2x -- 2006-01-02 -- Added missing strongSwan keywords
-				Full support of the native Linux 2.6 IPsec stack
-				Full support of %defaultroute
-				Improved parsing of keywords using perfect hash
-				function generated by gperf.
-                                by Andreas Steffen <andreas.steffen@hsr.ch>
-
-THANKS
-------
-
-o Nathan Angelacos - include fix
-
diff --git a/src/starter/args.c b/src/starter/args.c
index f5a617eaa..0874cc7e5 100644
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -1,6 +1,7 @@
-/* automatic handling of confread struct arguments
+/*
+ * Copyright (C) 2014 Tobias Brunner
  * Copyright (C) 2006 Andreas Steffen
- * Hochschule fuer Technik Rapperswil, Switzerland
+ * Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -20,7 +21,6 @@
 #include <library.h>
 #include <utils/debug.h>
 
-#include "keywords.h"
 #include "confread.h"
 #include "args.h"
 
@@ -36,7 +36,6 @@ typedef enum {
 	ARG_UBIN,
 	ARG_PCNT,
 	ARG_STR,
-	ARG_LST,
 	ARG_MISC
 } arg_t;
 
@@ -173,6 +172,7 @@ static const token_info_t token_info[] =
 	{ ARG_STR,  offsetof(starter_conn_t, me_mediated_by), NULL                     },
 	{ ARG_STR,  offsetof(starter_conn_t, me_peerid), NULL                          },
 	{ ARG_UINT, offsetof(starter_conn_t, reqid), NULL                              },
+	{ ARG_UINT, offsetof(starter_conn_t, replay_window), NULL                      },
 	{ ARG_MISC, 0, NULL  /* KW_MARK */                                             },
 	{ ARG_MISC, 0, NULL  /* KW_MARK_IN */                                          },
 	{ ARG_MISC, 0, NULL  /* KW_MARK_OUT */                                         },
@@ -218,123 +218,48 @@ static const token_info_t token_info[] =
 	{ ARG_MISC, 0, NULL  /* KW_END_DEPRECATED */                                   },
 };
 
-static void free_list(char **list)
-{
-	char **s;
-
-	for (s = list; *s; s++)
-	{
-		free(*s);
-	}
-	free(list);
-}
-
-char** new_list(char *value)
-{
-	char *val, *b, *e, *end, **ret;
-	int count;
-
-	val = strdupnull(value);
-	if (!val)
-	{
-		return NULL;
-	}
-	end = val + strlen(val);
-	for (b = val, count = 0; b < end;)
-	{
-		for (e = b; ((*e != ' ') && (*e != '\0')); e++);
-		*e = '\0';
-		if (e != b)
-		{
-			count++;
-		}
-		b = e + 1;
-	}
-	if (count == 0)
-	{
-		free(val);
-		return NULL;
-	}
-	ret = (char **)malloc((count+1) * sizeof(char *));
-
-	for (b = val, count = 0; b < end; )
-	{
-		for (e = b; (*e != '\0'); e++);
-		if (e != b)
-		{
-			ret[count++] = strdupnull(b);
-		}
-		b = e + 1;
-	}
-	ret[count] = NULL;
-	free(val);
-	return ret;
-}
-
-
 /*
  * assigns an argument value to a struct field
  */
-bool assign_arg(kw_token_t token, kw_token_t first, kw_list_t *kw, char *base,
-				bool *assigned)
+bool assign_arg(kw_token_t token, kw_token_t first, char *key, char *value,
+				void *base, bool *assigned)
 {
-	char *p = base + token_info[token].offset;
+	char *p = (char*)base + token_info[token].offset;
 	const char **list = token_info[token].list;
-
 	int index = -1;  /* used for enumeration arguments */
 
-	seen_t *seen = (seen_t*)base; /* seen flags are at the top of the struct */
-
 	*assigned = FALSE;
 
-	DBG3(DBG_APP, "  %s=%s", kw->entry->name, kw->value);
-
-	if (*seen & SEEN_KW(token, first))
-	{
-		DBG1(DBG_APP, "# duplicate '%s' option", kw->entry->name);
-		return FALSE;
-	}
-
-	if (token == KW_ESP || token == KW_AH)
-	{
-		if (*seen & (SEEN_KW(KW_ESP, first) | SEEN_KW(KW_AH, first)))
-		{
-			DBG1(DBG_APP, "# can't have both 'ah' and 'esp' options");
-			return FALSE;
-		}
-	}
-
-	/* set flag that this argument has been seen */
-	*seen |= SEEN_KW(token, first);
+	DBG3(DBG_APP, "  %s=%s", key, value);
 
 	/* is there a keyword list? */
-	if (list != NULL && token_info[token].type != ARG_LST)
+	if (list != NULL)
 	{
 		bool match = FALSE;
 
 		while (*list != NULL && !match)
 		{
 			index++;
-			match = streq(kw->value, *list++);
+			match = streq(value, *list++);
 		}
 		if (!match)
 		{
-			DBG1(DBG_APP, "# bad value: %s=%s", kw->entry->name, kw->value);
+			DBG1(DBG_APP, "# bad value: %s=%s", key, value);
 			return FALSE;
 		}
 	}
 
 	switch (token_info[token].type)
 	{
-	case ARG_NONE:
-		DBG1(DBG_APP, "# option '%s' not supported yet", kw->entry->name);
-		return FALSE;
-	case ARG_ENUM:
+		case ARG_NONE:
+			DBG1(DBG_APP, "# option '%s' not supported yet", key);
+			return FALSE;
+		case ARG_ENUM:
 		{
 			if (index < 0)
 			{
 				DBG1(DBG_APP, "# bad enumeration value: %s=%s (%d)",
-					 kw->entry->name, kw->value, index);
+					 key, value, index);
 				return FALSE;
 			}
 
@@ -344,93 +269,86 @@ bool assign_arg(kw_token_t token, kw_token_t first, kw_list_t *kw, char *base,
 				*b = (index > 0);
 			}
 			else
-			{
+			{	/* FIXME: this is not entirely correct as the args are enums */
 				int *i = (int *)p;
 				*i = index;
 			}
+			break;
 		}
-		break;
-
-	case ARG_UINT:
+		case ARG_UINT:
 		{
 			char *endptr;
 			u_int *u = (u_int *)p;
 
-			*u = strtoul(kw->value, &endptr, 10);
+			*u = strtoul(value, &endptr, 10);
 
 			if (*endptr != '\0')
 			{
-				DBG1(DBG_APP, "# bad integer value: %s=%s", kw->entry->name,
-					 kw->value);
+				DBG1(DBG_APP, "# bad integer value: %s=%s", key, value);
 				return FALSE;
 			}
+			break;
 		}
-		break;
-	case ARG_ULNG:
-	case ARG_PCNT:
+		case ARG_ULNG:
+		case ARG_PCNT:
 		{
 			char *endptr;
 			unsigned long *l = (unsigned long *)p;
 
-			*l = strtoul(kw->value, &endptr, 10);
+			*l = strtoul(value, &endptr, 10);
 
 			if (token_info[token].type == ARG_ULNG)
 			{
 				if (*endptr != '\0')
 				{
-					DBG1(DBG_APP, "# bad integer value: %s=%s", kw->entry->name,
-						 kw->value);
+					DBG1(DBG_APP, "# bad integer value: %s=%s", key, value);
 					return FALSE;
 				}
 			}
 			else
 			{
-				if ((*endptr != '%') || (endptr[1] != '\0') || endptr == kw->value)
+				if ((*endptr != '%') || (endptr[1] != '\0') || endptr == value)
 				{
-					DBG1(DBG_APP, "# bad percent value: %s=%s", kw->entry->name,
-						 kw->value);
+					DBG1(DBG_APP, "# bad percent value: %s=%s", key, value);
 					return FALSE;
 				}
 			}
-
+			break;
 		}
-		break;
-	case ARG_ULLI:
+		case ARG_ULLI:
 		{
 			char *endptr;
 			unsigned long long *ll = (unsigned long long *)p;
 
-			*ll = strtoull(kw->value, &endptr, 10);
+			*ll = strtoull(value, &endptr, 10);
 
 			if (*endptr != '\0')
 			{
-				DBG1(DBG_APP, "# bad integer value: %s=%s", kw->entry->name,
-					 kw->value);
+				DBG1(DBG_APP, "# bad integer value: %s=%s", key, value);
 				return FALSE;
 			}
+			break;
 		}
-		break;
-	case ARG_UBIN:
+		case ARG_UBIN:
 		{
 			char *endptr;
 			u_int *u = (u_int *)p;
 
-			*u = strtoul(kw->value, &endptr, 2);
+			*u = strtoul(value, &endptr, 2);
 
 			if (*endptr != '\0')
 			{
-				DBG1(DBG_APP, "# bad binary value: %s=%s", kw->entry->name,
-					 kw->value);
+				DBG1(DBG_APP, "# bad binary value: %s=%s", key, value);
 				return FALSE;
 			}
+			break;
 		}
-		break;
-	case ARG_TIME:
+		case ARG_TIME:
 		{
 			char *endptr;
 			time_t *t = (time_t *)p;
 
-			*t = strtoul(kw->value, &endptr, 10);
+			*t = strtoul(value, &endptr, 10);
 
 			/* time in seconds? */
 			if (*endptr == '\0' || (*endptr == 's' && endptr[1] == '\0'))
@@ -455,60 +373,21 @@ bool assign_arg(kw_token_t token, kw_token_t first, kw_list_t *kw, char *base,
 					break;
 				}
 			}
-			DBG1(DBG_APP, "# bad duration value: %s=%s", kw->entry->name,
-				 kw->value);
+			DBG1(DBG_APP, "# bad duration value: %s=%s", key, value);
 			return FALSE;
 		}
-	case ARG_STR:
+		case ARG_STR:
 		{
 			char **cp = (char **)p;
 
 			/* free any existing string */
 			free(*cp);
-
 			/* assign the new string */
-			*cp = strdupnull(kw->value);
-		}
-		break;
-	case ARG_LST:
-		{
-			char ***listp = (char ***)p;
-
-			/* free any existing list */
-			if (*listp != NULL)
-			{
-				free_list(*listp);
-			}
-			/* create a new list and assign values */
-			*listp = new_list(kw->value);
-
-			/* is there a keyword list? */
-			if (list != NULL)
-			{
-				char ** lst;
-
-				for (lst = *listp; lst && *lst; lst++)
-				{
-					bool match = FALSE;
-
-					list = token_info[token].list;
-
-					while (*list != NULL && !match)
-					{
-						match = streq(*lst, *list++);
-					}
-					if (!match)
-					{
-						DBG1(DBG_APP, "# bad value: %s=%s",
-							 kw->entry->name, *lst);
-						return FALSE;
-					}
-				}
-			}
+			*cp = strdupnull(value);
+			break;
 		}
-		/* fall through */
-	default:
-		return TRUE;
+		default:
+			return TRUE;
 	}
 
 	*assigned = TRUE;
@@ -518,124 +397,69 @@ bool assign_arg(kw_token_t token, kw_token_t first, kw_list_t *kw, char *base,
 /*
  *  frees all dynamically allocated arguments in a struct
  */
-void free_args(kw_token_t first, kw_token_t last, char *base)
+void free_args(kw_token_t first, kw_token_t last, void *base)
 {
 	kw_token_t token;
 
 	for (token = first; token <= last; token++)
 	{
-		char *p = base + token_info[token].offset;
+		char *p = (char*)base + token_info[token].offset;
 
 		switch (token_info[token].type)
 		{
-		case ARG_STR:
+			case ARG_STR:
 			{
 				char **cp = (char **)p;
 
 				free(*cp);
 				*cp = NULL;
+				break;
 			}
-			break;
-		case ARG_LST:
-			{
-				char ***listp = (char ***)p;
-
-				if (*listp != NULL)
-				{
-					free_list(*listp);
-					*listp = NULL;
-				 }
-			}
-			break;
-		default:
-			break;
-		}
-	}
-}
-
-/*
- *  clone all dynamically allocated arguments in a struct
- */
-void clone_args(kw_token_t first, kw_token_t last, char *base1, char *base2)
-{
-	kw_token_t token;
-
-	for (token = first; token <= last; token++)
-	{
-		if (token_info[token].type == ARG_STR)
-		{
-			char **cp1 = (char **)(base1 + token_info[token].offset);
-			char **cp2 = (char **)(base2 + token_info[token].offset);
-
-			*cp1 = strdupnull(*cp2);
-		}
-	}
-}
-
-static bool cmp_list(char **list1, char **list2)
-{
-	if ((list1 == NULL) && (list2 == NULL))
-	{
-		return TRUE;
-	}
-	if ((list1 == NULL) || (list2 == NULL))
-	{
-		return FALSE;
-	}
-
-	for ( ; *list1 && *list2; list1++, list2++)
-	{
-		if (strcmp(*list1,*list2) != 0)
-		{
-			return FALSE;
+			default:
+				break;
 		}
 	}
-
-	if ((*list1 != NULL) || (*list2 != NULL))
-	{
-		return FALSE;
-	}
-
-	return TRUE;
 }
 
 /*
  *  compare all arguments in a struct
  */
-bool cmp_args(kw_token_t first, kw_token_t last, char *base1, char *base2)
+bool cmp_args(kw_token_t first, kw_token_t last, void *base1, void *base2)
 {
 	kw_token_t token;
 
 	for (token = first; token <= last; token++)
 	{
-		char *p1 = base1 + token_info[token].offset;
-		char *p2 = base2 + token_info[token].offset;
+		char *p1 = (char*)base1 + token_info[token].offset;
+		char *p2 = (char*)base2 + token_info[token].offset;
 
 		switch (token_info[token].type)
 		{
-		case ARG_ENUM:
-			if (token_info[token].list == LST_bool)
+			case ARG_ENUM:
 			{
-				bool *b1 = (bool *)p1;
-				bool *b2 = (bool *)p2;
-
-				if (*b1 != *b2)
+				if (token_info[token].list == LST_bool)
 				{
-					return FALSE;
-				}
-			}
-			else
-			{
-				int *i1 = (int *)p1;
-				int *i2 = (int *)p2;
+					bool *b1 = (bool *)p1;
+					bool *b2 = (bool *)p2;
 
-				if (*i1 != *i2)
+					if (*b1 != *b2)
+					{
+						return FALSE;
+					}
+				}
+				else
 				{
-					return FALSE;
+					int *i1 = (int *)p1;
+					int *i2 = (int *)p2;
+
+					if (*i1 != *i2)
+					{
+						return FALSE;
+					}
 				}
+				break;
 			}
-			break;
-		case ARG_UINT:
+			case ARG_UINT:
 			{
 				u_int *u1 = (u_int *)p1;
 				u_int *u2 = (u_int *)p2;
@@ -644,10 +468,10 @@ bool cmp_args(kw_token_t first, kw_token_t last, char *base1, char *base2)
 				{
 					return FALSE;
 				}
+				break;
 			}
-			break;
-		case ARG_ULNG:
-		case ARG_PCNT:
+			case ARG_ULNG:
+			case ARG_PCNT:
 			{
 				unsigned long *l1 = (unsigned long *)p1;
 				unsigned long *l2 = (unsigned long *)p2;
@@ -656,9 +480,9 @@ bool cmp_args(kw_token_t first, kw_token_t last, char *base1, char *base2)
 				{
 					return FALSE;
 				}
+				break;
 			}
-			break;
-		case ARG_ULLI:
+			case ARG_ULLI:
 			{
 				unsigned long long *ll1 = (unsigned long long *)p1;
 				unsigned long long *ll2 = (unsigned long long *)p2;
@@ -667,9 +491,9 @@ bool cmp_args(kw_token_t first, kw_token_t last, char *base1, char *base2)
 				{
 					return FALSE;
 				}
+				break;
 			}
-			break;
-		case ARG_TIME:
+			case ARG_TIME:
 			{
 				time_t *t1 = (time_t *)p1;
 				time_t *t2 = (time_t *)p2;
@@ -678,9 +502,9 @@ bool cmp_args(kw_token_t first, kw_token_t last, char *base1, char *base2)
 				{
 					return FALSE;
 				}
+				break;
 			}
-			break;
-		case ARG_STR:
+			case ARG_STR:
 			{
 				char **cp1 = (char **)p1;
 				char **cp2 = (char **)p2;
@@ -693,21 +517,10 @@ bool cmp_args(kw_token_t first, kw_token_t last, char *base1, char *base2)
 				{
 					return FALSE;
 				}
+				break;
 			}
-			break;
-		case ARG_LST:
-			{
-				char ***listp1 = (char ***)p1;
-				char ***listp2 = (char ***)p2;
-
-				if (!cmp_list(*listp1, *listp2))
-				{
-					return FALSE;
-				}
-			}
-			break;
-		default:
-			break;
+			default:
+				break;
 		}
 	}
 	return TRUE;
diff --git a/src/starter/args.h b/src/starter/args.h
index f5c13e6ba..76c05de8c 100644
--- a/src/starter/args.h
+++ b/src/starter/args.h
@@ -1,6 +1,6 @@
-/* automatic handling of confread struct arguments
+/*
  * Copyright (C) 2006 Andreas Steffen
- * Hochschule fuer Technik Rapperswil, Switzerland
+ * Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,16 +17,11 @@
 #define _ARGS_H_
 
 #include "keywords.h"
-#include "ipsec-parser.h"
 
-extern char **new_list(char *value);
-extern bool assign_arg(kw_token_t token, kw_token_t first, kw_list_t *kw
-	, char *base, bool *assigned);
-extern void free_args(kw_token_t first, kw_token_t last, char *base);
-extern void clone_args(kw_token_t first, kw_token_t last, char *base1
-	, char *base2);
-extern bool cmp_args(kw_token_t first, kw_token_t last, char *base1
-	, char *base2);
+bool assign_arg(kw_token_t token, kw_token_t first, char *key, char *value,
+				void *base, bool *assigned);
+void free_args(kw_token_t first, kw_token_t last, void *base);
+bool cmp_args(kw_token_t first, kw_token_t last, void *base1, void *base2);
 
 #endif /* _ARGS_H_ */
 
diff --git a/src/starter/confread.c b/src/starter/confread.c
index 19178a2c3..17dca66a1 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -1,4 +1,7 @@
-/* strongSwan IPsec config file parser
+/*
+ * Copyright (C) 2014 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
  * Copyright (C) 2001-2002 Mathieu Lafon - Arkoon Network Security
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -28,18 +31,25 @@
 #include "confread.h"
 #include "args.h"
 #include "files.h"
+#include "parser/conf_parser.h"
 
 #define IKE_LIFETIME_DEFAULT         10800 /* 3 hours */
 #define IPSEC_LIFETIME_DEFAULT        3600 /* 1 hour */
 #define SA_REPLACEMENT_MARGIN_DEFAULT  540 /* 9 minutes */
 #define SA_REPLACEMENT_FUZZ_DEFAULT    100 /* 100% of margin */
 #define SA_REPLACEMENT_RETRIES_DEFAULT   3
+#define SA_REPLAY_WINDOW_DEFAULT        -1 /* use charon.replay_window */
 
 static const char ike_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536";
 static const char esp_defaults[] = "aes128-sha1,3des-sha1";
 
 static const char firewall_defaults[] = IPSEC_SCRIPT " _updown iptables";
 
+/**
+ * Provided by GPERF
+ */
+extern kw_entry_t *in_word_set (char *str, unsigned int len);
+
 static bool daemon_exists(char *daemon, char *path)
 {
 	struct stat st;
@@ -54,24 +64,21 @@ static bool daemon_exists(char *daemon, char *path)
 /**
  * Process deprecated keywords
  */
-static bool is_deprecated(kw_token_t token, kw_list_t *kw, char *name)
+static bool is_deprecated(kw_token_t token, char *name, char *conn)
 {
 	switch (token)
 	{
 		case KW_SETUP_DEPRECATED:
 		case KW_PKCS11_DEPRECATED:
-			DBG1(DBG_APP, "# deprecated keyword '%s' in config setup",
-				 kw->entry->name);
+			DBG1(DBG_APP, "# deprecated keyword '%s' in config setup", name);
 			break;
 		case KW_CONN_DEPRECATED:
 		case KW_END_DEPRECATED:
 		case KW_PFS_DEPRECATED:
-			DBG1(DBG_APP, "# deprecated keyword '%s' in conn '%s'",
-				 kw->entry->name, name);
+			DBG1(DBG_APP, "# deprecated keyword '%s' in conn '%s'", name, conn);
 			break;
 		case KW_CA_DEPRECATED:
-			DBG1(DBG_APP, "# deprecated keyword '%s' in ca '%s'",
-				 kw->entry->name, name);
+			DBG1(DBG_APP, "# deprecated keyword '%s' in ca '%s'", name, conn);
 			break;
 		default:
 			return FALSE;
@@ -80,11 +87,11 @@ static bool is_deprecated(kw_token_t token, kw_list_t *kw, char *name)
 	switch (token)
 	{
 		case KW_PKCS11_DEPRECATED:
-			DBG1(DBG_APP, "  use the 'pkcs11' plugin instead", kw->entry->name);
+			DBG1(DBG_APP, "  use the 'pkcs11' plugin instead");
 			break;
 		case KW_PFS_DEPRECATED:
 			DBG1(DBG_APP, "  PFS is enabled by specifying a DH group in the "
-				 "'esp' cipher suite", kw->entry->name);
+				 "'esp' cipher suite");
 			break;
 		default:
 			break;
@@ -92,100 +99,54 @@ static bool is_deprecated(kw_token_t token, kw_list_t *kw, char *name)
 	return TRUE;
 }
 
-static void default_values(starter_config_t *cfg)
-{
-	if (cfg == NULL)
-		return;
-
-	memset(cfg, 0, sizeof(struct starter_config));
-
-	/* is there enough space for all seen flags? */
-	assert(KW_SETUP_LAST - KW_SETUP_FIRST <
-		sizeof(cfg->setup.seen) * BITS_PER_BYTE);
-	assert(KW_CONN_LAST  - KW_CONN_FIRST <
-		sizeof(cfg->conn_default.seen) * BITS_PER_BYTE);
-	assert(KW_END_LAST - KW_END_FIRST <
-		sizeof(cfg->conn_default.right.seen) * BITS_PER_BYTE);
-	assert(KW_CA_LAST - KW_CA_FIRST <
-		sizeof(cfg->ca_default.seen) * BITS_PER_BYTE);
-
-	cfg->setup.seen        = SEEN_NONE;
-	cfg->setup.uniqueids   = TRUE;
-
-#ifdef START_CHARON
-	cfg->setup.charonstart = TRUE;
-#endif
-
-	cfg->conn_default.seen    = SEEN_NONE;
-	cfg->conn_default.startup = STARTUP_NO;
-	cfg->conn_default.state   = STATE_IGNORE;
-	cfg->conn_default.mode    = MODE_TUNNEL;
-	cfg->conn_default.options = SA_OPTION_MOBIKE;
-
-	cfg->conn_default.ike                   = strdupnull(ike_defaults);
-	cfg->conn_default.esp                   = strdupnull(esp_defaults);
-	cfg->conn_default.sa_ike_life_seconds   = IKE_LIFETIME_DEFAULT;
-	cfg->conn_default.sa_ipsec_life_seconds = IPSEC_LIFETIME_DEFAULT;
-	cfg->conn_default.sa_rekey_margin       = SA_REPLACEMENT_MARGIN_DEFAULT;
-	cfg->conn_default.sa_rekey_fuzz         = SA_REPLACEMENT_FUZZ_DEFAULT;
-	cfg->conn_default.sa_keying_tries       = SA_REPLACEMENT_RETRIES_DEFAULT;
-	cfg->conn_default.install_policy        = TRUE;
-	cfg->conn_default.dpd_delay             =  30; /* seconds */
-	cfg->conn_default.dpd_timeout           = 150; /* seconds */
-
-	cfg->conn_default.left.seen  = SEEN_NONE;
-	cfg->conn_default.right.seen = SEEN_NONE;
-
-	cfg->conn_default.left.sendcert  = CERT_SEND_IF_ASKED;
-	cfg->conn_default.right.sendcert = CERT_SEND_IF_ASKED;
-
-	cfg->conn_default.left.ikeport = 500;
-	cfg->conn_default.right.ikeport = 500;
-
-	cfg->conn_default.left.to_port = 0xffff;
-	cfg->conn_default.right.to_port = 0xffff;
-
-	cfg->ca_default.seen = SEEN_NONE;
-}
-
-#define KW_SA_OPTION_FLAG(sy, sn, fl) \
-		if (streq(kw->value, sy)) { conn->options |= fl; } \
-		else if (streq(kw->value, sn)) { conn->options &= ~fl; } \
-		else { DBG1(DBG_APP, "# bad option value: %s=%s", kw->entry->name, kw->value); cfg->err++; }
-
-static void load_setup(starter_config_t *cfg, config_parsed_t *cfgp)
+/*
+ * parse config setup section
+ */
+static void load_setup(starter_config_t *cfg, conf_parser_t *parser)
 {
-	kw_list_t *kw;
+	enumerator_t *enumerator;
+	dictionary_t *dict;
+	kw_entry_t *entry;
+	char *key, *value;
 
 	DBG2(DBG_APP, "Loading config setup");
-
-	for (kw = cfgp->config_setup; kw; kw = kw->next)
+	dict = parser->get_section(parser, CONF_PARSER_CONFIG_SETUP, NULL);
+	if (!dict)
+	{
+		return;
+	}
+	enumerator = dict->create_enumerator(dict);
+	while (enumerator->enumerate(enumerator, &key, &value))
 	{
 		bool assigned = FALSE;
 
-		kw_token_t token = kw->entry->token;
-
-		if ((int)token < KW_SETUP_FIRST || token > KW_SETUP_LAST)
+		entry = in_word_set(key, strlen(key));
+		if (!entry)
 		{
-			DBG1(DBG_APP, "# unsupported keyword '%s' in config setup",
-				 kw->entry->name);
+			DBG1(DBG_APP, "# unknown keyword '%s'", key);
+			cfg->non_fatal_err++;
+			continue;
+		}
+		if ((int)entry->token < KW_SETUP_FIRST || entry->token > KW_SETUP_LAST)
+		{
+			DBG1(DBG_APP, "# unsupported keyword '%s' in config setup", key);
 			cfg->err++;
 			continue;
 		}
-
-		if (is_deprecated(token, kw, ""))
+		if (is_deprecated(entry->token, key, ""))
 		{
 			cfg->non_fatal_err++;
 			continue;
 		}
-
-		if (!assign_arg(token, KW_SETUP_FIRST, kw, (char *)cfg, &assigned))
+		if (!assign_arg(entry->token, KW_SETUP_FIRST, key, value, cfg,
+						&assigned))
 		{
 			DBG1(DBG_APP, "  bad argument value in config setup");
 			cfg->err++;
-			continue;
 		}
 	}
+	enumerator->destroy(enumerator);
+	dict->destroy(dict);
 
 	/* verify the executables are actually available */
 #ifdef START_CHARON
@@ -196,292 +157,321 @@ static void load_setup(starter_config_t *cfg, config_parsed_t *cfgp)
 #endif
 }
 
+/*
+ * parse a ca section
+ */
+static void load_ca(starter_ca_t *ca, starter_config_t *cfg,
+					conf_parser_t *parser)
+{
+	enumerator_t *enumerator;
+	dictionary_t *dict;
+	kw_entry_t *entry;
+	kw_token_t token;
+	char *key, *value;
+
+	DBG2(DBG_APP, "Loading ca '%s'", ca->name);
+	dict = parser->get_section(parser, CONF_PARSER_CA, ca->name);
+	if (!dict)
+	{
+		return;
+	}
+	enumerator = dict->create_enumerator(dict);
+	while (enumerator->enumerate(enumerator, &key, &value))
+	{
+		bool assigned = FALSE;
+
+		entry = in_word_set(key, strlen(key));
+		if (!entry)
+		{
+			DBG1(DBG_APP, "# unknown keyword '%s'", key);
+			cfg->non_fatal_err++;
+			continue;
+		}
+		token = entry->token;
+		if (token == KW_AUTO)
+		{
+			token = KW_CA_SETUP;
+		}
+		if (token < KW_CA_FIRST || token > KW_CA_LAST)
+		{
+			DBG1(DBG_APP, "# unsupported keyword '%s' in ca '%s'",
+				 key, ca->name);
+			cfg->err++;
+			continue;
+		}
+		if (is_deprecated(token, key, ca->name))
+		{
+			cfg->non_fatal_err++;
+			continue;
+		}
+		if (!assign_arg(token, KW_CA_FIRST, key, value, ca, &assigned))
+		{
+			DBG1(DBG_APP, "  bad argument value in ca '%s'", ca->name);
+			cfg->err++;
+		}
+	}
+	enumerator->destroy(enumerator);
+	dict->destroy(dict);
+
+	/* treat 'route' and 'start' as 'add' */
+	if (ca->startup != STARTUP_NO)
+	{
+		ca->startup = STARTUP_ADD;
+	}
+}
+
+/*
+ * set some default values
+ */
+static void conn_defaults(starter_conn_t *conn)
+{
+	conn->startup = STARTUP_NO;
+	conn->state   = STATE_IGNORE;
+	conn->mode    = MODE_TUNNEL;
+	conn->options = SA_OPTION_MOBIKE;
+
+	conn->ike                   = strdupnull(ike_defaults);
+	/* esp defaults are set after parsing the conn section */
+	conn->sa_ike_life_seconds   = IKE_LIFETIME_DEFAULT;
+	conn->sa_ipsec_life_seconds = IPSEC_LIFETIME_DEFAULT;
+	conn->sa_rekey_margin       = SA_REPLACEMENT_MARGIN_DEFAULT;
+	conn->sa_rekey_fuzz         = SA_REPLACEMENT_FUZZ_DEFAULT;
+	conn->sa_keying_tries       = SA_REPLACEMENT_RETRIES_DEFAULT;
+	conn->install_policy        = TRUE;
+	conn->dpd_delay             =  30; /* seconds */
+	conn->dpd_timeout           = 150; /* seconds */
+	conn->replay_window         = SA_REPLAY_WINDOW_DEFAULT;
+
+	conn->left.sendcert = CERT_SEND_IF_ASKED;
+	conn->right.sendcert = CERT_SEND_IF_ASKED;
+
+	conn->left.ikeport = 500;
+	conn->right.ikeport = 500;
+
+	conn->left.to_port = 0xffff;
+	conn->right.to_port = 0xffff;
+}
+
+/*
+ * parse left|right specific options
+ */
 static void kw_end(starter_conn_t *conn, starter_end_t *end, kw_token_t token,
-				   kw_list_t *kw, char *conn_name, starter_config_t *cfg)
+				   char *key, char *value, starter_config_t *cfg)
 {
 	bool assigned = FALSE;
 
-	char *name  = kw->entry->name;
-	char *value = kw->value;
-
-	if (is_deprecated(token, kw, conn_name))
+	if (is_deprecated(token, key, conn->name))
 	{
 		cfg->non_fatal_err++;
 		return;
 	}
 
-	if (!assign_arg(token, KW_END_FIRST, kw, (char *)end, &assigned))
+	if (!assign_arg(token, KW_END_FIRST, key, value, end, &assigned))
+	{
 		goto err;
+	}
 
 	/* post processing of some keywords that were assigned automatically */
 	switch (token)
 	{
-	case KW_HOST:
-		if (value && strlen(value) > 0 && value[0] == '%')
-		{
-			if (streq(value, "%defaultroute"))
+		case KW_HOST:
+			if (value && strlen(value) > 0 && value[0] == '%')
 			{
-				value = "%any";
+				if (streq(value, "%defaultroute"))
+				{
+					value = "%any";
+				}
+				if (!streq(value, "%any") && !streq(value, "%any4") &&
+					!streq(value, "%any6"))
+				{	/* allow_any prefix */
+					end->allow_any = TRUE;
+					value++;
+				}
 			}
-			if (!streq(value, "%any") && !streq(value, "%any4") &&
-				!streq(value, "%any6"))
-			{	/* allow_any prefix */
-				end->allow_any = TRUE;
-				value++;
+			free(end->host);
+			end->host = strdupnull(value);
+			break;
+		case KW_SOURCEIP:
+			conn->mode = MODE_TUNNEL;
+			conn->proxy_mode = FALSE;
+			break;
+		case KW_SENDCERT:
+			if (end->sendcert == CERT_YES_SEND)
+			{
+				end->sendcert = CERT_ALWAYS_SEND;
 			}
-		}
-		free(end->host);
-		end->host = strdupnull(value);
-		break;
-	case KW_SOURCEIP:
-		conn->mode = MODE_TUNNEL;
-		conn->proxy_mode = FALSE;
-		break;
-	case KW_SENDCERT:
-		if (end->sendcert == CERT_YES_SEND)
-		{
-			end->sendcert = CERT_ALWAYS_SEND;
-		}
-		else if (end->sendcert == CERT_NO_SEND)
-		{
-			end->sendcert = CERT_NEVER_SEND;
-		}
-		break;
-	default:
-		break;
+			else if (end->sendcert == CERT_NO_SEND)
+			{
+				end->sendcert = CERT_NEVER_SEND;
+			}
+			break;
+		default:
+			break;
 	}
 
 	if (assigned)
+	{
 		return;
+	}
 
 	/* individual processing of keywords that were not assigned automatically */
 	switch (token)
 	{
-	case KW_PROTOPORT:
-	{
-		struct protoent *proto;
-		struct servent *svc;
-		char *sep, *port = "", *endptr;
-		long int p;
-
-		sep = strchr(value, '/');
-		if (sep)
-		{	/* protocol/port */
-			*sep = '\0';
-			port = sep + 1;
-		}
+		case KW_PROTOPORT:
+		{
+			struct protoent *proto;
+			struct servent *svc;
+			char *sep, *port = "", *endptr;
+			long int p;
+
+			sep = strchr(value, '/');
+			if (sep)
+			{	/* protocol/port */
+				*sep = '\0';
+				port = sep + 1;
+			}
 
-		if (streq(value, "%any"))
-		{
-			end->protocol = 0;
-		}
-		else
-		{
-			proto = getprotobyname(value);
-			if (proto)
+			if (streq(value, "%any"))
 			{
-				end->protocol = proto->p_proto;
+				end->protocol = 0;
 			}
 			else
 			{
-				p = strtol(value, &endptr, 0);
-				if ((*value && *endptr) || p < 0 || p > 0xff)
+				proto = getprotobyname(value);
+				if (proto)
+				{
+					end->protocol = proto->p_proto;
+				}
+				else
 				{
-					DBG1(DBG_APP, "# bad protocol: %s=%s", name, value);
-					goto err;
+					p = strtol(value, &endptr, 0);
+					if ((*value && *endptr) || p < 0 || p > 0xff)
+					{
+						DBG1(DBG_APP, "# bad protocol: %s=%s", key, value);
+						goto err;
+					}
+					end->protocol = (u_int8_t)p;
 				}
-				end->protocol = (u_int8_t)p;
 			}
-		}
-		if (streq(port, "%any"))
-		{
-			end->from_port = 0;
-			end->to_port = 0xffff;
-		}
-		else if (streq(port, "%opaque"))
-		{
-			end->from_port = 0xffff;
-			end->to_port = 0;
-		}
-		else if (*port)
-		{
-			svc = getservbyname(port, NULL);
-			if (svc)
+			if (streq(port, "%any"))
 			{
-				end->from_port = end->to_port = ntohs(svc->s_port);
+				end->from_port = 0;
+				end->to_port = 0xffff;
 			}
-			else
+			else if (streq(port, "%opaque"))
+			{
+				end->from_port = 0xffff;
+				end->to_port = 0;
+			}
+			else if (*port)
 			{
-				p = strtol(port, &endptr, 0);
-				if (p < 0 || p > 0xffff)
+				svc = getservbyname(port, NULL);
+				if (svc)
 				{
-					DBG1(DBG_APP, "# bad port: %s=%s", name, port);
-					goto err;
+					end->from_port = end->to_port = ntohs(svc->s_port);
 				}
-				end->from_port = p;
-				if (*endptr == '-')
+				else
 				{
-					port = endptr + 1;
 					p = strtol(port, &endptr, 0);
 					if (p < 0 || p > 0xffff)
 					{
-						DBG1(DBG_APP, "# bad port: %s=%s", name, port);
+						DBG1(DBG_APP, "# bad port: %s=%s", key, port);
+						goto err;
+					}
+					end->from_port = p;
+					if (*endptr == '-')
+					{
+						port = endptr + 1;
+						p = strtol(port, &endptr, 0);
+						if (p < 0 || p > 0xffff)
+						{
+							DBG1(DBG_APP, "# bad port: %s=%s", key, port);
+							goto err;
+						}
+					}
+					end->to_port = p;
+					if (*endptr)
+					{
+						DBG1(DBG_APP, "# bad port: %s=%s", key, port);
 						goto err;
 					}
-				}
-				end->to_port = p;
-				if (*endptr)
-				{
-					DBG1(DBG_APP, "# bad port: %s=%s", name, port);
-					goto err;
 				}
 			}
+			if (sep)
+			{	/* restore the original text in case also= is used */
+				*sep = '/';
+			}
+			break;
 		}
-		if (sep)
-		{	/* restore the original text in case also= is used */
-			*sep = '/';
-		}
-		break;
-	}
-	default:
-		break;
+		default:
+			break;
 	}
 	return;
 
 err:
-	DBG1(DBG_APP, "  bad argument value in conn '%s'", conn_name);
+	DBG1(DBG_APP, "  bad argument value in conn '%s'", conn->name);
 	cfg->err++;
 }
 
 /*
- * handles left|rightfirewall and left|rightupdown parameters
+ * macro to handle simple flags
  */
-static void handle_firewall(const char *label, starter_end_t *end,
-							starter_config_t *cfg)
-{
-	if (end->firewall && (end->seen & SEEN_KW(KW_FIREWALL, KW_END_FIRST)))
-	{
-		if (end->updown != NULL)
-		{
-			DBG1(DBG_APP, "# cannot have both %sfirewall and %supdown", label,
-				 label);
-			cfg->err++;
-		}
-		else
-		{
-			end->updown = strdupnull(firewall_defaults);
-			end->firewall = FALSE;
-		}
-	}
-}
+#define KW_SA_OPTION_FLAG(sy, sn, fl) \
+		if (streq(value, sy)) { conn->options |= fl; } \
+		else if (streq(value, sn)) { conn->options &= ~fl; } \
+		else { DBG1(DBG_APP, "# bad option value: %s=%s", key, value); cfg->err++; }
 
 /*
- * parse a conn section
+ * parse settings not handled by the simple argument parser
  */
-static void load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg)
+static void handle_keyword(kw_token_t token, starter_conn_t *conn, char *key,
+						   char *value, starter_config_t *cfg)
 {
-	char *conn_name = (conn->name == NULL)? "%default":conn->name;
-
-	for ( ; kw; kw = kw->next)
+	if ((token == KW_ESP && conn->ah) || (token == KW_AH && conn->esp))
+	{
+		DBG1(DBG_APP, "# can't have both 'ah' and 'esp' options");
+		cfg->err++;
+		return;
+	}
+	switch (token)
 	{
-		bool assigned = FALSE;
-
-		kw_token_t token = kw->entry->token;
-
-		if (token >= KW_LEFT_FIRST && token <= KW_LEFT_LAST)
-		{
-			kw_end(conn, &conn->left, token - KW_LEFT_FIRST + KW_END_FIRST
-				,  kw, conn_name, cfg);
-			continue;
-		}
-		else if (token >= KW_RIGHT_FIRST && token <= KW_RIGHT_LAST)
-		{
-			kw_end(conn, &conn->right, token - KW_RIGHT_FIRST + KW_END_FIRST
-				 , kw, conn_name, cfg);
-			continue;
-		}
-
-		if (token == KW_AUTO)
-		{
-			token = KW_CONN_SETUP;
-		}
-		else if (token == KW_ALSO)
-		{
-			if (cfg->parse_also)
-			{
-				also_t *also = malloc_thing(also_t);
-
-				also->name = strdupnull(kw->value);
-				also->next = conn->also;
-				conn->also = also;
-
-				DBG2(DBG_APP, "  also=%s", kw->value);
-			}
-			continue;
-		}
-
-		if (token < KW_CONN_FIRST || token > KW_CONN_LAST)
-		{
-			DBG1(DBG_APP, "# unsupported keyword '%s' in conn '%s'",
-				 kw->entry->name, conn_name);
-			cfg->err++;
-			continue;
-		}
-
-		if (is_deprecated(token, kw, conn_name))
-		{
-			cfg->non_fatal_err++;
-			continue;
-		}
-
-		if (!assign_arg(token, KW_CONN_FIRST, kw, (char *)conn, &assigned))
-		{
-			DBG1(DBG_APP, "  bad argument value in conn '%s'", conn_name);
-			cfg->err++;
-			continue;
-		}
-
-		if (assigned)
-			continue;
-
-		switch (token)
-		{
 		case KW_TYPE:
+		{
 			conn->mode = MODE_TRANSPORT;
 			conn->proxy_mode = FALSE;
-			if (streq(kw->value, "tunnel"))
+			if (streq(value, "tunnel"))
 			{
 				conn->mode = MODE_TUNNEL;
 			}
-			else if (streq(kw->value, "beet"))
+			else if (streq(value, "beet"))
 			{
 				conn->mode = MODE_BEET;
 			}
-			else if (streq(kw->value, "transport_proxy"))
+			else if (streq(value, "transport_proxy"))
 			{
 				conn->mode = MODE_TRANSPORT;
 				conn->proxy_mode = TRUE;
 			}
-			else if (streq(kw->value, "passthrough") || streq(kw->value, "pass"))
+			else if (streq(value, "passthrough") || streq(value, "pass"))
 			{
 				conn->mode = MODE_PASS;
 			}
-			else if (streq(kw->value, "drop") || streq(kw->value, "reject"))
+			else if (streq(value, "drop") || streq(value, "reject"))
 			{
 				conn->mode = MODE_DROP;
 			}
-			else if (!streq(kw->value, "transport"))
+			else if (!streq(value, "transport"))
 			{
-				DBG1(DBG_APP, "# bad policy value: %s=%s", kw->entry->name,
-					 kw->value);
+				DBG1(DBG_APP, "# bad policy value: %s=%s", key, value);
 				cfg->err++;
 			}
 			break;
+		}
 		case KW_COMPRESS:
 			KW_SA_OPTION_FLAG("yes", "no", SA_OPTION_COMPRESS)
 			break;
 		case KW_MARK:
-			if (!mark_from_string(kw->value, &conn->mark_in))
+			if (!mark_from_string(value, &conn->mark_in))
 			{
 				cfg->err++;
 				break;
@@ -489,19 +479,19 @@ static void load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg
 			conn->mark_out = conn->mark_in;
 			break;
 		case KW_MARK_IN:
-			if (!mark_from_string(kw->value, &conn->mark_in))
+			if (!mark_from_string(value, &conn->mark_in))
 			{
 				cfg->err++;
 			}
 			break;
 		case KW_MARK_OUT:
-			if (!mark_from_string(kw->value, &conn->mark_out))
+			if (!mark_from_string(value, &conn->mark_out))
 			{
 				cfg->err++;
 			}
 			break;
 		case KW_TFC:
-			if (streq(kw->value, "%mtu"))
+			if (streq(value, "%mtu"))
 			{
 				conn->tfc = -1;
 			}
@@ -509,17 +499,16 @@ static void load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg
 			{
 				char *endptr;
 
-				conn->tfc = strtoul(kw->value, &endptr, 10);
+				conn->tfc = strtoul(value, &endptr, 10);
 				if (*endptr != '\0')
 				{
-					DBG1(DBG_APP, "# bad integer value: %s=%s", kw->entry->name,
-						 kw->value);
+					DBG1(DBG_APP, "# bad integer value: %s=%s", key, value);
 					cfg->err++;
 				}
 			}
 			break;
 		case KW_KEYINGTRIES:
-			if (streq(kw->value, "%forever"))
+			if (streq(value, "%forever"))
 			{
 				conn->sa_keying_tries = 0;
 			}
@@ -527,11 +516,10 @@ static void load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg
 			{
 				char *endptr;
 
-				conn->sa_keying_tries = strtoul(kw->value, &endptr, 10);
+				conn->sa_keying_tries = strtoul(value, &endptr, 10);
 				if (*endptr != '\0')
 				{
-					DBG1(DBG_APP, "# bad integer value: %s=%s", kw->entry->name,
-						 kw->value);
+					DBG1(DBG_APP, "# bad integer value: %s=%s", key, value);
 					cfg->err++;
 				}
 			}
@@ -556,219 +544,120 @@ static void load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg
 			break;
 		default:
 			break;
-		}
 	}
-
-	handle_firewall("left", &conn->left, cfg);
-	handle_firewall("right", &conn->right, cfg);
 }
 
 /*
- * initialize a conn object with the default conn
+ * handles left|rightfirewall and left|rightupdown parameters
  */
-static void conn_default(char *name, starter_conn_t *conn, starter_conn_t *def)
+static void handle_firewall(const char *label, starter_end_t *end,
+							starter_config_t *cfg)
 {
-	memcpy(conn, def, sizeof(starter_conn_t));
-	conn->name = strdupnull(name);
-
-	clone_args(KW_CONN_FIRST, KW_CONN_LAST, (char *)conn, (char *)def);
-	clone_args(KW_END_FIRST, KW_END_LAST, (char *)&conn->left, (char *)&def->left);
-	clone_args(KW_END_FIRST, KW_END_LAST, (char *)&conn->right, (char *)&def->right);
+	if (end->firewall)
+	{
+		if (end->updown != NULL)
+		{
+			DBG1(DBG_APP, "# cannot have both %sfirewall and %supdown", label,
+				 label);
+			cfg->err++;
+		}
+		else
+		{
+			end->updown = strdupnull(firewall_defaults);
+			end->firewall = FALSE;
+		}
+	}
 }
 
 /*
- * parse a ca section
+ * parse a conn section
  */
-static void load_ca(starter_ca_t *ca, kw_list_t *kw, starter_config_t *cfg)
+static void load_conn(starter_conn_t *conn, starter_config_t *cfg,
+					  conf_parser_t *parser)
 {
-	char *ca_name = (ca->name == NULL)? "%default":ca->name;
-
-	for ( ; kw; kw = kw->next)
+	enumerator_t *enumerator;
+	dictionary_t *dict;
+	kw_entry_t *entry;
+	kw_token_t token;
+	char *key, *value;
+
+	DBG2(DBG_APP, "Loading conn '%s'", conn->name);
+	dict = parser->get_section(parser, CONF_PARSER_CONN, conn->name);
+	if (!dict)
+	{
+		return;
+	}
+	enumerator = dict->create_enumerator(dict);
+	while (enumerator->enumerate(enumerator, &key, &value))
 	{
 		bool assigned = FALSE;
 
-		kw_token_t token = kw->entry->token;
-
-		if (token == KW_AUTO)
-		{
-			token = KW_CA_SETUP;
-		}
-		else if (token == KW_ALSO)
+		entry = in_word_set(key, strlen(key));
+		if (!entry)
 		{
-			if (cfg->parse_also)
-			{
-				also_t *also = malloc_thing(also_t);
-
-				also->name = strdupnull(kw->value);
-				also->next = ca->also;
-				ca->also = also;
-
-				DBG2(DBG_APP, "  also=%s", kw->value);
-			}
+			DBG1(DBG_APP, "# unknown keyword '%s'", key);
+			cfg->non_fatal_err++;
 			continue;
 		}
-
-		if (token < KW_CA_FIRST || token > KW_CA_LAST)
+		token = entry->token;
+		if (token >= KW_LEFT_FIRST && token <= KW_LEFT_LAST)
 		{
-			DBG1(DBG_APP, "# unsupported keyword '%s' in ca '%s'",
-				 kw->entry->name, ca_name);
-			cfg->err++;
+			kw_end(conn, &conn->left, token - KW_LEFT_FIRST + KW_END_FIRST,
+				   key, value, cfg);
 			continue;
 		}
-
-		if (is_deprecated(token, kw, ca_name))
+		else if (token >= KW_RIGHT_FIRST && token <= KW_RIGHT_LAST)
 		{
-			cfg->non_fatal_err++;
+			kw_end(conn, &conn->right, token - KW_RIGHT_FIRST + KW_END_FIRST,
+				   key, value, cfg);
 			continue;
 		}
-
-		if (!assign_arg(token, KW_CA_FIRST, kw, (char *)ca, &assigned))
-		{
-			DBG1(DBG_APP, "  bad argument value in ca '%s'", ca_name);
-			cfg->err++;
-		}
-	}
-
-	/* treat 'route' and 'start' as 'add' */
-	if (ca->startup != STARTUP_NO)
-		ca->startup = STARTUP_ADD;
-}
-
-/*
- * initialize a ca object with the default ca
- */
-static void ca_default(char *name, starter_ca_t *ca, starter_ca_t *def)
-{
-	memcpy(ca, def, sizeof(starter_ca_t));
-	ca->name = strdupnull(name);
-
-	clone_args(KW_CA_FIRST, KW_CA_LAST, (char *)ca, (char *)def);
-}
-
-static kw_list_t* find_also_conn(const char* name, starter_conn_t *conn,
-								 starter_config_t *cfg);
-
-static void load_also_conns(starter_conn_t *conn, also_t *also,
-							starter_config_t *cfg)
-{
-	while (also != NULL)
-	{
-		kw_list_t *kw = find_also_conn(also->name, conn, cfg);
-
-		if (kw == NULL)
+		if (token == KW_AUTO)
 		{
-			DBG1(DBG_APP, "  conn '%s' cannot include '%s'", conn->name,
-				 also->name);
+			token = KW_CONN_SETUP;
 		}
-		else
+		if (token < KW_CONN_FIRST || token > KW_CONN_LAST)
 		{
-			DBG2(DBG_APP, "conn '%s' includes '%s'", conn->name, also->name);
-			/* only load if no error occurred in the first round */
-			if (cfg->err == 0)
-				load_conn(conn, kw, cfg);
+			DBG1(DBG_APP, "# unsupported keyword '%s' in conn '%s'",
+				 key, conn->name);
+			cfg->err++;
+			continue;
 		}
-		also = also->next;
-	}
-}
-
-/*
- * find a conn included by also
- */
-static kw_list_t* find_also_conn(const char* name, starter_conn_t *conn,
-								 starter_config_t *cfg)
-{
-	starter_conn_t *c = cfg->conn_first;
-
-	while (c != NULL)
-	{
-		if (streq(name, c->name))
+		if (is_deprecated(token, key, conn->name))
 		{
-			if (conn->visit == c->visit)
-			{
-				DBG1(DBG_APP, "# detected also loop");
-				cfg->err++;
-				return NULL;
-			}
-			c->visit = conn->visit;
-			load_also_conns(conn, c->also, cfg);
-			return c->kw;
+			cfg->non_fatal_err++;
+			continue;
 		}
-		c = c->next;
-	}
-
-	DBG1(DBG_APP, "# also '%s' not found", name);
-	cfg->err++;
-	return NULL;
-}
-
-static kw_list_t* find_also_ca(const char* name, starter_ca_t *ca,
-							   starter_config_t *cfg);
-
-static void load_also_cas(starter_ca_t *ca, also_t *also, starter_config_t *cfg)
-{
-	while (also != NULL)
-	{
-		kw_list_t *kw = find_also_ca(also->name, ca, cfg);
-
-		if (kw == NULL)
+		if (!assign_arg(token, KW_CONN_FIRST, key, value, conn,
+						&assigned))
 		{
-			DBG1(DBG_APP, "  ca '%s' cannot include '%s'", ca->name,
-				 also->name);
+			DBG1(DBG_APP, "  bad argument value in conn '%s'", conn->name);
+			cfg->err++;
+			continue;
 		}
-		else
+		if (!assigned)
 		{
-			DBG2(DBG_APP, "ca '%s' includes '%s'", ca->name, also->name);
-			/* only load if no error occurred in the first round */
-			if (cfg->err == 0)
-			load_ca(ca, kw, cfg);
+			handle_keyword(token, conn, key, value, cfg);
 		}
-		also = also->next;
 	}
-}
+	enumerator->destroy(enumerator);
+	dict->destroy(dict);
 
-/*
- * find a ca included by also
- */
-static kw_list_t* find_also_ca(const char* name, starter_ca_t *ca,
-							   starter_config_t *cfg)
-{
-	starter_ca_t *c = cfg->ca_first;
+	handle_firewall("left", &conn->left, cfg);
+	handle_firewall("right", &conn->right, cfg);
 
-	while (c != NULL)
+	if (!conn->esp && !conn->ah)
 	{
-		if (streq(name, c->name))
-		{
-			if (ca->visit == c->visit)
-			{
-				DBG1(DBG_APP, "# detected also loop");
-				cfg->err++;
-				return NULL;
-			}
-			c->visit = ca->visit;
-			load_also_cas(ca, c->also, cfg);
-			return c->kw;
-		}
-		c = c->next;
+		conn->esp = strdupnull(esp_defaults);
 	}
-
-	DBG1(DBG_APP, "# also '%s' not found", name);
-	cfg->err++;
-	return NULL;
 }
 
 /*
- * free the memory used by also_t objects
+ * free the memory used by a starter_ca_t object
  */
-static void free_also(also_t *head)
+static void confread_free_ca(starter_ca_t *ca)
 {
-	while (head != NULL)
-	{
-		also_t *also = head;
-
-		head = also->next;
-		free(also->name);
-		free(also);
-	}
+	free_args(KW_CA_NAME, KW_CA_LAST, (char *)ca);
 }
 
 /*
@@ -779,17 +668,6 @@ static void confread_free_conn(starter_conn_t *conn)
 	free_args(KW_END_FIRST, KW_END_LAST,  (char *)&conn->left);
 	free_args(KW_END_FIRST, KW_END_LAST,  (char *)&conn->right);
 	free_args(KW_CONN_NAME, KW_CONN_LAST, (char *)conn);
-	free_also(conn->also);
-}
-
-/*
- * free the memory used by a starter_ca_t object
- */
-static void
-confread_free_ca(starter_ca_t *ca)
-{
-	free_args(KW_CA_NAME, KW_CA_LAST, (char *)ca);
-	free_also(ca->also);
 }
 
 /*
@@ -802,8 +680,6 @@ void confread_free(starter_config_t *cfg)
 
 	free_args(KW_SETUP_FIRST, KW_SETUP_LAST, (char *)cfg);
 
-	confread_free_conn(&cfg->conn_default);
-
 	while (conn != NULL)
 	{
 		starter_conn_t *conn_aux = conn;
@@ -813,8 +689,6 @@ void confread_free(starter_config_t *cfg)
 		free(conn_aux);
 	}
 
-	confread_free_ca(&cfg->ca_default);
-
 	while (ca != NULL)
 	{
 		starter_ca_t *ca_aux = ca;
@@ -832,170 +706,108 @@ void confread_free(starter_config_t *cfg)
  */
 starter_config_t* confread_load(const char *file)
 {
+	conf_parser_t *parser;
 	starter_config_t *cfg = NULL;
-	config_parsed_t  *cfgp;
-	section_list_t   *sconn, *sca;
-	starter_conn_t   *conn;
-	starter_ca_t     *ca;
-
+	enumerator_t *enumerator;
 	u_int total_err;
-	u_int visit	= 0;
+	char *name;
 
-	/* load IPSec configuration file  */
-	cfgp = parser_load_conf(file);
-	if (!cfgp)
+	parser = conf_parser_create(file);
+	if (!parser->parse(parser))
 	{
+		parser->destroy(parser);
 		return NULL;
 	}
-	cfg = malloc_thing(starter_config_t);
-
-	/* set default values */
-	default_values(cfg);
-
-	/* load config setup section */
-	load_setup(cfg, cfgp);
 
-	/* in the first round parse also statements */
-	cfg->parse_also = TRUE;
+	INIT(cfg,
+		.setup = {
+			.uniqueids = TRUE,
 
-	/* find %default ca section */
-	for (sca = cfgp->ca_first; sca; sca = sca->next)
-	{
-		if (streq(sca->name, "%default"))
-		{
-			DBG2(DBG_APP, "Loading ca %%default");
-			load_ca(&cfg->ca_default, sca->kw, cfg);
 		}
-	}
+	);
+#ifdef START_CHARON
+	cfg->setup.charonstart = TRUE;
+#endif
 
-	/* parameters defined in ca %default sections can be overloads */
-	cfg->ca_default.seen = SEEN_NONE;
+	/* load config setup section */
+	load_setup(cfg, parser);
 
-	/* load other ca sections */
-	for (sca = cfgp->ca_first; sca; sca = sca->next)
+	/* load ca sections */
+	enumerator = parser->get_sections(parser, CONF_PARSER_CA);
+	while (enumerator->enumerate(enumerator, &name))
 	{
-		u_int previous_err;
+		u_int previous_err = cfg->err;
+		starter_ca_t *ca;
 
-		/* skip %default ca section */
-		if (streq(sca->name, "%default"))
-			continue;
-
-		DBG2(DBG_APP, "Loading ca '%s'", sca->name);
-		ca = malloc_thing(starter_ca_t);
-
-		ca_default(sca->name, ca, &cfg->ca_default);
-		ca->kw =  sca->kw;
-		ca->next = NULL;
+		INIT(ca,
+			.name = strdup(name),
+		);
+		load_ca(ca, cfg, parser);
 
-		previous_err = cfg->err;
-		load_ca(ca, ca->kw, cfg);
 		if (cfg->err > previous_err)
 		{
-			/* errors occurred - free the ca */
 			confread_free_ca(ca);
 			cfg->non_fatal_err += cfg->err - previous_err;
 			cfg->err = previous_err;
 		}
 		else
 		{
-			/* success - insert the ca into the chained list */
 			if (cfg->ca_last)
+			{
 				cfg->ca_last->next = ca;
+			}
 			cfg->ca_last = ca;
 			if (!cfg->ca_first)
+			{
 				cfg->ca_first = ca;
+			}
+			if (ca->startup != STARTUP_NO)
+			{
+				ca->state = STATE_TO_ADD;
+			}
 		}
 	}
+	enumerator->destroy(enumerator);
 
-	for (ca = cfg->ca_first; ca; ca = ca->next)
-	{
-		also_t *also = ca->also;
-
-		while (also != NULL)
-		{
-			kw_list_t *kw = find_also_ca(also->name, cfg->ca_first, cfg);
-
-			load_ca(ca, kw, cfg);
-			also = also->next;
-		}
-
-		if (ca->startup != STARTUP_NO)
-			ca->state = STATE_TO_ADD;
-	}
-
-	/* find %default conn sections */
-	for (sconn = cfgp->conn_first; sconn; sconn = sconn->next)
-	{
-		if (streq(sconn->name, "%default"))
-		{
-			DBG2(DBG_APP, "Loading conn %%default");
-			load_conn(&cfg->conn_default, sconn->kw, cfg);
-		}
-	}
-
-	/* parameters defined in conn %default sections can be overloaded */
-	cfg->conn_default.seen       = SEEN_NONE;
-	cfg->conn_default.right.seen = SEEN_NONE;
-	cfg->conn_default.left.seen  = SEEN_NONE;
-
-	/* load other conn sections */
-	for (sconn = cfgp->conn_first; sconn; sconn = sconn->next)
+	/* load conn sections */
+	enumerator = parser->get_sections(parser, CONF_PARSER_CONN);
+	while (enumerator->enumerate(enumerator, &name))
 	{
-		u_int previous_err;
-
-		/* skip %default conn section */
-		if (streq(sconn->name, "%default"))
-			continue;
-
-		DBG2(DBG_APP, "Loading conn '%s'", sconn->name);
-		conn = malloc_thing(starter_conn_t);
+		u_int previous_err = cfg->err;
+		starter_conn_t *conn;
 
-		conn_default(sconn->name, conn, &cfg->conn_default);
-		conn->kw =  sconn->kw;
-		conn->next = NULL;
+		INIT(conn,
+			.name = strdup(name),
+		);
+		conn_defaults(conn);
+		load_conn(conn, cfg, parser);
 
-		previous_err = cfg->err;
-		load_conn(conn, conn->kw, cfg);
 		if (cfg->err > previous_err)
 		{
-			/* error occurred - free the conn */
 			confread_free_conn(conn);
 			cfg->non_fatal_err += cfg->err - previous_err;
 			cfg->err = previous_err;
 		}
 		else
 		{
-			/* success - insert the conn into the chained list */
 			if (cfg->conn_last)
+			{
 				cfg->conn_last->next = conn;
+			}
 			cfg->conn_last = conn;
 			if (!cfg->conn_first)
+			{
 				cfg->conn_first = conn;
+			}
+			if (conn->startup != STARTUP_NO)
+			{
+				conn->state = STATE_TO_ADD;
+			}
 		}
 	}
+	enumerator->destroy(enumerator);
 
-	/* in the second round do not parse also statements */
-	cfg->parse_also = FALSE;
-
-	for (ca = cfg->ca_first; ca; ca = ca->next)
-	{
-		ca->visit = ++visit;
-		load_also_cas(ca, ca->also, cfg);
-
-		if (ca->startup != STARTUP_NO)
-			ca->state = STATE_TO_ADD;
-	}
-
-	for (conn = cfg->conn_first; conn; conn = conn->next)
-	{
-		conn->visit = ++visit;
-		load_also_conns(conn, conn->also, cfg);
-
-		if (conn->startup != STARTUP_NO)
-			conn->state = STATE_TO_ADD;
-	}
-
-	parser_free_conf(cfgp);
+	parser->destroy(parser);
 
 	total_err = cfg->err + cfg->non_fatal_err;
 	if (total_err > 0)
@@ -1003,6 +815,5 @@ starter_config_t* confread_load(const char *file)
 		DBG1(DBG_APP, "### %d parsing error%s (%d fatal) ###",
 			 total_err, (total_err > 1)?"s":"", cfg->err);
 	}
-
 	return cfg;
 }
diff --git a/src/starter/confread.h b/src/starter/confread.h
index d55a17e63..0eea98849 100644
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -18,13 +18,6 @@
 
 #include <kernel/kernel_ipsec.h>
 
-#include "ipsec-parser.h"
-
-/** to mark seen keywords */
-typedef u_int64_t seen_t;
-#define SEEN_NONE 0;
-#define SEEN_KW(kw, base) ((seen_t)1 << ((kw) - (base)))
-
 typedef enum {
 		STARTUP_NO,
 		STARTUP_ADD,
@@ -92,7 +85,6 @@ typedef enum {
 typedef struct starter_end starter_end_t;
 
 struct starter_end {
-		seen_t          seen;
 		char            *auth;
 		char            *auth2;
 		char            *id;
@@ -121,22 +113,10 @@ struct starter_end {
 		char            *dns;
 };
 
-typedef struct also also_t;
-
-struct also {
-		char            *name;
-		bool            included;
-		also_t          *next;
-};
-
 typedef struct starter_conn starter_conn_t;
 
 struct starter_conn {
-		seen_t          seen;
 		char            *name;
-		also_t          *also;
-		kw_list_t       *kw;
-		u_int           visit;
 		startup_t       startup;
 		starter_state_t state;
 
@@ -162,6 +142,7 @@ struct starter_conn {
 		u_int32_t       reqid;
 		mark_t          mark_in;
 		mark_t          mark_out;
+		u_int32_t       replay_window;
 		u_int32_t       tfc;
 		bool            install_policy;
 		bool            aggressive;
@@ -192,11 +173,7 @@ struct starter_conn {
 typedef struct starter_ca starter_ca_t;
 
 struct starter_ca {
-		seen_t          seen;
 		char            *name;
-		also_t          *also;
-		kw_list_t       *kw;
-		u_int           visit;
 		startup_t       startup;
 		starter_state_t state;
 
@@ -216,7 +193,6 @@ typedef struct starter_config starter_config_t;
 
 struct starter_config {
 		struct {
-				seen_t  seen;
 				bool     charonstart;
 				char     *charondebug;
 				bool     uniqueids;
@@ -228,23 +204,14 @@ struct starter_config {
 		u_int err;
 		u_int non_fatal_err;
 
-		/* do we parse also statements */
-		bool parse_also;
-
-		/* ca %default */
-		starter_ca_t ca_default;
-
-		/* connections list (without %default) */
+		/* connections list */
 		starter_ca_t *ca_first, *ca_last;
 
-		/* conn %default */
-		starter_conn_t conn_default;
-
-		/* connections list (without %default) */
+		/* connections list */
 		starter_conn_t *conn_first, *conn_last;
 };
 
-extern starter_config_t *confread_load(const char *file);
-extern void confread_free(starter_config_t *cfg);
+starter_config_t *confread_load(const char *file);
+void confread_free(starter_config_t *cfg);
 
 #endif /* _IPSEC_CONFREAD_H_ */
diff --git a/src/starter/ipsec-parser.h b/src/starter/ipsec-parser.h
deleted file mode 100644
index 1c6cf20ef..000000000
--- a/src/starter/ipsec-parser.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* strongSwan config file parser
- * Copyright (C) 2001-2002 Mathieu Lafon - Arkoon Network Security
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#ifndef _IPSEC_PARSER_H_
-#define _IPSEC_PARSER_H_
-
-#include "keywords.h"
-
-typedef struct kw_entry kw_entry_t;
-
-struct kw_entry {
-	char *name;
-	kw_token_t token;
-};
-
-typedef struct kw_list kw_list_t;
-
-struct kw_list {
-		kw_entry_t *entry;
-		char *value;
-		kw_list_t *next;
-};
-
-typedef struct section_list section_list_t;
-
-struct section_list {
-		char *name;
-		kw_list_t *kw;
-		section_list_t *next;
-};
-
-typedef struct config_parsed config_parsed_t;
-
-struct config_parsed {
-		kw_list_t *config_setup;
-		section_list_t *conn_first, *conn_last;
-		section_list_t *ca_first, *ca_last;
-};
-
-config_parsed_t *parser_load_conf (const char *file);
-void parser_free_conf (config_parsed_t *cfg);
-
-#endif /* _IPSEC_PARSER_H_ */
-
diff --git a/src/starter/keywords.c b/src/starter/keywords.c
index d370c6651..762c5d947 100644
--- a/src/starter/keywords.c
+++ b/src/starter/keywords.c
@@ -54,7 +54,7 @@ struct kw_entry {
     kw_token_t token;
 };
 
-#define TOTAL_KEYWORDS 138
+#define TOTAL_KEYWORDS 139
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 17
 #define MIN_HASH_VALUE 9
@@ -84,9 +84,9 @@ hash (str, len)
       258, 258, 258, 258, 258, 258, 258, 258, 258, 258,
       258, 258, 258, 258, 258, 258, 258, 258, 258, 258,
       258, 258, 258, 258, 258, 258, 258, 258, 258, 258,
-      258, 258, 258, 258, 258,   3, 258,  31,   1,  83,
+      258, 258, 258, 258, 258,   3, 258,  31,   4,  83,
        50,   5,   4,   1,  79,   1, 258, 121,  62,   5,
-       33,  51,  41,   2,  22,   1,  25, 103,   6, 258,
+       33,  51,  41,   2,  22,   1,  25, 103,   6,   1,
       258,   8,   2, 258, 258, 258, 258, 258, 258, 258,
       258, 258, 258, 258, 258, 258, 258, 258, 258, 258,
       258, 258, 258, 258, 258, 258, 258, 258, 258, 258,
@@ -156,9 +156,10 @@ static const struct kw_entry wordlist[] =
     {"reqid",             KW_REQID},
     {"certuribase",       KW_CERTURIBASE},
     {"leftnexthop",       KW_LEFT_DEPRECATED},
-    {"mobike",	           KW_MOBIKE},
+    {"replay_window",     KW_REPLAY_WINDOW},
     {"leftprotoport",     KW_LEFTPROTOPORT},
     {"compress",          KW_COMPRESS},
+    {"mobike",	           KW_MOBIKE},
     {"me_peerid",         KW_ME_PEERID},
     {"interfaces",        KW_SETUP_DEPRECATED},
     {"virtual_private",   KW_SETUP_DEPRECATED},
@@ -272,25 +273,25 @@ static const short lookup[] =
      14,  15,  16,  -1,  -1,  -1,  17,  18,  19,  20,
      21,  22,  -1,  23,  24,  -1,  25,  26,  27,  -1,
      28,  29,  30,  -1,  -1,  31,  32,  -1,  33,  34,
-     35,  -1,  36,  37,  38,  39,  -1,  40,  -1,  -1,
-     -1,  41,  42,  43,  44,  -1,  45,  -1,  46,  -1,
-     47,  48,  49,  50,  51,  52,  53,  54,  55,  56,
-     57,  58,  -1,  -1,  59,  60,  61,  -1,  62,  -1,
-     63,  -1,  64,  65,  66,  67,  68,  69,  70,  71,
-     -1,  72,  73,  74,  75,  76,  77,  -1,  78,  -1,
-     -1,  79,  80,  -1,  81,  -1,  -1,  82,  83,  84,
-     85,  86,  87,  -1,  88,  -1,  89,  90,  -1,  91,
-     92,  -1,  93,  94,  -1,  95,  -1,  -1,  96,  97,
-     98,  99,  -1, 100,  -1, 101, 102, 103,  -1, 104,
-    105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
-     -1, 115,  -1, 116,  -1, 117,  -1,  -1, 118, 119,
-     -1,  -1,  -1,  -1,  -1, 120,  -1, 121,  -1, 122,
-    123, 124,  -1,  -1,  -1,  -1,  -1, 125,  -1,  -1,
-     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 126,  -1,
-     -1, 127, 128,  -1, 129,  -1, 130,  -1,  -1,  -1,
-     -1,  -1,  -1, 131,  -1, 132,  -1, 133, 134,  -1,
-     -1,  -1,  -1, 135,  -1,  -1,  -1,  -1,  -1,  -1,
-    136,  -1,  -1,  -1,  -1,  -1,  -1, 137
+     35,  36,  37,  38,  39,  40,  -1,  41,  -1,  -1,
+     -1,  42,  43,  44,  45,  -1,  46,  -1,  47,  -1,
+     48,  49,  50,  51,  52,  53,  54,  55,  56,  57,
+     58,  59,  -1,  -1,  60,  61,  62,  -1,  63,  -1,
+     64,  -1,  65,  66,  67,  68,  69,  70,  71,  72,
+     -1,  73,  74,  75,  76,  77,  78,  -1,  79,  -1,
+     -1,  80,  81,  -1,  82,  -1,  -1,  83,  84,  85,
+     86,  87,  88,  -1,  89,  -1,  90,  91,  -1,  92,
+     93,  -1,  94,  95,  -1,  96,  -1,  -1,  97,  98,
+     99, 100,  -1, 101,  -1, 102, 103, 104,  -1, 105,
+    106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+     -1, 116,  -1, 117,  -1, 118,  -1,  -1, 119, 120,
+     -1,  -1,  -1,  -1,  -1, 121,  -1, 122,  -1, 123,
+    124, 125,  -1,  -1,  -1,  -1,  -1, 126,  -1,  -1,
+     -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 127,  -1,
+     -1, 128, 129,  -1, 130,  -1, 131,  -1,  -1,  -1,
+     -1,  -1,  -1, 132,  -1, 133,  -1, 134, 135,  -1,
+     -1,  -1,  -1, 136,  -1,  -1,  -1,  -1,  -1,  -1,
+    137,  -1,  -1,  -1,  -1,  -1,  -1, 138
   };
 
 #ifdef __GNUC__
diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 705a7c16e..94af493f8 100644
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -16,7 +16,10 @@
 #ifndef _KEYWORDS_H_
 #define _KEYWORDS_H_
 
-typedef enum {
+typedef enum kw_token_t kw_token_t;
+typedef struct kw_entry_t kw_entry_t;
+
+enum kw_token_t {
 	/* config setup keywords */
 	KW_CHARONDEBUG,
 	KW_UNIQUEIDS,
@@ -69,6 +72,7 @@ typedef enum {
 	KW_MEDIATED_BY,
 	KW_ME_PEERID,
 	KW_REQID,
+	KW_REPLAY_WINDOW,
 	KW_MARK,
 	KW_MARK_IN,
 	KW_MARK_OUT,
@@ -184,6 +188,11 @@ typedef enum {
 	KW_ALSO,
 	KW_AUTO,
 
-} kw_token_t;
+};
+
+struct kw_entry_t {
+	char *name;
+	kw_token_t token;
+};
 
 #endif /* _KEYWORDS_H_ */
diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt
index ad915bf2a..ee0bd31e1 100644
--- a/src/starter/keywords.txt
+++ b/src/starter/keywords.txt
@@ -69,6 +69,7 @@ mediation,         KW_MEDIATION
 mediated_by,       KW_MEDIATED_BY
 me_peerid,         KW_ME_PEERID
 reqid,             KW_REQID
+replay_window,     KW_REPLAY_WINDOW
 mark,              KW_MARK
 mark_in,           KW_MARK_IN
 mark_out,          KW_MARK_OUT
diff --git a/src/starter/lexer.c b/src/starter/lexer.c
deleted file mode 100644
index f093354d5..000000000
--- a/src/starter/lexer.c
+++ /dev/null
@@ -1,1992 +0,0 @@
-
-#line 3 "lexer.c"
-
-#define  YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-
-#endif /* ! C99 */
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN (yy_start) = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START (((yy_start) - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin  )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
-#define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
-#endif
-
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-extern int yyleng;
-
-extern FILE *yyin, *yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
-		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, (yytext_ptr)  )
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-
-	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
-
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
-
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
-
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* Begin user sect3 */
-
-typedef unsigned char YY_CHAR;
-
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
-typedef int yy_state_type;
-
-extern int yylineno;
-
-int yylineno = 1;
-
-extern char *yytext;
-#define yytext_ptr yytext
-
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
-	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
-
-#define YY_NUM_RULES 14
-#define YY_END_OF_BUFFER 15
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept[47] =
-    {   0,
-        0,    0,   15,   11,    2,    4,   13,   11,    3,   11,
-       11,   11,   11,    1,   11,    2,    0,   12,   11,    0,
-        4,    8,   11,   11,   11,   11,    1,   11,   11,   11,
-       11,   11,    7,   11,   11,   11,   11,   11,    6,   11,
-        5,   11,   11,    9,   10,    0
-    } ;
-
-static yyconst flex_int32_t yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    4,    5,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        6,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    7,    1,    8,    9,
-
-       10,   11,   12,    1,   13,    1,    1,   14,    1,   15,
-       16,   17,    1,   18,   19,   20,   21,   22,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst flex_int32_t yy_meta[23] =
-    {   0,
-        1,    2,    3,    2,    1,    2,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1
-    } ;
-
-static yyconst flex_int16_t yy_base[51] =
-    {   0,
-        0,   69,   70,    0,   67,   72,   64,   21,   72,   19,
-       52,   56,   55,   62,    0,   61,   58,   72,   34,   58,
-       72,    0,   45,   51,   38,   39,   54,   17,   41,   33,
-       34,   39,    0,   30,   33,   36,   27,   25,    0,   17,
-        0,   21,   15,    0,    0,   72,   28,   40,   42,   45
-    } ;
-
-static yyconst flex_int16_t yy_def[51] =
-    {   0,
-       46,    1,   46,   47,   46,   46,   48,   49,   46,   47,
-       47,   47,   47,   46,   47,   46,   48,   46,   49,   50,
-       46,   47,   47,   47,   47,   47,   46,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   47,    0,   46,   46,   46,   46
-    } ;
-
-static yyconst flex_int16_t yy_nxt[95] =
-    {   0,
-        4,    5,    6,    7,    8,    9,    4,   10,    4,    4,
-        4,    4,   11,    4,    4,    4,    4,    4,   12,    4,
-        4,   13,   20,   21,   20,   22,   20,   32,   15,   45,
-       44,   33,   43,   42,   23,   20,   21,   20,   41,   20,
-       17,   17,   19,   19,   19,   20,   20,   20,   40,   39,
-       38,   37,   36,   35,   34,   27,   31,   30,   29,   28,
-       21,   18,   16,   27,   26,   25,   24,   18,   16,   46,
-       14,    3,   46,   46,   46,   46,   46,   46,   46,   46,
-       46,   46,   46,   46,   46,   46,   46,   46,   46,   46,
-       46,   46,   46,   46
-
-    } ;
-
-static yyconst flex_int16_t yy_chk[95] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    8,    8,    8,   10,    8,   28,   47,   43,
-       42,   28,   40,   38,   10,   19,   19,   19,   37,   19,
-       48,   48,   49,   49,   49,   50,   50,   50,   36,   35,
-       34,   32,   31,   30,   29,   27,   26,   25,   24,   23,
-       20,   17,   16,   14,   13,   12,   11,    7,    5,    3,
-        2,   46,   46,   46,   46,   46,   46,   46,   46,   46,
-       46,   46,   46,   46,   46,   46,   46,   46,   46,   46,
-       46,   46,   46,   46
-
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "lexer.l"
-#define YY_NO_INPUT 1
-#line 4 "lexer.l"
-/* FreeS/WAN config file parser (parser.l)
- * Copyright (C) 2001 Mathieu Lafon - Arkoon Network Security
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef HAVE_GLOB_H
-#include <glob.h>
-#endif
-
-#include "parser.h"
-
-#define MAX_INCLUDE_DEPTH  20
-
-extern void yyerror(const char *);
-extern int yylex(void);
-extern int yylex_destroy(void);
-
-static struct {
-	int stack_ptr;
-	YY_BUFFER_STATE stack[MAX_INCLUDE_DEPTH];
-	FILE *file[MAX_INCLUDE_DEPTH];
-	unsigned int line[MAX_INCLUDE_DEPTH];
-	char *filename[MAX_INCLUDE_DEPTH];
-} __parser_y_private;
-
-void _parser_y_error(char *b, int size, const char *s);
-void _parser_y_init (const char *f);
-void _parser_y_fini (void);
-int _parser_y_include (const char *filename);
-
-void _parser_y_error(char *b, int size, const char *s)
-{
-	extern char *yytext; // was: char yytext[];
-
-	snprintf(b, size, "%s:%d: %s [%s]",
-			__parser_y_private.filename[__parser_y_private.stack_ptr],
-			__parser_y_private.line[__parser_y_private.stack_ptr],
-			s, yytext);
-}
-
-void _parser_y_init (const char *f)
-{
-	memset(&__parser_y_private, 0, sizeof(__parser_y_private));
-	__parser_y_private.line[0] = 1;
-	__parser_y_private.filename[0] = strdup(f);
-}
-
-void _parser_y_fini (void)
-{
-	unsigned int i;
-
-	for (i = 0; i < MAX_INCLUDE_DEPTH; i++)
-	{
-		if (__parser_y_private.filename[i])
-			free(__parser_y_private.filename[i]);
-		if (__parser_y_private.file[i])
-			fclose(__parser_y_private.file[i]);
-	}
-	memset(&__parser_y_private, 0, sizeof(__parser_y_private));
-	yylex_destroy();
-}
-
-/**
- * parse the file located at filename
- */
-int include_file(char *filename)
-{
-	unsigned int p = __parser_y_private.stack_ptr + 1;
-	FILE *f;
-
-	if (p >= MAX_INCLUDE_DEPTH)
-	{
-		yyerror("max inclusion depth reached");
-		return 1;
-	}
-
-	f = fopen(filename, "r");
-	if (!f)
-	{
-		yyerror("can't open include filename");
-		return 0; /* ignore this error */
-	}
-
-	__parser_y_private.stack_ptr++;
-	__parser_y_private.file[p] = f;
-	__parser_y_private.stack[p] = YY_CURRENT_BUFFER;
-	__parser_y_private.line[p] = 1;
-	__parser_y_private.filename[p] = strdup(filename);
-
-	yy_switch_to_buffer(yy_create_buffer(f,YY_BUF_SIZE));
-	return 0;
-}
-
-int _parser_y_include (const char *filename)
-{
-	int ret = 0;
-#ifdef HAVE_GLOB_H
-	{
-		glob_t files;
-		int i;
-
-		ret = glob(filename, GLOB_ERR, NULL, &files);
-		if (ret)
-		{
-			const char *err;
-
-			switch (ret)
-			{
-				case GLOB_NOSPACE:
-					err = "include files ran out of memory";
-					break;
-				case GLOB_ABORTED:
-					err = "include files aborted due to read error";
-					break;
-				case GLOB_NOMATCH:
-					err = "include files found no matches";
-					break;
-				default:
-					err = "unknown include files error";
-			}
-			globfree(&files);
-			yyerror(err);
-			return 1;
-		}
-
-		for (i = 0; i < files.gl_pathc; i++)
-		{
-			if ((ret = include_file(files.gl_pathv[i])))
-			{
-				break;
-			}
-		}
-		globfree(&files);
-	}
-#else /* HAVE_GLOB_H */
-	/* if glob(3) is not available, try to load pattern directly */
-	ret = include_file(filename);
-#endif /* HAVE_GLOB_H */
-	return ret;
-}
-
-#line 647 "lexer.c"
-
-#define INITIAL 0
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-static int yy_init_globals (void );
-
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-
-int yylex_destroy (void );
-
-int yyget_debug (void );
-
-void yyset_debug (int debug_flag  );
-
-YY_EXTRA_TYPE yyget_extra (void );
-
-void yyset_extra (YY_EXTRA_TYPE user_defined  );
-
-FILE *yyget_in (void );
-
-void yyset_in  (FILE * in_str  );
-
-FILE *yyget_out (void );
-
-void yyset_out  (FILE * out_str  );
-
-int yyget_leng (void );
-
-char *yyget_text (void );
-
-int yyget_lineno (void );
-
-void yyset_lineno (int line_number  );
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap (void );
-#else
-extern int yywrap (void );
-#endif
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
-#endif
-
-#ifndef YY_NO_INPUT
-
-#ifdef __cplusplus
-static int yyinput (void );
-#else
-static int input (void );
-#endif
-
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
-#define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		size_t n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}\
-\
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* end tables serialization structures and prototypes */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int yylex (void);
-
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	if ( yyleng > 0 ) \
-		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
-				(yytext[yyleng - 1] == '\n'); \
-	YY_USER_ACTION
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-    
-#line 159 "lexer.l"
-
-
-#line 838 "lexer.c"
-
-	if ( !(yy_init) )
-		{
-		(yy_init) = 1;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! (yy_start) )
-			(yy_start) = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE );
-		}
-
-		yy_load_buffer_state( );
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = (yy_c_buf_p);
-
-		/* Support of yytext. */
-		*yy_cp = (yy_hold_char);
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = (yy_start);
-		yy_current_state += YY_AT_BOL();
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				(yy_last_accepting_state) = yy_current_state;
-				(yy_last_accepting_cpos) = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 47 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 72 );
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
-			yy_act = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-do_action:	/* This label is used only to access EOF actions. */
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = (yy_hold_char);
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
-			goto yy_find_action;
-
-case YY_STATE_EOF(INITIAL):
-#line 161 "lexer.l"
-{
-		if (__parser_y_private.filename[__parser_y_private.stack_ptr]) {
-				free(__parser_y_private.filename[__parser_y_private.stack_ptr]);
-				__parser_y_private.filename[__parser_y_private.stack_ptr] = NULL;
-		}
-		if (__parser_y_private.file[__parser_y_private.stack_ptr]) {
-				fclose(__parser_y_private.file[__parser_y_private.stack_ptr]);
-				__parser_y_private.file[__parser_y_private.stack_ptr] = NULL;
-				yy_delete_buffer (YY_CURRENT_BUFFER);
-				yy_switch_to_buffer
-						(__parser_y_private.stack[__parser_y_private.stack_ptr]);
-		}
-		if (--__parser_y_private.stack_ptr < 0) {
-				yyterminate();
-		}
-}
-	YY_BREAK
-case 1:
-YY_RULE_SETUP
-#line 178 "lexer.l"
-return FIRST_SPACES;
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 180 "lexer.l"
-/* ignore spaces in line */ ;
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 182 "lexer.l"
-return EQUAL;
-	YY_BREAK
-case 4:
-/* rule 4 can match eol */
-YY_RULE_SETUP
-#line 184 "lexer.l"
-{
-										__parser_y_private.line[__parser_y_private.stack_ptr]++;
-										return EOL;
-								}
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 189 "lexer.l"
-return CONFIG;
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 190 "lexer.l"
-return SETUP;
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 191 "lexer.l"
-return CONN;
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 192 "lexer.l"
-return CA;
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 193 "lexer.l"
-return INCLUDE;
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 194 "lexer.l"
-return FILE_VERSION;
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 196 "lexer.l"
-{
-										yylval.s = strdup(yytext);
-										return STRING;
-								}
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 201 "lexer.l"
-{
-										yylval.s = strdup(yytext+1);
-										if (yylval.s) yylval.s[strlen(yylval.s)-1]='\0';
-										return STRING;
-								}
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 207 "lexer.l"
-yyerror(yytext);
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 209 "lexer.l"
-ECHO;
-	YY_BREAK
-#line 1022 "lexer.c"
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = (yy_hold_char);
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state(  );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++(yy_c_buf_p);
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = (yy_c_buf_p);
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer(  ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				(yy_did_buffer_switch_on_eof) = 0;
-
-				if ( yywrap( ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				(yy_c_buf_p) =
-					(yytext_ptr) + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				(yy_c_buf_p) =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-} /* end of yylex */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (void)
-{
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
-	else
-		{
-			int num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-
-			int yy_c_buf_p_offset =
-				(int) ((yy_c_buf_p) - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-						number_to_move - 1;
-
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), (size_t) num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	if ( (yy_n_chars) == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart(yyin  );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-	}
-
-	(yy_n_chars) += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
-	return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-    static yy_state_type yy_get_previous_state (void)
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-    
-	yy_current_state = (yy_start);
-	yy_current_state += YY_AT_BOL();
-
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			(yy_last_accepting_state) = yy_current_state;
-			(yy_last_accepting_cpos) = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 47 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
-{
-	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		(yy_last_accepting_state) = yy_current_state;
-		(yy_last_accepting_cpos) = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 47 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 46);
-
-	return yy_is_jam ? 0 : yy_current_state;
-}
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-    static int yyinput (void)
-#else
-    static int input  (void)
-#endif
-
-{
-	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
-
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-			/* This was really a NUL. */
-			*(yy_c_buf_p) = '\0';
-
-		else
-			{ /* need more input */
-			int offset = (yy_c_buf_p) - (yytext_ptr);
-			++(yy_c_buf_p);
-
-			switch ( yy_get_next_buffer(  ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart(yyin );
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap( ) )
-						return EOF;
-
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					(yy_c_buf_p) = (yytext_ptr) + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve yytext */
-	(yy_hold_char) = *++(yy_c_buf_p);
-
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
-
-	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void yyrestart  (FILE * input_file )
-{
-    
-	if ( ! YY_CURRENT_BUFFER ){
-        yyensure_buffer_stack ();
-		YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer(yyin,YY_BUF_SIZE );
-	}
-
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-	yy_load_buffer_state( );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
-{
-    
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		yypop_buffer_state();
-	 *		yypush_buffer_state(new_buffer);
-     */
-	yyensure_buffer_stack ();
-	if ( YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state( );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-static void yy_load_buffer_state  (void)
-{
-    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	(yy_hold_char) = *(yy_c_buf_p);
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
-{
-	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer(b,file );
-
-	return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
-	if ( ! b )
-		return;
-
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf  );
-
-	yyfree((void *) b  );
-}
-
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-    
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
-
-{
-	int oerrno = errno;
-    
-	yy_flush_buffer(b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-    /* If b is the current buffer, then yy_init_buffer was _probably_
-     * called from yyrestart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
-	errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
-    void yy_flush_buffer (YY_BUFFER_STATE  b )
-{
-    	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == YY_CURRENT_BUFFER )
-		yy_load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
-    	if (new_buffer == NULL)
-		return;
-
-	yyensure_buffer_stack();
-
-	/* This block is copied from yy_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		(yy_buffer_stack_top)++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from yy_switch_to_buffer. */
-	yy_load_buffer_state( );
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  
- */
-void yypop_buffer_state (void)
-{
-    	if (!YY_CURRENT_BUFFER)
-		return;
-
-	yy_delete_buffer(YY_CURRENT_BUFFER );
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if ((yy_buffer_stack_top) > 0)
-		--(yy_buffer_stack_top);
-
-	if (YY_CURRENT_BUFFER) {
-		yy_load_buffer_state( );
-		(yy_did_buffer_switch_on_eof) = 1;
-	}
-}
-
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (void)
-{
-	int num_to_alloc;
-    
-	if (!(yy_buffer_stack)) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-         */
-		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-								  
-		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		(yy_buffer_stack_max) = num_to_alloc;
-		(yy_buffer_stack_top) = 0;
-		return;
-	}
-
-	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
-								((yy_buffer_stack),
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-		(yy_buffer_stack_max) = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
-{
-	YY_BUFFER_STATE b;
-    
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer(b  );
-
-	return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to yylex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
-{
-    
-	return yy_scan_bytes(yystr,strlen(yystr) );
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
- * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
-{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-    
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) yyalloc(n  );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < _yybytes_len; ++i )
-		buf[i] = yybytes[i];
-
-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer(buf,n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		yytext[yyleng] = (yy_hold_char); \
-		(yy_c_buf_p) = yytext + yyless_macro_arg; \
-		(yy_hold_char) = *(yy_c_buf_p); \
-		*(yy_c_buf_p) = '\0'; \
-		yyleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
-
-/* Accessor  methods (get/set functions) to struct members. */
-
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-        
-    return yylineno;
-}
-
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
-
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
-
-/** Get the length of the current token.
- * 
- */
-int yyget_leng  (void)
-{
-        return yyleng;
-}
-
-/** Get the current token.
- * 
- */
-
-char *yyget_text  (void)
-{
-        return yytext;
-}
-
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int  line_number )
-{
-    
-    yylineno = line_number;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * 
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE *  in_str )
-{
-        yyin = in_str ;
-}
-
-void yyset_out (FILE *  out_str )
-{
-        yyout = out_str ;
-}
-
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
-
-void yyset_debug (int  bdebug )
-{
-        yy_flex_debug = bdebug ;
-}
-
-static int yy_init_globals (void)
-{
-        /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from yylex_destroy(), so don't allocate here.
-     */
-
-    (yy_buffer_stack) = 0;
-    (yy_buffer_stack_top) = 0;
-    (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
-    (yy_init) = 0;
-    (yy_start) = 0;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
-    yyin = stdin;
-    yyout = stdout;
-#else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
-#endif
-
-    /* For future reference: Set errno on error, since we are called by
-     * yylex_init()
-     */
-    return 0;
-}
-
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
-{
-    
-    /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		yy_delete_buffer(YY_CURRENT_BUFFER  );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		yypop_buffer_state();
-	}
-
-	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
-
-    /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * yylex() is called, initialization will occur. */
-    yy_init_globals( );
-
-    return 0;
-}
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-}
-#endif
-
-void *yyalloc (yy_size_t  size )
-{
-	return (void *) malloc( size );
-}
-
-void *yyrealloc  (void * ptr, yy_size_t  size )
-{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr )
-{
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
-#line 209 "lexer.l"
-
-
-
-int yywrap(void)
-{
-	return 1;
-}
-
-
diff --git a/src/starter/lexer.l b/src/starter/lexer.l
deleted file mode 100644
index 734776a74..000000000
--- a/src/starter/lexer.l
+++ /dev/null
@@ -1,215 +0,0 @@
-%option noinput
-%option nounput
-%{
-/* FreeS/WAN config file parser (parser.l)
- * Copyright (C) 2001 Mathieu Lafon - Arkoon Network Security
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef HAVE_GLOB_H
-#include <glob.h>
-#endif
-
-#include "parser.h"
-
-#define MAX_INCLUDE_DEPTH  20
-
-extern void yyerror(const char *);
-extern int yylex(void);
-extern int yylex_destroy(void);
-
-static struct {
-	int stack_ptr;
-	YY_BUFFER_STATE stack[MAX_INCLUDE_DEPTH];
-	FILE *file[MAX_INCLUDE_DEPTH];
-	unsigned int line[MAX_INCLUDE_DEPTH];
-	char *filename[MAX_INCLUDE_DEPTH];
-} __parser_y_private;
-
-void _parser_y_error(char *b, int size, const char *s);
-void _parser_y_init (const char *f);
-void _parser_y_fini (void);
-int _parser_y_include (const char *filename);
-
-void _parser_y_error(char *b, int size, const char *s)
-{
-	extern char *yytext; // was: char yytext[];
-
-	snprintf(b, size, "%s:%d: %s [%s]",
-			__parser_y_private.filename[__parser_y_private.stack_ptr],
-			__parser_y_private.line[__parser_y_private.stack_ptr],
-			s, yytext);
-}
-
-void _parser_y_init (const char *f)
-{
-	memset(&__parser_y_private, 0, sizeof(__parser_y_private));
-	__parser_y_private.line[0] = 1;
-	__parser_y_private.filename[0] = strdup(f);
-}
-
-void _parser_y_fini (void)
-{
-	unsigned int i;
-
-	for (i = 0; i < MAX_INCLUDE_DEPTH; i++)
-	{
-		if (__parser_y_private.filename[i])
-			free(__parser_y_private.filename[i]);
-		if (__parser_y_private.file[i])
-			fclose(__parser_y_private.file[i]);
-	}
-	memset(&__parser_y_private, 0, sizeof(__parser_y_private));
-	yylex_destroy();
-}
-
-/**
- * parse the file located at filename
- */
-int include_file(char *filename)
-{
-	unsigned int p = __parser_y_private.stack_ptr + 1;
-	FILE *f;
-
-	if (p >= MAX_INCLUDE_DEPTH)
-	{
-		yyerror("max inclusion depth reached");
-		return 1;
-	}
-
-	f = fopen(filename, "r");
-	if (!f)
-	{
-		yyerror("can't open include filename");
-		return 0; /* ignore this error */
-	}
-
-	__parser_y_private.stack_ptr++;
-	__parser_y_private.file[p] = f;
-	__parser_y_private.stack[p] = YY_CURRENT_BUFFER;
-	__parser_y_private.line[p] = 1;
-	__parser_y_private.filename[p] = strdup(filename);
-
-	yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE));
-	return 0;
-}
-
-int _parser_y_include (const char *filename)
-{
-	int ret = 0;
-#ifdef HAVE_GLOB_H
-	{
-		glob_t files;
-		int i;
-
-		ret = glob(filename, GLOB_ERR, NULL, &files);
-		if (ret)
-		{
-			const char *err;
-
-			switch (ret)
-			{
-				case GLOB_NOSPACE:
-					err = "include files ran out of memory";
-					break;
-				case GLOB_ABORTED:
-					err = "include files aborted due to read error";
-					break;
-				case GLOB_NOMATCH:
-					err = "include files found no matches";
-					break;
-				default:
-					err = "unknown include files error";
-			}
-			globfree(&files);
-			yyerror(err);
-			return 1;
-		}
-
-		for (i = 0; i < files.gl_pathc; i++)
-		{
-			if ((ret = include_file(files.gl_pathv[i])))
-			{
-				break;
-			}
-		}
-		globfree(&files);
-	}
-#else /* HAVE_GLOB_H */
-	/* if glob(3) is not available, try to load pattern directly */
-	ret = include_file(filename);
-#endif /* HAVE_GLOB_H */
-	return ret;
-}
-
-%}
-
-%%
-
-<<EOF>> {
-		if (__parser_y_private.filename[__parser_y_private.stack_ptr]) {
-				free(__parser_y_private.filename[__parser_y_private.stack_ptr]);
-				__parser_y_private.filename[__parser_y_private.stack_ptr] = NULL;
-		}
-		if (__parser_y_private.file[__parser_y_private.stack_ptr]) {
-				fclose(__parser_y_private.file[__parser_y_private.stack_ptr]);
-				__parser_y_private.file[__parser_y_private.stack_ptr] = NULL;
-				yy_delete_buffer (YY_CURRENT_BUFFER);
-				yy_switch_to_buffer
-						(__parser_y_private.stack[__parser_y_private.stack_ptr]);
-		}
-		if (--__parser_y_private.stack_ptr < 0) {
-				yyterminate();
-		}
-}
-
-^[\t ]+                 return FIRST_SPACES;
-
-[\t ]+                  /* ignore spaces in line */ ;
-
-=                               return EQUAL;
-
-\n|#.*\n                {
-										__parser_y_private.line[__parser_y_private.stack_ptr]++;
-										return EOL;
-								}
-
-config                  return CONFIG;
-setup                   return SETUP;
-conn                    return CONN;
-ca                      return CA;
-include                 return INCLUDE;
-version                 return FILE_VERSION;
-
-[^\"= \t\n]+    {
-										yylval.s = strdup(yytext);
-										return STRING;
-								}
-
-\"[^\"\n]*\"    {
-										yylval.s = strdup(yytext+1);
-										if (yylval.s) yylval.s[strlen(yylval.s)-1]='\0';
-										return STRING;
-								}
-
-.                               yyerror(yytext);
-
-%%
-
-int yywrap(void)
-{
-	return 1;
-}
-
diff --git a/src/starter/parser.y b/src/starter/parser.y
deleted file mode 100644
index 2cf0501f4..000000000
--- a/src/starter/parser.y
+++ /dev/null
@@ -1,272 +0,0 @@
-%{
-/* strongSwan config file parser (parser.y)
- * Copyright (C) 2001 Mathieu Lafon - Arkoon Network Security
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <library.h>
-#include <utils/debug.h>
-
-#include "ipsec-parser.h"
-
-#define YYERROR_VERBOSE
-#define ERRSTRING_LEN   256
-
-/**
- * Bison
- */
-static char parser_errstring[ERRSTRING_LEN+1];
-
-extern void yyerror(const char *s);
-extern int yylex (void);
-extern void _parser_y_error(char *b, int size, const char *s);
-
-/**
- * Static Globals
- */
-static int _save_errors_;
-static config_parsed_t *_parser_cfg;
-static kw_list_t **_parser_kw, *_parser_kw_last;
-static char errbuf[ERRSTRING_LEN+1];
-
-/**
- * Gperf
- */
-extern kw_entry_t *in_word_set (char *str, unsigned int len);
-
-%}
-
-%union { char *s; };
-%token EQUAL FIRST_SPACES EOL CONFIG SETUP CONN CA INCLUDE FILE_VERSION
-%token <s> STRING
-
-%%
-
-/*
- * Config file
- */
-
-config_file:
-	config_file section_or_include
-	| /* NULL */
-	;
-
-section_or_include:
-	FILE_VERSION STRING EOL
-	{
-		free($2);
-	}
-	| CONFIG SETUP EOL
-	{
-		_parser_kw = &(_parser_cfg->config_setup);
-		_parser_kw_last = NULL;
-	} kw_section
-	| CONN STRING EOL
-	{
-		section_list_t *section = malloc_thing(section_list_t);
-
-		section->name = strdupnull($2);
-		section->kw = NULL;
-		section->next = NULL;
-		_parser_kw = &(section->kw);
-		if (!_parser_cfg->conn_first)
-			_parser_cfg->conn_first = section;
-		if (_parser_cfg->conn_last)
-			_parser_cfg->conn_last->next = section;
-		_parser_cfg->conn_last = section;
-		_parser_kw_last = NULL;
-		free($2);
-	} kw_section
-	| CA STRING EOL
-	{
-		section_list_t *section = malloc_thing(section_list_t);
-		section->name = strdupnull($2);
-		section->kw = NULL;
-		section->next = NULL;
-		_parser_kw = &(section->kw);
-		if (!_parser_cfg->ca_first)
-			_parser_cfg->ca_first = section;
-		if (_parser_cfg->ca_last)
-			_parser_cfg->ca_last->next = section;
-		_parser_cfg->ca_last = section;
-		_parser_kw_last = NULL;
-		free($2);
-	} kw_section
-	| INCLUDE STRING
-	{
-		extern void _parser_y_include (const char *f);
-		_parser_y_include($2);
-		free($2);
-	} EOL
-	| EOL
-	;
-
-kw_section:
-	FIRST_SPACES statement_kw EOL kw_section
-	|
-	;
-
-statement_kw:
-	STRING EQUAL STRING
-	{
-		kw_list_t  *new;
-		kw_entry_t *entry = in_word_set($1, strlen($1));
-
-		if (entry == NULL)
-		{
-			snprintf(errbuf, ERRSTRING_LEN, "unknown keyword '%s'", $1);
-			yyerror(errbuf);
-		}
-		else if (_parser_kw)
-		{
-			new = (kw_list_t *)malloc_thing(kw_list_t);
-			new->entry = entry;
-			new->value = strdupnull($3);
-			new->next = NULL;
-			if (_parser_kw_last)
-				_parser_kw_last->next = new;
-			_parser_kw_last = new;
-			if (!*_parser_kw)
-				*_parser_kw = new;
-		}
-		free($1);
-		free($3);
-	}
-	| STRING EQUAL
-	  {
-		free($1);
-	  }
-	|
-	;
-
-%%
-
-void yyerror(const char *s)
-{
-	if (_save_errors_)
-		_parser_y_error(parser_errstring, ERRSTRING_LEN, s);
-}
-
-config_parsed_t *parser_load_conf(const char *file)
-{
-	config_parsed_t *cfg = NULL;
-	int err = 0;
-	FILE *f;
-
-	extern void _parser_y_init(const char *f);
-	extern void _parser_y_fini(void);
-	extern FILE *yyin;
-
-	memset(parser_errstring, 0, ERRSTRING_LEN+1);
-
-	cfg = (config_parsed_t *)malloc_thing(config_parsed_t);
-	if (cfg)
-	{
-		memset(cfg, 0, sizeof(config_parsed_t));
-		f = fopen(file, "r");
-		if (f)
-		{
-			yyin = f;
-			_parser_y_init(file);
-			_save_errors_ = 1;
-			_parser_cfg = cfg;
-
-			if (yyparse() !=0 )
-			{
-				if (parser_errstring[0] == '\0')
-				{
-					snprintf(parser_errstring, ERRSTRING_LEN, "Unknown error...");
-				}
-				_save_errors_ = 0;
-				while (yyparse() != 0);
-				err++;
-			}
-			else if (parser_errstring[0] != '\0')
-			{
-				err++;
-			}
-			else
-			{
-				/**
-				 * Config valid
-				 */
-			}
-
-			fclose(f);
-		}
-		else
-		{
-			snprintf(parser_errstring, ERRSTRING_LEN, "can't load file '%s'", file);
-			err++;
-		}
-	}
-	else
-	{
-		snprintf(parser_errstring, ERRSTRING_LEN, "can't allocate memory");
-		err++;
-	}
-
-	if (err)
-	{
-		DBG1(DBG_APP, "%s", parser_errstring);
-
-		if (cfg)
-			parser_free_conf(cfg);
-		cfg = NULL;
-	}
-
-	_parser_y_fini();
-	return cfg;
-}
-
-static void parser_free_kwlist(kw_list_t *list)
-{
-	kw_list_t *elt;
-
-	while (list)
-	{
-		elt = list;
-		list = list->next;
-		free(elt->value);
-		free(elt);
-	}
-}
-
-void parser_free_conf(config_parsed_t *cfg)
-{
-	section_list_t *sec;
-	if (cfg)
-	{
-		parser_free_kwlist(cfg->config_setup);
-		while (cfg->conn_first)
-		{
-			sec = cfg->conn_first;
-			cfg->conn_first = cfg->conn_first->next;
-			free(sec->name);
-			parser_free_kwlist(sec->kw);
-			free(sec);
-		}
-		while (cfg->ca_first)
-		{
-			sec = cfg->ca_first;
-			cfg->ca_first = cfg->ca_first->next;
-			free(sec->name);
-			parser_free_kwlist(sec->kw);
-			free(sec);
-		}
-		free(cfg);
-	}
-}
diff --git a/src/starter/parser/conf_parser.c b/src/starter/parser/conf_parser.c
new file mode 100644
index 000000000..6d1c54d20
--- /dev/null
+++ b/src/starter/parser/conf_parser.c
@@ -0,0 +1,667 @@
+/*
+ * Copyright (C) 2013-2014 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "conf_parser.h"
+
+#include <collections/array.h>
+#include <collections/hashtable.h>
+
+/**
+ * Provided by the generated parser
+ */
+bool conf_parser_parse_file(conf_parser_t *this, char *file);
+
+typedef struct private_conf_parser_t private_conf_parser_t;
+typedef struct section_t section_t;
+
+/**
+ * Private data
+ */
+struct private_conf_parser_t {
+
+	/**
+	 * Public interface
+	 */
+	conf_parser_t public;
+
+	/**
+	 * Path to config file
+	 */
+	char *file;
+
+	/**
+	 * TRUE while parsing the config file
+	 */
+	bool parsing;
+
+	/**
+	 * Hashtable for ca sections, as section_t
+	 */
+	hashtable_t *cas;
+
+	/**
+	 * Hashtable for conn sections, as section_t
+	 */
+	hashtable_t *conns;
+
+	/**
+	 * Array to keep track of the order of conn sections, as section_t
+	 */
+	array_t *conns_order;
+
+	/**
+	 * config setup section
+	 */
+	section_t *config_setup;
+
+	/**
+	 * Pointer to the current section (the one added last) during parsing
+	 */
+	section_t *current_section;
+
+	/**
+	 * Refcount for this parser instance (also used by dictionaries)
+	 */
+	refcount_t ref;
+};
+
+typedef struct {
+	/** Key of the setting */
+	char *key;
+	/** Value of the setting */
+	char *value;
+} setting_t;
+
+int setting_find(const void *a, const void *b)
+{
+	const char *key = a;
+	const setting_t *setting = b;
+	return strcmp(key, setting->key);
+}
+
+int setting_sort(const void *a, const void *b, void *user)
+{
+	const setting_t *sa = a, *sb = b;
+	return strcmp(sa->key, sb->key);
+}
+
+static void setting_destroy(setting_t *this)
+{
+	free(this->key);
+	free(this->value);
+	free(this);
+}
+
+struct section_t {
+	/** Name of the section */
+	char *name;
+	/** Sorted array of settings, as setting_t */
+	array_t *settings;
+	/** Array of also= settings (in reversed order, i.e. most important to least
+	 * important), as setting_t */
+	array_t *also;
+	/** Array of linearized parent objects derived from also= settings, in their
+	 * order of importance (most to least, i.e. %default) as section_t
+	 * NULL if not yet determined */
+	array_t *parents;
+};
+
+static section_t *section_create(char *name)
+{
+	section_t *this;
+
+	INIT(this,
+		.name = name,
+	);
+	return this;
+}
+
+static void section_destroy(section_t *this)
+{
+	array_destroy_function(this->settings, (void*)setting_destroy, NULL);
+	array_destroy_function(this->also, (void*)setting_destroy, NULL);
+	array_destroy(this->parents);
+	free(this->name);
+	free(this);
+}
+
+typedef struct {
+	/** Public interface */
+	dictionary_t public;
+	/** Parser object */
+	private_conf_parser_t *parser;
+	/** Section object */
+	section_t *section;
+} section_dictionary_t;
+
+typedef struct {
+	/** Public interface */
+	enumerator_t public;
+	/** Current settings enumerator */
+	enumerator_t *settings;
+	/** Enumerator into parent list */
+	enumerator_t *parents;
+	/** Hashtable to keep track of already enumerated settings */
+	hashtable_t *seen;
+} dictionary_enumerator_t;
+
+METHOD(enumerator_t, dictionary_enumerate, bool,
+	dictionary_enumerator_t *this, char **key, char **value)
+{
+	setting_t *setting;
+	section_t *parent;
+
+	while (TRUE)
+	{
+		if (this->settings &&
+			this->settings->enumerate(this->settings, &setting))
+		{
+			if (this->seen->get(this->seen, setting->key))
+			{
+				continue;
+			}
+			this->seen->put(this->seen, setting->key, setting->key);
+			if (!setting->value)
+			{
+				continue;
+			}
+			if (key)
+			{
+				*key = setting->key;
+			}
+			if (value)
+			{
+				*value = setting->value;
+			}
+			return TRUE;
+		}
+		DESTROY_IF(this->settings);
+		this->settings = NULL;
+		if (this->parents &&
+			this->parents->enumerate(this->parents, &parent))
+		{
+			if (parent->settings)
+			{
+				this->settings = array_create_enumerator(parent->settings);
+			}
+			continue;
+		}
+		DESTROY_IF(this->parents);
+		this->parents = NULL;
+		break;
+	}
+	return FALSE;
+}
+
+METHOD(enumerator_t, dictionary_enumerator_destroy, void,
+	dictionary_enumerator_t *this)
+{
+	DESTROY_IF(this->settings);
+	DESTROY_IF(this->parents);
+	this->seen->destroy(this->seen);
+	free(this);
+}
+
+METHOD(dictionary_t, dictionary_create_enumerator, enumerator_t*,
+	section_dictionary_t *this)
+{
+	dictionary_enumerator_t *enumerator;
+
+	INIT(enumerator,
+		.public = {
+			.enumerate = (void*)_dictionary_enumerate,
+			.destroy = _dictionary_enumerator_destroy,
+		},
+		.seen = hashtable_create(hashtable_hash_str, hashtable_equals_str, 8),
+	);
+	if (this->section->settings)
+	{
+		enumerator->settings = array_create_enumerator(this->section->settings);
+	}
+	if (this->section->parents)
+	{
+		enumerator->parents = array_create_enumerator(this->section->parents);
+	}
+	return &enumerator->public;
+}
+
+METHOD(dictionary_t, dictionary_get, void*,
+	section_dictionary_t *this, const void *key)
+{
+	enumerator_t *parents;
+	section_t *section;
+	setting_t *setting;
+	char *value = NULL;
+
+	section = this->section;
+	if (array_bsearch(section->settings, key, setting_find, &setting) != -1)
+	{
+		return setting->value;
+	}
+	parents = array_create_enumerator(section->parents);
+	while (parents->enumerate(parents, &section))
+	{
+		if (array_bsearch(section->settings, key, setting_find, &setting) != -1)
+		{
+			value = setting->value;
+			break;
+		}
+	}
+	parents->destroy(parents);
+	return value;
+}
+
+METHOD(dictionary_t, dictionary_destroy, void,
+	section_dictionary_t *this)
+{
+	this->parser->public.destroy(&this->parser->public);
+	free(this);
+}
+
+static dictionary_t *section_dictionary_create(private_conf_parser_t *parser,
+											   section_t *section)
+{
+	section_dictionary_t *this;
+
+	INIT(this,
+		.public = {
+			.create_enumerator = _dictionary_create_enumerator,
+			.get = _dictionary_get,
+			.destroy = _dictionary_destroy,
+		},
+		.parser = parser,
+		.section = section,
+	);
+
+	ref_get(&parser->ref);
+
+	return &this->public;
+}
+
+static bool conn_filter(void *unused, section_t **section, char **name)
+{
+	if (streq((*section)->name, "%default"))
+	{
+		return FALSE;
+	}
+	*name = (*section)->name;
+	return TRUE;
+}
+
+static bool ca_filter(void *unused, void *key, char **name, section_t **section)
+{
+	if (streq((*section)->name, "%default"))
+	{
+		return FALSE;
+	}
+	*name = (*section)->name;
+	return TRUE;
+}
+
+METHOD(conf_parser_t, get_sections, enumerator_t*,
+	private_conf_parser_t *this, conf_parser_section_t type)
+{
+	switch (type)
+	{
+		case CONF_PARSER_CONN:
+			return enumerator_create_filter(
+						array_create_enumerator(this->conns_order),
+						(void*)conn_filter, NULL, NULL);
+		case CONF_PARSER_CA:
+			return enumerator_create_filter(
+						this->cas->create_enumerator(this->cas),
+						(void*)ca_filter, NULL, NULL);
+		case CONF_PARSER_CONFIG_SETUP:
+		default:
+			return enumerator_create_empty();
+	}
+}
+
+METHOD(conf_parser_t, get_section, dictionary_t*,
+	private_conf_parser_t *this, conf_parser_section_t type, char *name)
+{
+	section_t *section = NULL;
+
+	if (name && streq(name, "%default"))
+	{
+		return NULL;
+	}
+	switch (type)
+	{
+		case CONF_PARSER_CONFIG_SETUP:
+			section = this->config_setup;
+			break;
+		case CONF_PARSER_CONN:
+			section = this->conns->get(this->conns, name);
+			break;
+		case CONF_PARSER_CA:
+			section = this->cas->get(this->cas, name);
+			break;
+		default:
+			break;
+	}
+	return section ? section_dictionary_create(this, section) : NULL;
+}
+
+METHOD(conf_parser_t, add_section, bool,
+	private_conf_parser_t *this, conf_parser_section_t type, char *name)
+{
+	hashtable_t *sections = this->conns;
+	array_t *order = this->conns_order;
+	section_t *section = NULL;
+	bool exists = FALSE;
+
+	if (!this->parsing)
+	{
+		free(name);
+		return exists;
+	}
+	switch (type)
+	{
+		case CONF_PARSER_CONFIG_SETUP:
+			section = this->config_setup;
+			/* we don't expect a name, but just in case */
+			free(name);
+			break;
+		case CONF_PARSER_CA:
+			sections = this->cas;
+			order = NULL;
+			/* fall-through */
+		case CONF_PARSER_CONN:
+			section = sections->get(sections, name);
+			if (!section)
+			{
+				section = section_create(name);
+				sections->put(sections, name, section);
+				if (order)
+				{
+					array_insert(order, ARRAY_TAIL, section);
+				}
+			}
+			else
+			{
+				exists = TRUE;
+				free(name);
+			}
+			break;
+
+	}
+	this->current_section = section;
+	return exists;
+}
+
+METHOD(conf_parser_t, add_setting, void,
+	private_conf_parser_t *this, char *key, char *value)
+{
+	section_t *section = this->current_section;
+	setting_t *setting;
+
+	if (!this->parsing || !this->current_section)
+	{
+		free(key);
+		free(value);
+		return;
+	}
+	if (streq(key, "also"))
+	{
+		if (!value || !strlen(value) || streq(value, "%default"))
+		{	/* we require a name, but all sections inherit from %default */
+			free(key);
+			free(value);
+			return;
+		}
+		INIT(setting,
+			.key = key,
+			.value = value,
+		);
+		array_insert_create(&section->also, ARRAY_HEAD, setting);
+		return;
+	}
+	if (array_bsearch(section->settings, key, setting_find, &setting) == -1)
+	{
+		INIT(setting,
+			.key = key,
+			.value = value,
+		);
+		array_insert_create(&section->settings, ARRAY_TAIL, setting);
+		array_sort(section->settings, setting_sort, NULL);
+	}
+	else
+	{
+		free(setting->value);
+		setting->value = value;
+		free(key);
+	}
+}
+
+/**
+ * Check if the given section is contained in the given array.  The search
+ * starts at the given index.
+ */
+static bool is_contained_in(array_t *arr, section_t *section)
+{
+	section_t *current;
+	int i;
+
+	for (i = 0; i < array_count(arr); i++)
+	{
+		array_get(arr, i, &current);
+		if (streq(section->name, current->name))
+		{
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+/**
+ * This algorithm to linearize sections uses a bottom-first depth-first
+ * semantic, with an additional elimination step that removes all but the
+ * last occurrence of each section.
+ *
+ * Consider this configuration:
+ *
+ *   conn A
+ *   conn B
+ *     also=A
+ *   conn C
+ *     also=A
+ *   conn D
+ *     also=C
+ *     also=B
+ *
+ * The linearization would yield D B A C A, which gets reduced to D B C A.
+ *
+ * Ambiguous configurations are handled pragmatically.
+ *
+ * Consider the following configuration:
+ *
+ *   conn A
+ *   conn B
+ *   conn C
+ *     also=A
+ *     also=B
+ *   conn D
+ *     also=B
+ *     also=A
+ *   conn E
+ *     also=C
+ *     also=D
+ *
+ * It is ambiguous because D and C include the same two sections but in
+ * a different order.
+ *
+ * The linearization would yield E D A B C B A which gets reduced to E D C B A.
+ */
+static bool resolve_also_single(hashtable_t *sections,
+							section_t *section, section_t *def, array_t *stack)
+{
+	enumerator_t *enumerator;
+	array_t *parents;
+	section_t *parent, *grandparent;
+	setting_t *also;
+	bool success = TRUE;
+	int i;
+
+	array_insert(stack, ARRAY_HEAD, section);
+	parents = array_create(0, 0);
+	enumerator = array_create_enumerator(section->also);
+	while (enumerator->enumerate(enumerator, &also))
+	{
+		parent = sections->get(sections, also->value);
+		if (!parent || is_contained_in(stack, parent))
+		{
+			if (!parent)
+			{
+				DBG1(DBG_CFG, "section '%s' referenced in section '%s' not "
+					 "found", also->value, section->name);
+			}
+			else
+			{
+				DBG1(DBG_CFG, "section '%s' referenced in section '%s' causes "
+					 "a loop", parent->name, section->name);
+			}
+			array_remove_at(section->also, enumerator);
+			setting_destroy(also);
+			success = FALSE;
+			continue;
+		}
+		if (!parent->parents)
+		{
+			if (!resolve_also_single(sections, parent, def, stack))
+			{
+				success = FALSE;
+				continue;
+			}
+		}
+		/* add the grandparents and the parent to the list */
+		array_insert(parents, ARRAY_TAIL, parent);
+		for (i = 0; i < array_count(parent->parents); i++)
+		{
+			array_get(parent->parents, i, &grandparent);
+			array_insert(parents, ARRAY_TAIL, grandparent);
+		}
+	}
+	enumerator->destroy(enumerator);
+	array_remove(stack, ARRAY_HEAD, NULL);
+
+	if (success && def && !array_count(parents))
+	{
+		array_insert(parents, ARRAY_TAIL, def);
+	}
+
+	while (success && array_remove(parents, ARRAY_HEAD, &parent))
+	{
+		if (!is_contained_in(parents, parent))
+		{	/* last occurrence of this section */
+			array_insert_create(&section->parents, ARRAY_TAIL, parent);
+		}
+	}
+	array_destroy(parents);
+	return success;
+}
+
+/**
+ * Resolve also= statements. The functions returns TRUE if everything is fine,
+ * or FALSE if either a referenced section does not exist, or if the section
+ * inheritance can't be determined properly (e.g. if there are loops or if a
+ * section inherits from multiple sections - perhaps over several levels - in
+ * an ambiguous way).
+ */
+static bool resolve_also(hashtable_t *sections)
+{
+	enumerator_t *enumerator;
+	section_t *def, *section;
+	array_t *stack;
+	bool success = TRUE;
+
+	stack = array_create(0, 0);
+
+	def = sections->get(sections, "%default");
+	if (def)
+	{	/* the default section is the only one with an empty parents list */
+		def->parents = array_create(0, 0);
+	}
+	enumerator = sections->create_enumerator(sections);
+	while (enumerator->enumerate(enumerator, NULL, &section))
+	{
+		if (section->parents)
+		{	/* already determined */
+			continue;
+		}
+		success = resolve_also_single(sections, section, def, stack) && success;
+	}
+	enumerator->destroy(enumerator);
+	array_destroy(stack);
+	return success;
+}
+
+METHOD(conf_parser_t, parse, bool,
+	private_conf_parser_t *this)
+{
+	bool success;
+
+	if (!this->file)
+	{	/* no file, lets assume this is OK */
+		return TRUE;
+	}
+	this->parsing = TRUE;
+	success = conf_parser_parse_file(&this->public, this->file);
+	this->parsing = FALSE;
+	return success && resolve_also(this->conns) && resolve_also(this->cas);
+}
+
+METHOD(conf_parser_t, destroy, void,
+	private_conf_parser_t *this)
+{
+	if (ref_put(&this->ref))
+	{
+		this->cas->destroy_function(this->cas, (void*)section_destroy);
+		this->conns->destroy_function(this->conns, (void*)section_destroy);
+		section_destroy(this->config_setup);
+		array_destroy(this->conns_order);
+		free(this->file);
+		free(this);
+	}
+}
+
+/*
+ * Described in header
+ */
+conf_parser_t *conf_parser_create(const char *file)
+{
+	private_conf_parser_t *this;
+
+	INIT(this,
+		.public = {
+			.parse = _parse,
+			.get_sections = _get_sections,
+			.get_section = _get_section,
+			.add_section = _add_section,
+			.add_setting = _add_setting,
+			.destroy = _destroy,
+		},
+		.file = strdupnull(file),
+		.cas = hashtable_create(hashtable_hash_str,
+								hashtable_equals_str, 8),
+		.conns = hashtable_create(hashtable_hash_str,
+								  hashtable_equals_str, 8),
+		.conns_order = array_create(0, 0),
+		.config_setup = section_create(NULL),
+		.ref = 1,
+	);
+
+	return &this->public;
+}
diff --git a/src/starter/parser/conf_parser.h b/src/starter/parser/conf_parser.h
new file mode 100644
index 000000000..20938201a
--- /dev/null
+++ b/src/starter/parser/conf_parser.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2013-2014 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+/**
+ * @defgroup starter starter
+ *
+ * @defgroup conf_parser conf_parser
+ * @{ @ingroup starter
+ */
+
+#ifndef CONF_PARSER_H_
+#define CONF_PARSER_H_
+
+#include <library.h>
+#include <collections/dictionary.h>
+
+typedef enum conf_parser_section_t conf_parser_section_t;
+typedef struct conf_parser_t conf_parser_t;
+
+/**
+ * Type of section
+ */
+enum conf_parser_section_t {
+	/**
+	 * config setup
+	 */
+	CONF_PARSER_CONFIG_SETUP,
+
+	/**
+	 * conn _name_
+	 */
+	CONF_PARSER_CONN,
+
+	/**
+	 * ca _name_
+	 */
+	CONF_PARSER_CA,
+};
+
+/**
+ * Parser for ipsec.conf
+ */
+struct conf_parser_t {
+
+	/**
+	 * Parse the config file.
+	 *
+	 * @return		TRUE if config file was parsed successfully
+	 */
+	bool (*parse)(conf_parser_t *this);
+
+	/**
+	 * Get the names of all sections of the given type.
+	 *
+	 * @note Returns an empty enumerator for the config setup section.
+	 *
+	 * @return		enumerator over char*
+	 */
+	enumerator_t *(*get_sections)(conf_parser_t *this,
+								  conf_parser_section_t type);
+
+	/**
+	 * Get the section with the given type and name.
+	 *
+	 * @note The name is ignored for the config setup section.
+	 *
+	 * @return		dictionary with settings
+	 */
+	dictionary_t *(*get_section)(conf_parser_t *this,
+								 conf_parser_section_t type, char *name);
+
+	/**
+	 * Add a section while parsing.
+	 *
+	 * @note This method can only be called while parsing the config file.
+	 *
+	 * @param type	type of section to add
+	 * @param name	name of the section, if applicable (gets adopted)
+	 * @return		TRUE if the section already existed (settings get added)
+	 */
+	bool (*add_section)(conf_parser_t *this, conf_parser_section_t type,
+						char *name);
+
+	/**
+	 * Add a key/value pair to the latest section.
+	 *
+	 * @note This method can only be called while parsing the config file.
+	 *
+	 * @param name	key string (gets adopted)
+	 * @param value	optional value string (gets adopted), if no value is
+	 * 				specified the key is set empty
+	 */
+	void (*add_setting)(conf_parser_t *this, char *key, char *value);
+
+
+	/**
+	 * Destroy a conf_parser_t instance.
+	 */
+	void (*destroy)(conf_parser_t *this);
+};
+
+/**
+ * Create a conf_parser_t instance.
+ *
+ * @param file		ipsec.conf file to parse (gets copied)
+ * @return			conf_parser_t instance
+ */
+conf_parser_t *conf_parser_create(const char *file);
+
+#endif /** CONF_PARSER_H_ @}*/
\ No newline at end of file
diff --git a/src/starter/parser/lexer.c b/src/starter/parser/lexer.c
new file mode 100644
index 000000000..157b89c31
--- /dev/null
+++ b/src/starter/parser/lexer.c
@@ -0,0 +1,2737 @@
+#line 2 "parser/lexer.c"
+
+#line 4 "parser/lexer.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+/* %not-for-header */
+
+/* %if-c-only */
+/* %if-not-reentrant */
+/* %endif */
+/* %endif */
+/* %ok-for-header */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* %if-c++-only */
+/* %endif */
+
+/* %if-c-only */
+    
+/* %endif */
+
+/* %if-c-only */
+
+/* %endif */
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+/* %if-c-only */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+/* %endif */
+
+/* %if-tables-serialization */
+/* %endif */
+/* end standard C headers. */
+
+/* %if-c-or-c++ */
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+/* %endif */
+
+/* %if-c++-only */
+/* %endif */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* %not-for-header */
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+/* %ok-for-header */
+
+/* %not-for-header */
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+/* %ok-for-header */
+
+/* %if-reentrant */
+
+/* An opaque pointer. */
+#ifndef YY_TYPEDEF_YY_SCANNER_T
+#define YY_TYPEDEF_YY_SCANNER_T
+typedef void* yyscan_t;
+#endif
+
+/* For convenience, these vars (plus the bison vars far below)
+   are macros in the reentrant scanner. */
+#define yyin yyg->yyin_r
+#define yyout yyg->yyout_r
+#define yyextra yyg->yyextra_r
+#define yyleng yyg->yyleng_r
+#define yytext yyg->yytext_r
+#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
+#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
+#define yy_flex_debug yyg->yy_flex_debug_r
+
+/* %endif */
+
+/* %if-not-reentrant */
+/* %endif */
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN yyg->yy_start = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START ((yyg->yy_start - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE conf_parser_restart(yyin ,yyscanner )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
+#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+/* %if-not-reentrant */
+/* %endif */
+
+/* %if-c-only */
+/* %if-not-reentrant */
+/* %endif */
+/* %endif */
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE conf_parser_lex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-yylineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < yyleng; ++yyl )\
+                    if ( yytext[yyl] == '\n' )\
+                        --yylineno;\
+            }while(0)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = yyg->yy_hold_char; \
+		YY_RESTORE_YY_MORE_OFFSET \
+		yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+/* %if-c-only */
+	FILE *yy_input_file;
+/* %endif */
+
+/* %if-c++-only */
+/* %endif */
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via conf_parser_restart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* %if-c-only Standard (non-C++) definition */
+/* %not-for-header */
+
+/* %if-not-reentrant */
+/* %endif */
+/* %ok-for-header */
+
+/* %endif */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \
+                          ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]
+
+/* %if-c-only Standard (non-C++) definition */
+
+/* %if-not-reentrant */
+/* %not-for-header */
+
+/* %ok-for-header */
+
+/* %endif */
+
+void conf_parser_restart (FILE *input_file ,yyscan_t yyscanner );
+void conf_parser__switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
+YY_BUFFER_STATE conf_parser__create_buffer (FILE *file,int size ,yyscan_t yyscanner );
+void conf_parser__delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
+void conf_parser__flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
+void conf_parser_push_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
+void conf_parser_pop_buffer_state (yyscan_t yyscanner );
+
+static void conf_parser_ensure_buffer_stack (yyscan_t yyscanner );
+static void conf_parser__load_buffer_state (yyscan_t yyscanner );
+static void conf_parser__init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );
+
+#define YY_FLUSH_BUFFER conf_parser__flush_buffer(YY_CURRENT_BUFFER ,yyscanner)
+
+YY_BUFFER_STATE conf_parser__scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
+YY_BUFFER_STATE conf_parser__scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
+YY_BUFFER_STATE conf_parser__scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
+
+/* %endif */
+
+void *conf_parser_alloc (yy_size_t ,yyscan_t yyscanner );
+void *conf_parser_realloc (void *,yy_size_t ,yyscan_t yyscanner );
+void conf_parser_free (void * ,yyscan_t yyscanner );
+
+#define yy_new_buffer conf_parser__create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        conf_parser_ensure_buffer_stack (yyscanner); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            conf_parser__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        conf_parser_ensure_buffer_stack (yyscanner); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            conf_parser__create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */
+/* Begin user sect3 */
+
+#define conf_parser_wrap(n) 1
+#define YY_SKIP_YYWRAP
+
+#define FLEX_DEBUG
+
+typedef unsigned char YY_CHAR;
+
+typedef int yy_state_type;
+
+#define yytext_ptr yytext_r
+
+/* %if-c-only Standard (non-C++) definition */
+
+static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
+static int yy_get_next_buffer (yyscan_t yyscanner );
+static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
+
+/* %endif */
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	yyg->yytext_ptr = yy_bp; \
+/* %% [2.0] code to fiddle yytext and yyleng for yymore() goes here \ */\
+	yyleng = (size_t) (yy_cp - yy_bp); \
+	yyg->yy_hold_char = *yy_cp; \
+	*yy_cp = '\0'; \
+/* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\
+	yyg->yy_c_buf_p = yy_cp;
+
+/* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */
+#define YY_NUM_RULES 28
+#define YY_END_OF_BUFFER 29
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[81] =
+    {   0,
+        0,    0,    0,    0,    0,    0,   29,   12,    3,    5,
+       11,    4,    6,   12,   12,    2,   12,   12,   17,   13,
+       14,   15,   27,   19,   18,   20,   12,    3,    4,    4,
+        0,   12,    2,    0,    9,   12,   12,   17,   16,   27,
+       26,   24,   25,   21,   22,   23,   12,    0,   12,   12,
+       12,    0,   12,    8,   12,   12,    0,   12,   12,   12,
+        0,   12,   12,   12,    0,    0,   12,    0,    0,    0,
+       12,    0,    1,   10,   10,    0,    0,    0,    7,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    4,    1,    5,    6,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        7,    1,    1,    8,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    9,    1,    1,    1,    1,   10,   11,   12,   13,
+
+       14,   15,   16,    1,   17,    1,    1,   18,    1,   19,
+       20,   21,    1,   22,   23,   24,   25,   26,    1,    1,
+        1,    1,    1,    1,   27,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[28] =
+    {   0,
+        1,    2,    3,    2,    4,    2,    5,    1,    6,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[92] =
+    {   0,
+        0,   16,   41,   49,    6,    7,  141,    0,   23,  172,
+      172,    0,  172,  134,  120,   30,   20,  120,    0,  172,
+      172,   33,    0,  172,  172,   50,    0,   60,    0,    0,
+        0,  118,   69,  115,    0,  109,  105,    0,  172,    0,
+      172,  172,  172,  172,  172,  172,   76,   71,   16,   69,
+       66,   67,   72,    0,   71,   74,   69,   69,   64,   69,
+       62,   77,   61,   55,   60,   54,   94,   66,   64,   49,
+      100,   46,  172,  172,   74,   24,   16,    5,  172,  172,
+      107,  113,  119,  125,  131,  137,  142,  147,  153,  159,
+      165
+
+    } ;
+
+static yyconst flex_int16_t yy_def[92] =
+    {   0,
+       81,   81,   82,   82,   83,   83,   80,   84,   80,   80,
+       80,   85,   80,   84,   84,   80,   84,   84,   86,   80,
+       80,   80,   87,   80,   80,   88,   84,   80,   85,   85,
+       84,   84,   80,   80,   84,   84,   84,   86,   80,   87,
+       80,   80,   80,   80,   80,   80,   84,   80,   84,   84,
+       84,   80,   84,   84,   84,   84,   80,   84,   84,   84,
+       80,   84,   84,   84,   80,   80,   89,   90,   91,   80,
+       89,   91,   80,   80,   90,   80,   80,   80,   80,    0,
+       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+       80
+
+    } ;
+
+static yyconst flex_int16_t yy_nxt[200] =
+    {   0,
+       80,    9,   10,    9,   11,   12,   13,   14,   24,   24,
+       25,   25,   80,   80,   26,   26,   15,   16,   10,   16,
+       11,   12,   13,   14,   28,   79,   28,   17,   29,   35,
+       53,   33,   15,   33,   54,   29,   39,   39,   39,   36,
+       78,   18,   20,   20,   20,   21,   20,   77,   73,   22,
+       20,   20,   20,   21,   20,   34,   68,   22,   68,   39,
+       42,   28,   76,   28,   43,   29,   73,   75,   44,   75,
+       33,   45,   33,   46,   29,   75,   70,   75,   69,   67,
+       66,   65,   64,   63,   62,   61,   60,   59,   58,   57,
+       56,   55,   52,   51,   34,   72,   73,   72,   72,   72,
+
+       72,   72,   73,   72,   72,   72,   72,    8,    8,    8,
+        8,    8,    8,   19,   19,   19,   19,   19,   19,   23,
+       23,   23,   23,   23,   23,   27,   50,   49,   48,   47,
+       27,   30,   30,   37,   30,   30,   30,   38,   32,   31,
+       80,   38,   40,   40,   80,   80,   40,   41,   41,   41,
+       41,   41,   41,   71,   71,   71,   71,   71,   71,   74,
+       74,   74,   74,   80,   74,   72,   72,   72,   72,   72,
+       72,    7,   80,   80,   80,   80,   80,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   80,   80
+
+    } ;
+
+static yyconst flex_int16_t yy_chk[200] =
+    {   0,
+        0,    1,    1,    1,    1,    1,    1,    1,    5,    6,
+        5,    6,    0,    0,    5,    6,    1,    2,    2,    2,
+        2,    2,    2,    2,    9,   78,    9,    2,    9,   17,
+       49,   16,    2,   16,   49,   16,   22,   22,   22,   17,
+       77,    2,    3,    3,    3,    3,    3,   76,   72,    3,
+        4,    4,    4,    4,    4,   16,   64,    4,   64,   22,
+       26,   28,   70,   28,   26,   28,   69,   68,   26,   68,
+       33,   26,   33,   26,   33,   75,   66,   75,   65,   63,
+       62,   61,   60,   59,   58,   57,   56,   55,   53,   52,
+       51,   50,   48,   47,   33,   67,   67,   67,   67,   67,
+
+       67,   71,   71,   71,   71,   71,   71,   81,   81,   81,
+       81,   81,   81,   82,   82,   82,   82,   82,   82,   83,
+       83,   83,   83,   83,   83,   84,   37,   36,   34,   32,
+       84,   85,   85,   18,   85,   85,   85,   86,   15,   14,
+        7,   86,   87,   87,    0,    0,   87,   88,   88,   88,
+       88,   88,   88,   89,   89,   89,   89,   89,   89,   90,
+       90,   90,   90,    0,   90,   91,   91,   91,   91,   91,
+       91,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   80,   80
+
+    } ;
+
+/* Table of booleans, true if rule could match eol. */
+static yyconst flex_int32_t yy_rule_can_match_eol[29] =
+    {   0,
+0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 
+    1, 0, 0, 0, 0, 0, 1, 0, 0,     };
+
+static yyconst flex_int16_t yy_rule_linenum[28] =
+    {   0,
+       60,   61,   62,   63,   65,   67,   68,   69,   70,   72,
+       77,   82,   90,  109,  112,  115,  118,  124,  126,  127,
+      150,  151,  152,  153,  154,  155,  158
+    } ;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+#line 1 "parser/lexer.l"
+#line 2 "parser/lexer.l"
+/*
+ * Copyright (C) 2013-2014 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include <utils/parser_helper.h>
+#include <parser/conf_parser.h>
+
+#include "parser.h"
+
+bool conf_parser_open_next_file(parser_helper_t *ctx);
+
+static void include_files(parser_helper_t *ctx);
+
+/* use start conditions stack */
+/* do not declare unneded functions */
+#define YY_NO_INPUT 1
+/* don't use global variables, and interact properly with bison */
+/* maintain the line number */
+/* don't generate a default rule */
+/* prefix function/variable declarations */
+/* don't change the name of the output file otherwise autotools has issues */
+/* type of our extra data */
+/* state used to scan include file patterns */
+
+/* state used to scan quoted strings */
+
+#line 661 "parser/lexer.c"
+
+#define INITIAL 0
+#define inc 1
+#define str 2
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+/* %if-c-only */
+#include <unistd.h>
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+#endif
+
+#define YY_EXTRA_TYPE parser_helper_t*
+
+/* %if-c-only Reentrant structure and macros (non-C++). */
+/* %if-reentrant */
+
+/* Holds the entire state of the reentrant scanner. */
+struct yyguts_t
+    {
+
+    /* User-defined. Not touched by flex. */
+    YY_EXTRA_TYPE yyextra_r;
+
+    /* The rest are the same as the globals declared in the non-reentrant scanner. */
+    FILE *yyin_r, *yyout_r;
+    size_t yy_buffer_stack_top; /**< index of top of stack. */
+    size_t yy_buffer_stack_max; /**< capacity of stack. */
+    YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
+    char yy_hold_char;
+    int yy_n_chars;
+    int yyleng_r;
+    char *yy_c_buf_p;
+    int yy_init;
+    int yy_start;
+    int yy_did_buffer_switch_on_eof;
+    int yy_start_stack_ptr;
+    int yy_start_stack_depth;
+    int *yy_start_stack;
+    yy_state_type yy_last_accepting_state;
+    char* yy_last_accepting_cpos;
+
+    int yylineno_r;
+    int yy_flex_debug_r;
+
+    char *yytext_r;
+    int yy_more_flag;
+    int yy_more_len;
+
+    YYSTYPE * yylval_r;
+
+    }; /* end struct yyguts_t */
+
+/* %if-c-only */
+
+static int yy_init_globals (yyscan_t yyscanner );
+
+/* %endif */
+
+/* %if-reentrant */
+
+    /* This must go here because YYSTYPE and YYLTYPE are included
+     * from bison output in section 1.*/
+    #    define yylval yyg->yylval_r
+    
+int conf_parser_lex_init (yyscan_t* scanner);
+
+int conf_parser_lex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
+
+/* %endif */
+
+/* %endif End reentrant structures and macros. */
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int conf_parser_lex_destroy (yyscan_t yyscanner );
+
+int conf_parser_get_debug (yyscan_t yyscanner );
+
+void conf_parser_set_debug (int debug_flag ,yyscan_t yyscanner );
+
+YY_EXTRA_TYPE conf_parser_get_extra (yyscan_t yyscanner );
+
+void conf_parser_set_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
+
+FILE *conf_parser_get_in (yyscan_t yyscanner );
+
+void conf_parser_set_in  (FILE * in_str ,yyscan_t yyscanner );
+
+FILE *conf_parser_get_out (yyscan_t yyscanner );
+
+void conf_parser_set_out  (FILE * out_str ,yyscan_t yyscanner );
+
+int conf_parser_get_leng (yyscan_t yyscanner );
+
+char *conf_parser_get_text (yyscan_t yyscanner );
+
+int conf_parser_get_lineno (yyscan_t yyscanner );
+
+void conf_parser_set_lineno (int line_number ,yyscan_t yyscanner );
+
+/* %if-bison-bridge */
+
+YYSTYPE * conf_parser_get_lval (yyscan_t yyscanner );
+
+void conf_parser_set_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
+
+/* %endif */
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int conf_parser_wrap (yyscan_t yyscanner );
+#else
+extern int conf_parser_wrap (yyscan_t yyscanner );
+#endif
+#endif
+
+/* %not-for-header */
+
+    static void yyunput (int c,char *buf_ptr  ,yyscan_t yyscanner);
+    
+/* %ok-for-header */
+
+/* %endif */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
+#endif
+
+#ifndef YY_NO_INPUT
+/* %if-c-only Standard (non-C++) definition */
+/* %not-for-header */
+
+#ifdef __cplusplus
+static int yyinput (yyscan_t yyscanner );
+#else
+static int input (yyscan_t yyscanner );
+#endif
+/* %ok-for-header */
+
+/* %endif */
+#endif
+
+/* %if-c-only */
+
+    static void yy_push_state (int new_state ,yyscan_t yyscanner);
+    
+    static void yy_pop_state (yyscan_t yyscanner );
+    
+    static int yy_top_state (yyscan_t yyscanner );
+    
+/* %endif */
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
+#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* %if-c-only Standard (non-C++) definition */
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+/* %endif */
+/* %if-c++-only C++ definition */
+/* %endif */
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+/* %% [5.0] fread()/read() definition of YY_INPUT goes here unless we're doing C++ \ */\
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( yyin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}\
+\
+/* %if-c++-only C++ definition \ */\
+/* %endif */
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+/* %if-c-only */
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+#endif
+
+/* %if-tables-serialization structures and prototypes */
+/* %not-for-header */
+
+/* %ok-for-header */
+
+/* %not-for-header */
+
+/* %tables-yydmap generated elements */
+/* %endif */
+/* end tables serialization structures and prototypes */
+
+/* %ok-for-header */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+/* %if-c-only Standard (non-C++) definition */
+
+extern int conf_parser_lex \
+               (YYSTYPE * yylval_param ,yyscan_t yyscanner);
+
+#define YY_DECL int conf_parser_lex \
+               (YYSTYPE * yylval_param , yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only C++ definition */
+/* %endif */
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after yytext and yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+/* %% [6.0] YY_RULE_SETUP definition goes here */
+#define YY_RULE_SETUP \
+	if ( yyleng > 0 ) \
+		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
+				(yytext[yyleng - 1] == '\n'); \
+	YY_USER_ACTION
+
+/* %not-for-header */
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+/* %% [7.0] user's declarations go here */
+#line 58 "parser/lexer.l"
+
+
+#line 976 "parser/lexer.c"
+
+    yylval = yylval_param;
+
+	if ( !yyg->yy_init )
+		{
+		yyg->yy_init = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! yyg->yy_start )
+			yyg->yy_start = 1;	/* first start state */
+
+		if ( ! yyin )
+/* %if-c-only */
+			yyin = stdin;
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+
+		if ( ! yyout )
+/* %if-c-only */
+			yyout = stdout;
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			conf_parser_ensure_buffer_stack (yyscanner);
+			YY_CURRENT_BUFFER_LVALUE =
+				conf_parser__create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
+		}
+
+		conf_parser__load_buffer_state(yyscanner );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+/* %% [8.0] yymore()-related code goes here */
+		yy_cp = yyg->yy_c_buf_p;
+
+		/* Support of yytext. */
+		*yy_cp = yyg->yy_hold_char;
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+/* %% [9.0] code to set up and find next match goes here */
+		yy_current_state = yyg->yy_start;
+		yy_current_state += YY_AT_BOL();
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				yyg->yy_last_accepting_state = yy_current_state;
+				yyg->yy_last_accepting_cpos = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 81 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 172 );
+
+yy_find_action:
+/* %% [10.0] code to find the action number goes here */
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = yyg->yy_last_accepting_cpos;
+			yy_current_state = yyg->yy_last_accepting_state;
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+/* %% [11.0] code for yylineno update goes here */
+
+		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
+			{
+			int yyl;
+			for ( yyl = 0; yyl < yyleng; ++yyl )
+				if ( yytext[yyl] == '\n' )
+					   
+    do{ yylineno++;
+        yycolumn=0;
+    }while(0)
+;
+			}
+
+do_action:	/* This label is used only to access EOF actions. */
+
+/* %% [12.0] debug code goes here */
+		if ( yy_flex_debug )
+			{
+			if ( yy_act == 0 )
+				fprintf( stderr, "--scanner backing up\n" );
+			else if ( yy_act < 28 )
+				fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n",
+				         (long)yy_rule_linenum[yy_act], yytext );
+			else if ( yy_act == 28 )
+				fprintf( stderr, "--accepting default rule (\"%s\")\n",
+				         yytext );
+			else if ( yy_act == 29 )
+				fprintf( stderr, "--(end of buffer or a NUL)\n" );
+			else
+				fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
+			}
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+/* %% [13.0] actions go here */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = yyg->yy_hold_char;
+			yy_cp = yyg->yy_last_accepting_cpos;
+			yy_current_state = yyg->yy_last_accepting_state;
+			goto yy_find_action;
+
+case 1:
+*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
+yyg->yy_c_buf_p = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up yytext again */
+YY_RULE_SETUP
+#line 60 "parser/lexer.l"
+/* eat legacy version delcaration */
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 61 "parser/lexer.l"
+return SPACES;
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 62 "parser/lexer.l"
+/* eat other whitespace */
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 63 "parser/lexer.l"
+/* eat comments */
+	YY_BREAK
+case 5:
+/* rule 5 can match eol */
+YY_RULE_SETUP
+#line 65 "parser/lexer.l"
+return NEWLINE;
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 67 "parser/lexer.l"
+return EQ;
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 68 "parser/lexer.l"
+return CONFIG_SETUP;
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 69 "parser/lexer.l"
+return CONN;
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 70 "parser/lexer.l"
+return CA;
+	YY_BREAK
+case 10:
+/* rule 10 can match eol */
+*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
+yyg->yy_c_buf_p = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up yytext again */
+YY_RULE_SETUP
+#line 72 "parser/lexer.l"
+{
+	yyextra->string_init(yyextra);
+	yy_push_state(inc, yyscanner);
+}
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 77 "parser/lexer.l"
+{
+	yyextra->string_init(yyextra);
+	yy_push_state(str, yyscanner);
+}
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 82 "parser/lexer.l"
+{
+	yylval->s = strdup(yytext);
+	return STRING;
+}
+	YY_BREAK
+
+/* we allow all characters except # and spaces, they can be escaped */
+case YY_STATE_EOF(inc):
+#line 89 "parser/lexer.l"
+case 13:
+/* rule 13 can match eol */
+YY_RULE_SETUP
+#line 90 "parser/lexer.l"
+{
+		if (*yytext)
+		{
+			switch (yytext[0])
+			{
+				case '\n':
+					/* put the newline back to fix the line numbers */
+					unput('\n');
+					yy_set_bol(0);
+					break;
+				case '#':
+					/* comments are parsed outside of this start condition */
+					unput(yytext[0]);
+					break;
+			}
+		}
+		include_files(yyextra);
+		yy_pop_state(yyscanner);
+	}
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 109 "parser/lexer.l"
+{	/* string include */
+		yy_push_state(str, yyscanner);
+	}
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 112 "parser/lexer.l"
+{
+		yyextra->string_add(yyextra, yytext);
+	}
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 115 "parser/lexer.l"
+{
+		yyextra->string_add(yyextra, yytext+1);
+	}
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 118 "parser/lexer.l"
+{
+		yyextra->string_add(yyextra, yytext);
+	}
+	YY_BREAK
+
+
+case 18:
+#line 125 "parser/lexer.l"
+case YY_STATE_EOF(str):
+#line 125 "parser/lexer.l"
+case 19:
+/* rule 19 can match eol */
+#line 127 "parser/lexer.l"
+case 20:
+/* rule 20 can match eol */
+YY_RULE_SETUP
+#line 127 "parser/lexer.l"
+{
+		if (!streq(yytext, "\""))
+		{
+			if (streq(yytext, "\n"))
+			{	/* put the newline back to fix the line numbers */
+				unput('\n');
+				yy_set_bol(0);
+			}
+			PARSER_DBG1(yyextra, "unterminated string detected");
+		}
+		if (yy_top_state(yyscanner) == inc)
+		{	/* string include */
+			include_files(yyextra);
+			yy_pop_state(yyscanner);
+			yy_pop_state(yyscanner);
+		}
+		else
+		{
+			yy_pop_state(yyscanner);
+			yylval->s = yyextra->string_get(yyextra);
+			return STRING;
+		}
+	}
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 150 "parser/lexer.l"
+yyextra->string_add(yyextra, "\n");
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 151 "parser/lexer.l"
+yyextra->string_add(yyextra, "\r");
+	YY_BREAK
+case 23:
+YY_RULE_SETUP
+#line 152 "parser/lexer.l"
+yyextra->string_add(yyextra, "\t");
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+#line 153 "parser/lexer.l"
+yyextra->string_add(yyextra, "\b");
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 154 "parser/lexer.l"
+yyextra->string_add(yyextra, "\f");
+	YY_BREAK
+case 26:
+/* rule 26 can match eol */
+YY_RULE_SETUP
+#line 155 "parser/lexer.l"
+{
+		yyextra->string_add(yyextra, yytext+1);
+	}
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+#line 158 "parser/lexer.l"
+{
+		yyextra->string_add(yyextra, yytext);
+	}
+	YY_BREAK
+
+case YY_STATE_EOF(INITIAL):
+#line 163 "parser/lexer.l"
+{
+	conf_parser_pop_buffer_state(yyscanner);
+	if (!conf_parser_open_next_file(yyextra) && !YY_CURRENT_BUFFER)
+	{
+		yyterminate();
+	}
+}
+	YY_BREAK
+case 28:
+YY_RULE_SETUP
+#line 171 "parser/lexer.l"
+YY_FATAL_ERROR( "flex scanner jammed" );
+	YY_BREAK
+#line 1331 "parser/lexer.c"
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = yyg->yy_hold_char;
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed yyin at a new source and called
+			 * conf_parser_lex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state( yyscanner );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
+
+			yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++yyg->yy_c_buf_p;
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+/* %% [14.0] code to do back-up for compressed tables and set up yy_cp goes here */
+				yy_cp = yyg->yy_c_buf_p;
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer( yyscanner ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				yyg->yy_did_buffer_switch_on_eof = 0;
+
+				if ( conf_parser_wrap(yyscanner ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * yytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! yyg->yy_did_buffer_switch_on_eof )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				yyg->yy_c_buf_p =
+					yyg->yytext_ptr + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state( yyscanner );
+
+				yy_cp = yyg->yy_c_buf_p;
+				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				yyg->yy_c_buf_p =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
+
+				yy_current_state = yy_get_previous_state( yyscanner );
+
+				yy_cp = yyg->yy_c_buf_p;
+				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of conf_parser_lex */
+/* %ok-for-header */
+
+/* %if-c++-only */
+/* %not-for-header */
+
+/* %ok-for-header */
+
+/* %endif */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+/* %if-c-only */
+static int yy_get_next_buffer (yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = yyg->yytext_ptr;
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
+
+	else
+		{
+			int num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				int new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					conf_parser_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			yyg->yy_n_chars, (size_t) num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+		}
+
+	if ( yyg->yy_n_chars == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			conf_parser_restart(yyin  ,yyscanner);
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) conf_parser_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	yyg->yy_n_chars += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+
+	yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+/* %if-c-only */
+/* %not-for-header */
+
+    static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+/* %% [15.0] code to get the start state into yy_current_state goes here */
+	yy_current_state = yyg->yy_start;
+	yy_current_state += YY_AT_BOL();
+
+	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
+		{
+/* %% [16.0] code to find the next state goes here */
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			yyg->yy_last_accepting_state = yy_current_state;
+			yyg->yy_last_accepting_cpos = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 81 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+/* %if-c-only */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+	register int yy_is_jam;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
+/* %% [17.0] code to find the next state, and perhaps do backing up, goes here */
+	register char *yy_cp = yyg->yy_c_buf_p;
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		yyg->yy_last_accepting_state = yy_current_state;
+		yyg->yy_last_accepting_cpos = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 81 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 80);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+/* %if-c-only */
+
+    static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+	register char *yy_cp;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+    yy_cp = yyg->yy_c_buf_p;
+
+	/* undo effects of setting up yytext */
+	*yy_cp = yyg->yy_hold_char;
+
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register int number_to_move = yyg->yy_n_chars + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register char *source =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			*--dest = *--source;
+
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+			YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
+
+	*--yy_cp = (char) c;
+
+/* %% [18.0] update yylineno here */
+
+    if ( c == '\n' ){
+        --yylineno;
+    }
+
+	yyg->yytext_ptr = yy_bp;
+	yyg->yy_hold_char = *yy_cp;
+	yyg->yy_c_buf_p = yy_cp;
+}
+/* %if-c-only */
+
+/* %endif */
+
+/* %if-c-only */
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (yyscan_t yyscanner)
+#else
+    static int input  (yyscan_t yyscanner)
+#endif
+
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+	int c;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	*yyg->yy_c_buf_p = yyg->yy_hold_char;
+
+	if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
+			/* This was really a NUL. */
+			*yyg->yy_c_buf_p = '\0';
+
+		else
+			{ /* need more input */
+			int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
+			++yyg->yy_c_buf_p;
+
+			switch ( yy_get_next_buffer( yyscanner ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					conf_parser_restart(yyin ,yyscanner);
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( conf_parser_wrap(yyscanner ) )
+						return EOF;
+
+					if ( ! yyg->yy_did_buffer_switch_on_eof )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput(yyscanner);
+#else
+					return input(yyscanner);
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) yyg->yy_c_buf_p;	/* cast for 8-bit char's */
+	*yyg->yy_c_buf_p = '\0';	/* preserve yytext */
+	yyg->yy_hold_char = *++yyg->yy_c_buf_p;
+
+/* %% [19.0] update BOL and yylineno */
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_at_bol )
+		   
+    do{ yylineno++;
+        yycolumn=0;
+    }while(0)
+;
+
+	return c;
+}
+/* %if-c-only */
+#endif	/* ifndef YY_NO_INPUT */
+/* %endif */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * @param yyscanner The scanner object.
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+/* %if-c-only */
+    void conf_parser_restart  (FILE * input_file , yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	if ( ! YY_CURRENT_BUFFER ){
+        conf_parser_ensure_buffer_stack (yyscanner);
+		YY_CURRENT_BUFFER_LVALUE =
+            conf_parser__create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
+	}
+
+	conf_parser__init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);
+	conf_parser__load_buffer_state(yyscanner );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * @param yyscanner The scanner object.
+ */
+/* %if-c-only */
+    void conf_parser__switch_to_buffer  (YY_BUFFER_STATE  new_buffer , yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		conf_parser_pop_buffer_state();
+	 *		conf_parser_push_buffer_state(new_buffer);
+     */
+	conf_parser_ensure_buffer_stack (yyscanner);
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*yyg->yy_c_buf_p = yyg->yy_hold_char;
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	conf_parser__load_buffer_state(yyscanner );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (conf_parser_wrap()) processing, but the only time this flag
+	 * is looked at is after conf_parser_wrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	yyg->yy_did_buffer_switch_on_eof = 1;
+}
+
+/* %if-c-only */
+static void conf_parser__load_buffer_state  (yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	yyg->yy_hold_char = *yyg->yy_c_buf_p;
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * @param yyscanner The scanner object.
+ * @return the allocated buffer state.
+ */
+/* %if-c-only */
+    YY_BUFFER_STATE conf_parser__create_buffer  (FILE * file, int  size , yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) conf_parser_alloc(sizeof( struct yy_buffer_state ) ,yyscanner );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in conf_parser__create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) conf_parser_alloc(b->yy_buf_size + 2 ,yyscanner );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in conf_parser__create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	conf_parser__init_buffer(b,file ,yyscanner);
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with conf_parser__create_buffer()
+ * @param yyscanner The scanner object.
+ */
+/* %if-c-only */
+    void conf_parser__delete_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		conf_parser_free((void *) b->yy_ch_buf ,yyscanner );
+
+	conf_parser_free((void *) b ,yyscanner );
+}
+
+/* %if-c-only */
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* %endif */
+
+/* %if-c++-only */
+/* %endif */
+
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a conf_parser_restart() or at EOF.
+ */
+/* %if-c-only */
+    static void conf_parser__init_buffer  (YY_BUFFER_STATE  b, FILE * file , yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+
+{
+	int oerrno = errno;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	conf_parser__flush_buffer(b ,yyscanner);
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then conf_parser__init_buffer was _probably_
+     * called from conf_parser_restart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+/* %if-c-only */
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * @param yyscanner The scanner object.
+ */
+/* %if-c-only */
+    void conf_parser__flush_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		conf_parser__load_buffer_state(yyscanner );
+}
+
+/* %if-c-or-c++ */
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  @param yyscanner The scanner object.
+ */
+/* %if-c-only */
+void conf_parser_push_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	if (new_buffer == NULL)
+		return;
+
+	conf_parser_ensure_buffer_stack(yyscanner);
+
+	/* This block is copied from conf_parser__switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*yyg->yy_c_buf_p = yyg->yy_hold_char;
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		yyg->yy_buffer_stack_top++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from conf_parser__switch_to_buffer. */
+	conf_parser__load_buffer_state(yyscanner );
+	yyg->yy_did_buffer_switch_on_eof = 1;
+}
+/* %endif */
+
+/* %if-c-or-c++ */
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  @param yyscanner The scanner object.
+ */
+/* %if-c-only */
+void conf_parser_pop_buffer_state (yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	if (!YY_CURRENT_BUFFER)
+		return;
+
+	conf_parser__delete_buffer(YY_CURRENT_BUFFER ,yyscanner);
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if (yyg->yy_buffer_stack_top > 0)
+		--yyg->yy_buffer_stack_top;
+
+	if (YY_CURRENT_BUFFER) {
+		conf_parser__load_buffer_state(yyscanner );
+		yyg->yy_did_buffer_switch_on_eof = 1;
+	}
+}
+/* %endif */
+
+/* %if-c-or-c++ */
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+/* %if-c-only */
+static void conf_parser_ensure_buffer_stack (yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+	int num_to_alloc;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	if (!yyg->yy_buffer_stack) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		yyg->yy_buffer_stack = (struct yy_buffer_state**)conf_parser_alloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								, yyscanner);
+		if ( ! yyg->yy_buffer_stack )
+			YY_FATAL_ERROR( "out of dynamic memory in conf_parser_ensure_buffer_stack()" );
+								  
+		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		yyg->yy_buffer_stack_max = num_to_alloc;
+		yyg->yy_buffer_stack_top = 0;
+		return;
+	}
+
+	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
+		yyg->yy_buffer_stack = (struct yy_buffer_state**)conf_parser_realloc
+								(yyg->yy_buffer_stack,
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								, yyscanner);
+		if ( ! yyg->yy_buffer_stack )
+			YY_FATAL_ERROR( "out of dynamic memory in conf_parser_ensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
+		yyg->yy_buffer_stack_max = num_to_alloc;
+	}
+}
+/* %endif */
+
+/* %if-c-only */
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * @param yyscanner The scanner object.
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE conf_parser__scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) conf_parser_alloc(sizeof( struct yy_buffer_state ) ,yyscanner );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in conf_parser__scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	conf_parser__switch_to_buffer(b ,yyscanner );
+
+	return b;
+}
+/* %endif */
+
+/* %if-c-only */
+/** Setup the input buffer state to scan a string. The next call to conf_parser_lex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * @param yyscanner The scanner object.
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       conf_parser__scan_bytes() instead.
+ */
+YY_BUFFER_STATE conf_parser__scan_string (yyconst char * yystr , yyscan_t yyscanner)
+{
+    
+	return conf_parser__scan_bytes(yystr,strlen(yystr) ,yyscanner);
+}
+/* %endif */
+
+/* %if-c-only */
+/** Setup the input buffer state to scan the given bytes. The next call to conf_parser_lex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yyscanner The scanner object.
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE conf_parser__scan_bytes  (yyconst char * yybytes, int  _yybytes_len , yyscan_t yyscanner)
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) conf_parser_alloc(n ,yyscanner );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in conf_parser__scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = conf_parser__scan_buffer(buf,n ,yyscanner);
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in conf_parser__scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+/* %endif */
+
+/* %if-c-only */
+    static void yy_push_state (int  new_state , yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	if ( yyg->yy_start_stack_ptr >= yyg->yy_start_stack_depth )
+		{
+		yy_size_t new_size;
+
+		yyg->yy_start_stack_depth += YY_START_STACK_INCR;
+		new_size = yyg->yy_start_stack_depth * sizeof( int );
+
+		if ( ! yyg->yy_start_stack )
+			yyg->yy_start_stack = (int *) conf_parser_alloc(new_size ,yyscanner );
+
+		else
+			yyg->yy_start_stack = (int *) conf_parser_realloc((void *) yyg->yy_start_stack,new_size ,yyscanner );
+
+		if ( ! yyg->yy_start_stack )
+			YY_FATAL_ERROR( "out of memory expanding start-condition stack" );
+		}
+
+	yyg->yy_start_stack[yyg->yy_start_stack_ptr++] = YY_START;
+
+	BEGIN(new_state);
+}
+
+/* %if-c-only */
+    static void yy_pop_state  (yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	if ( --yyg->yy_start_stack_ptr < 0 )
+		YY_FATAL_ERROR( "start-condition stack underflow" );
+
+	BEGIN(yyg->yy_start_stack[yyg->yy_start_stack_ptr]);
+}
+
+/* %if-c-only */
+    static int yy_top_state  (yyscan_t yyscanner)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	return yyg->yy_start_stack[yyg->yy_start_stack_ptr - 1];
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+/* %if-c-only */
+static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yytext[yyleng] = yyg->yy_hold_char; \
+		yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
+		yyg->yy_hold_char = *yyg->yy_c_buf_p; \
+		*yyg->yy_c_buf_p = '\0'; \
+		yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/* %if-c-only */
+/* %if-reentrant */
+
+/** Get the user-defined data for this scanner.
+ * @param yyscanner The scanner object.
+ */
+YY_EXTRA_TYPE conf_parser_get_extra  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyextra;
+}
+
+/* %endif */
+
+/** Get the current line number.
+ * @param yyscanner The scanner object.
+ */
+int conf_parser_get_lineno  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    
+        if (! YY_CURRENT_BUFFER)
+            return 0;
+    
+    return yylineno;
+}
+
+/** Get the current column number.
+ * @param yyscanner The scanner object.
+ */
+int conf_parser_get_column  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    
+        if (! YY_CURRENT_BUFFER)
+            return 0;
+    
+    return yycolumn;
+}
+
+/** Get the input stream.
+ * @param yyscanner The scanner object.
+ */
+FILE *conf_parser_get_in  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyin;
+}
+
+/** Get the output stream.
+ * @param yyscanner The scanner object.
+ */
+FILE *conf_parser_get_out  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyout;
+}
+
+/** Get the length of the current token.
+ * @param yyscanner The scanner object.
+ */
+int conf_parser_get_leng  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyleng;
+}
+
+/** Get the current token.
+ * @param yyscanner The scanner object.
+ */
+
+char *conf_parser_get_text  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yytext;
+}
+
+/* %if-reentrant */
+
+/** Set the user-defined data. This data is never touched by the scanner.
+ * @param user_defined The data to be associated with this scanner.
+ * @param yyscanner The scanner object.
+ */
+void conf_parser_set_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yyextra = user_defined ;
+}
+
+/* %endif */
+
+/** Set the current line number.
+ * @param line_number
+ * @param yyscanner The scanner object.
+ */
+void conf_parser_set_lineno (int  line_number , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+        /* lineno is only valid if an input buffer exists. */
+        if (! YY_CURRENT_BUFFER )
+           yy_fatal_error( "conf_parser_set_lineno called with no buffer" , yyscanner); 
+    
+    yylineno = line_number;
+}
+
+/** Set the current column.
+ * @param line_number
+ * @param yyscanner The scanner object.
+ */
+void conf_parser_set_column (int  column_no , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+        /* column is only valid if an input buffer exists. */
+        if (! YY_CURRENT_BUFFER )
+           yy_fatal_error( "conf_parser_set_column called with no buffer" , yyscanner); 
+    
+    yycolumn = column_no;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * @param yyscanner The scanner object.
+ * @see conf_parser__switch_to_buffer
+ */
+void conf_parser_set_in (FILE *  in_str , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yyin = in_str ;
+}
+
+void conf_parser_set_out (FILE *  out_str , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yyout = out_str ;
+}
+
+int conf_parser_get_debug  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yy_flex_debug;
+}
+
+void conf_parser_set_debug (int  bdebug , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yy_flex_debug = bdebug ;
+}
+
+/* %endif */
+
+/* %if-reentrant */
+/* Accessor methods for yylval and yylloc */
+
+/* %if-bison-bridge */
+
+YYSTYPE * conf_parser_get_lval  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yylval;
+}
+
+void conf_parser_set_lval (YYSTYPE *  yylval_param , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yylval = yylval_param;
+}
+
+/* %endif */
+
+/* User-visible API */
+
+/* conf_parser_lex_init is special because it creates the scanner itself, so it is
+ * the ONLY reentrant function that doesn't take the scanner as the last argument.
+ * That's why we explicitly handle the declaration, instead of using our macros.
+ */
+
+int conf_parser_lex_init(yyscan_t* ptr_yy_globals)
+
+{
+    if (ptr_yy_globals == NULL){
+        errno = EINVAL;
+        return 1;
+    }
+
+    *ptr_yy_globals = (yyscan_t) conf_parser_alloc ( sizeof( struct yyguts_t ), NULL );
+
+    if (*ptr_yy_globals == NULL){
+        errno = ENOMEM;
+        return 1;
+    }
+
+    /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */
+    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
+
+    return yy_init_globals ( *ptr_yy_globals );
+}
+
+/* conf_parser_lex_init_extra has the same functionality as conf_parser_lex_init, but follows the
+ * convention of taking the scanner as the last argument. Note however, that
+ * this is a *pointer* to a scanner, as it will be allocated by this call (and
+ * is the reason, too, why this function also must handle its own declaration).
+ * The user defined value in the first argument will be available to conf_parser_alloc in
+ * the yyextra field.
+ */
+
+int conf_parser_lex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
+
+{
+    struct yyguts_t dummy_yyguts;
+
+    conf_parser_set_extra (yy_user_defined, &dummy_yyguts);
+
+    if (ptr_yy_globals == NULL){
+        errno = EINVAL;
+        return 1;
+    }
+	
+    *ptr_yy_globals = (yyscan_t) conf_parser_alloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
+	
+    if (*ptr_yy_globals == NULL){
+        errno = ENOMEM;
+        return 1;
+    }
+    
+    /* By setting to 0xAA, we expose bugs in
+    yy_init_globals. Leave at 0x00 for releases. */
+    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
+    
+    conf_parser_set_extra (yy_user_defined, *ptr_yy_globals);
+    
+    return yy_init_globals ( *ptr_yy_globals );
+}
+
+/* %endif if-c-only */
+
+/* %if-c-only */
+static int yy_init_globals (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from conf_parser_lex_destroy(), so don't allocate here.
+     */
+
+    yyg->yy_buffer_stack = 0;
+    yyg->yy_buffer_stack_top = 0;
+    yyg->yy_buffer_stack_max = 0;
+    yyg->yy_c_buf_p = (char *) 0;
+    yyg->yy_init = 0;
+    yyg->yy_start = 0;
+
+    yyg->yy_start_stack_ptr = 0;
+    yyg->yy_start_stack_depth = 0;
+    yyg->yy_start_stack =  NULL;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
+#else
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * conf_parser_lex_init()
+     */
+    return 0;
+}
+/* %endif */
+
+/* %if-c-only SNIP! this currently causes conflicts with the c++ scanner */
+/* conf_parser_lex_destroy is for both reentrant and non-reentrant scanners. */
+int conf_parser_lex_destroy  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		conf_parser__delete_buffer(YY_CURRENT_BUFFER ,yyscanner );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		conf_parser_pop_buffer_state(yyscanner);
+	}
+
+	/* Destroy the stack itself. */
+	conf_parser_free(yyg->yy_buffer_stack ,yyscanner);
+	yyg->yy_buffer_stack = NULL;
+
+    /* Destroy the start condition stack. */
+        conf_parser_free(yyg->yy_start_stack ,yyscanner );
+        yyg->yy_start_stack = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * conf_parser_lex() is called, initialization will occur. */
+    yy_init_globals( yyscanner);
+
+/* %if-reentrant */
+    /* Destroy the main struct (reentrant only). */
+    conf_parser_free ( yyscanner , yyscanner );
+    yyscanner = NULL;
+/* %endif */
+    return 0;
+}
+/* %endif */
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *conf_parser_alloc (yy_size_t  size , yyscan_t yyscanner)
+{
+	return (void *) malloc( size );
+}
+
+void *conf_parser_realloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void conf_parser_free (void * ptr , yyscan_t yyscanner)
+{
+	free( (char *) ptr );	/* see conf_parser_realloc() for (char *) cast */
+}
+
+/* %if-tables-serialization definitions */
+/* %define-yytables   The name for this specific scanner's tables. */
+#define YYTABLES_NAME "yytables"
+/* %endif */
+
+/* %ok-for-header */
+
+#line 171 "parser/lexer.l"
+
+
+
+/**
+ * Open the next file, if any is queued and readable, otherwise returns FALSE.
+ */
+bool conf_parser_open_next_file(parser_helper_t *ctx)
+{
+	FILE *file;
+
+	file = ctx->file_next(ctx);
+	if (!file)
+	{
+		return FALSE;
+	}
+
+	conf_parser_set_in(file, ctx->scanner);
+	conf_parser_push_buffer_state(
+			conf_parser__create_buffer(file, YY_BUF_SIZE,
+									   ctx->scanner), ctx->scanner);
+	return TRUE;
+}
+
+/**
+ * Assumes that the file pattern to include is currently stored as string on
+ * the helper object.
+ */
+static void include_files(parser_helper_t *ctx)
+{
+	char *pattern = ctx->string_get(ctx);
+
+	ctx->file_include(ctx, pattern);
+	free(pattern);
+
+	conf_parser_open_next_file(ctx);
+}
+
diff --git a/src/starter/parser/lexer.l b/src/starter/parser/lexer.l
new file mode 100644
index 000000000..a88cbe809
--- /dev/null
+++ b/src/starter/parser/lexer.l
@@ -0,0 +1,205 @@
+%{
+/*
+ * Copyright (C) 2013-2014 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include <utils/parser_helper.h>
+#include <parser/conf_parser.h>
+
+#include "parser.h"
+
+bool conf_parser_open_next_file(parser_helper_t *ctx);
+
+static void include_files(parser_helper_t *ctx);
+
+%}
+%option debug
+%option warn
+
+/* use start conditions stack */
+%option stack
+
+/* do not declare unneded functions */
+%option noinput noyywrap
+
+/* don't use global variables, and interact properly with bison */
+%option reentrant bison-bridge
+
+/* maintain the line number */
+%option yylineno
+
+/* don't generate a default rule */
+%option nodefault
+
+/* prefix function/variable declarations */
+%option prefix="conf_parser_"
+/* don't change the name of the output file otherwise autotools has issues */
+%option outfile="lex.yy.c"
+
+/* type of our extra data */
+%option extra-type="parser_helper_t*"
+
+/* state used to scan include file patterns */
+%x inc
+/* state used to scan quoted strings */
+%x str
+
+%%
+
+^[\t ]*"version"[^\n]*$	/* eat legacy version delcaration */
+^[\t ]+					return SPACES;
+[\t ]+					/* eat other whitespace */
+[\t ]*#[^\n]*			/* eat comments */
+
+\n						return NEWLINE;
+
+"="						return EQ;
+^"config setup"			return CONFIG_SETUP;
+^"conn"					return CONN;
+^"ca"					return CA;
+
+"include"[\t ]+/[^=]	{
+	yyextra->string_init(yyextra);
+	yy_push_state(inc, yyscanner);
+}
+
+"\""					{
+	yyextra->string_init(yyextra);
+	yy_push_state(str, yyscanner);
+}
+
+(@#)?[^\"#= \t\n]+			{
+	yylval->s = strdup(yytext);
+	return STRING;
+}
+
+<inc>{
+	/* we allow all characters except # and spaces, they can be escaped */
+	<<EOF>>				|
+	[#\n\t ]			{
+		if (*yytext)
+		{
+			switch (yytext[0])
+			{
+				case '\n':
+					/* put the newline back to fix the line numbers */
+					unput('\n');
+					yy_set_bol(0);
+					break;
+				case '#':
+					/* comments are parsed outside of this start condition */
+					unput(yytext[0]);
+					break;
+			}
+		}
+		include_files(yyextra);
+		yy_pop_state(yyscanner);
+	}
+	"\""				{	/* string include */
+		yy_push_state(str, yyscanner);
+	}
+	\\					{
+		yyextra->string_add(yyextra, yytext);
+	}
+	\\["#} ]			{
+		yyextra->string_add(yyextra, yytext+1);
+	}
+	[^"\\#\n\t ]+ {
+		yyextra->string_add(yyextra, yytext);
+	}
+}
+
+<str>{
+	"\""				|
+	<<EOF>>				|
+	\n					|
+	\\					{
+		if (!streq(yytext, "\""))
+		{
+			if (streq(yytext, "\n"))
+			{	/* put the newline back to fix the line numbers */
+				unput('\n');
+				yy_set_bol(0);
+			}
+			PARSER_DBG1(yyextra, "unterminated string detected");
+		}
+		if (yy_top_state(yyscanner) == inc)
+		{	/* string include */
+			include_files(yyextra);
+			yy_pop_state(yyscanner);
+			yy_pop_state(yyscanner);
+		}
+		else
+		{
+			yy_pop_state(yyscanner);
+			yylval->s = yyextra->string_get(yyextra);
+			return STRING;
+		}
+	}
+	\\n     yyextra->string_add(yyextra, "\n");
+	\\r     yyextra->string_add(yyextra, "\r");
+	\\t     yyextra->string_add(yyextra, "\t");
+	\\b     yyextra->string_add(yyextra, "\b");
+	\\f     yyextra->string_add(yyextra, "\f");
+	\\(.|\n)			{
+		yyextra->string_add(yyextra, yytext+1);
+	}
+	[^\\\n"]+			{
+		yyextra->string_add(yyextra, yytext);
+	}
+}
+
+<<EOF>>					{
+	conf_parser_pop_buffer_state(yyscanner);
+	if (!conf_parser_open_next_file(yyextra) && !YY_CURRENT_BUFFER)
+	{
+		yyterminate();
+	}
+}
+
+%%
+
+/**
+ * Open the next file, if any is queued and readable, otherwise returns FALSE.
+ */
+bool conf_parser_open_next_file(parser_helper_t *ctx)
+{
+	FILE *file;
+
+	file = ctx->file_next(ctx);
+	if (!file)
+	{
+		return FALSE;
+	}
+
+	conf_parser_set_in(file, ctx->scanner);
+	conf_parser_push_buffer_state(
+			conf_parser__create_buffer(file, YY_BUF_SIZE,
+									   ctx->scanner), ctx->scanner);
+	return TRUE;
+}
+
+/**
+ * Assumes that the file pattern to include is currently stored as string on
+ * the helper object.
+ */
+static void include_files(parser_helper_t *ctx)
+{
+	char *pattern = ctx->string_get(ctx);
+
+	ctx->file_include(ctx, pattern);
+	free(pattern);
+
+	conf_parser_open_next_file(ctx);
+}
diff --git a/src/starter/parser.c b/src/starter/parser/parser.c
index 1e6e180d6..8cf3fe19e 100644
--- a/src/starter/parser.c
+++ b/src/starter/parser/parser.c
@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
+/* A Bison parser, made by GNU Bison 3.0.2.  */
 
 /* Bison implementation for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
-   
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -44,13 +44,13 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.7.12-4996"
+#define YYBISON_VERSION "3.0.2"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
 /* Pure parsers.  */
-#define YYPURE 0
+#define YYPURE 1
 
 /* Push parsers.  */
 #define YYPUSH 0
@@ -59,14 +59,20 @@
 #define YYPULL 1
 
 
+/* Substitute the variable and function names.  */
+#define yyparse         conf_parser_parse
+#define yylex           conf_parser_lex
+#define yyerror         conf_parser_error
+#define yydebug         conf_parser_debug
+#define yynerrs         conf_parser_nerrs
 
 
 /* Copy the first part of user declarations.  */
-/* Line 371 of yacc.c  */
-#line 1 "parser.y"
+#line 1 "parser/parser.y" /* yacc.c:339  */
 
-/* strongSwan config file parser (parser.y)
- * Copyright (C) 2001 Mathieu Lafon - Arkoon Network Security
+/*
+ * Copyright (C) 2013-2014 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -79,49 +85,53 @@
  * for more details.
  */
 
+#define _GNU_SOURCE /* for asprintf() */
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
-#include <library.h>
-#include <utils/debug.h>
+#include <utils/parser_helper.h>
+#include <settings/settings_types.h>
+#include <parser/conf_parser.h>
 
-#include "ipsec-parser.h"
+#include "parser.h"
 
-#define YYERROR_VERBOSE
-#define ERRSTRING_LEN   256
+#define YYDEBUG 1
 
 /**
- * Bison
+ * Defined by the lexer
  */
-static char parser_errstring[ERRSTRING_LEN+1];
-
-extern void yyerror(const char *s);
-extern int yylex (void);
-extern void _parser_y_error(char *b, int size, const char *s);
+int conf_parser_lex(YYSTYPE *lvalp, void *scanner);
+int conf_parser_lex_init_extra(parser_helper_t *extra, void *scanner);
+int conf_parser_lex_destroy(void *scanner);
+int conf_parser_set_in(FILE *in, void *scanner);
+void conf_parser_set_debug(int debug, void *scanner);
+char *conf_parser_get_text(void *scanner);
+int conf_parser_get_leng(void *scanner);
+int conf_parser_get_lineno(void *scanner);
+/* Custom functions in lexer */
+bool conf_parser_open_next_file(parser_helper_t *ctx);
 
 /**
- * Static Globals
+ * Forward declaration
  */
-static int _save_errors_;
-static config_parsed_t *_parser_cfg;
-static kw_list_t **_parser_kw, *_parser_kw_last;
-static char errbuf[ERRSTRING_LEN+1];
+static void conf_parser_error(parser_helper_t *ctx, const char *s);
 
 /**
- * Gperf
+ * Make sure to call lexer with the proper context
  */
-extern kw_entry_t *in_word_set (char *str, unsigned int len);
+#undef yylex
+static int yylex(YYSTYPE *lvalp, parser_helper_t *ctx)
+{
+	return conf_parser_lex(lvalp, ctx->scanner);
+}
 
 
-/* Line 371 of yacc.c  */
-#line 119 "parser.c"
+#line 129 "parser/parser.c" /* yacc.c:339  */
 
-# ifndef YY_NULL
+# ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULL nullptr
+#   define YY_NULLPTR nullptr
 #  else
-#   define YY_NULL 0
+#   define YY_NULLPTR 0
 #  endif
 # endif
 
@@ -130,90 +140,69 @@ extern kw_entry_t *in_word_set (char *str, unsigned int len);
 # undef YYERROR_VERBOSE
 # define YYERROR_VERBOSE 1
 #else
-# define YYERROR_VERBOSE 0
+# define YYERROR_VERBOSE 1
 #endif
 
 /* In a future release of Bison, this section will be replaced
    by #include "y.tab.h".  */
-#ifndef YY_YY_PARSER_H_INCLUDED
-# define YY_YY_PARSER_H_INCLUDED
-/* Enabling traces.  */
+#ifndef YY_CONF_PARSER_PARSER_PARSER_H_INCLUDED
+# define YY_CONF_PARSER_PARSER_PARSER_H_INCLUDED
+/* Debug traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 0
+# define YYDEBUG 1
 #endif
 #if YYDEBUG
-extern int yydebug;
+extern int conf_parser_debug;
 #endif
 
-/* Tokens.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     EQUAL = 258,
-     FIRST_SPACES = 259,
-     EOL = 260,
-     CONFIG = 261,
-     SETUP = 262,
-     CONN = 263,
-     CA = 264,
-     INCLUDE = 265,
-     FILE_VERSION = 266,
-     STRING = 267
-   };
+  enum yytokentype
+  {
+    STRING = 258,
+    EQ = 259,
+    SPACES = 260,
+    NEWLINE = 261,
+    CONFIG_SETUP = 262,
+    CONN = 263,
+    CA = 264
+  };
 #endif
 /* Tokens.  */
-#define EQUAL 258
-#define FIRST_SPACES 259
-#define EOL 260
-#define CONFIG 261
-#define SETUP 262
+#define STRING 258
+#define EQ 259
+#define SPACES 260
+#define NEWLINE 261
+#define CONFIG_SETUP 262
 #define CONN 263
 #define CA 264
-#define INCLUDE 265
-#define FILE_VERSION 266
-#define STRING 267
-
-
 
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
 {
-/* Line 387 of yacc.c  */
-#line 52 "parser.y"
- char *s; 
+#line 71 "parser/parser.y" /* yacc.c:355  */
+
+	char *s;
+	conf_parser_section_t t;
 
-/* Line 387 of yacc.c  */
-#line 189 "parser.c"
-} YYSTYPE;
+#line 192 "parser/parser.c" /* yacc.c:355  */
+};
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
-extern YYSTYPE yylval;
 
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
-#endif /* !YY_YY_PARSER_H_INCLUDED  */
+int conf_parser_parse (parser_helper_t *ctx);
+
+#endif /* !YY_CONF_PARSER_PARSER_PARSER_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
-/* Line 390 of yacc.c  */
-#line 217 "parser.c"
+#line 206 "parser/parser.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -227,11 +216,8 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
 #else
-typedef short int yytype_int8;
+typedef signed char yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -251,8 +237,7 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -274,11 +259,30 @@ typedef short int yytype_int16;
 # endif
 #endif
 
-#ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later.  */
-# if (! defined __GNUC__ || __GNUC__ < 2 \
-      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
-#  define __attribute__(Spec) /* empty */
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
 # endif
 #endif
 
@@ -289,25 +293,26 @@ typedef short int yytype_int16;
 # define YYUSE(E) /* empty */
 #endif
 
-
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(N) (N)
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
 #else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
-    int yyi;
+# define YY_INITIAL_VALUE(Value) Value
 #endif
-{
-  return yyi;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
+
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
@@ -325,8 +330,7 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
       /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
 #     ifndef EXIT_SUCCESS
@@ -338,8 +342,8 @@ YYID (yyi)
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely
@@ -355,7 +359,7 @@ YYID (yyi)
 #  endif
 #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   ifndef EXIT_SUCCESS
 #    define EXIT_SUCCESS 0
@@ -363,15 +367,13 @@ YYID (yyi)
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc && ! defined EXIT_SUCCESS
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && ! defined EXIT_SUCCESS
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -381,7 +383,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
@@ -406,16 +408,16 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
 
 #endif
 
@@ -434,7 +436,7 @@ union yyalloc
           for (yyi = 0; yyi < (Count); yyi++)   \
             (Dst)[yyi] = (Src)[yyi];            \
         }                                       \
-      while (YYID (0))
+      while (0)
 #  endif
 # endif
 #endif /* !YYCOPY_NEEDED */
@@ -442,25 +444,27 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   27
+#define YYLAST   11
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  13
+#define YYNTOKENS  10
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  9
+#define YYNNTS  8
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  18
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  34
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  19
 
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   267
+#define YYMAXUTOK   264
 
-#define YYTRANSLATE(YYX)						\
+#define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -489,165 +493,124 @@ static const yytype_uint8 yytranslate[] =
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12
+       5,     6,     7,     8,     9
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint8 yyprhs[] =
-{
-       0,     0,     3,     6,     7,    11,    12,    18,    19,    25,
-      26,    32,    33,    38,    40,    45,    46,    50,    53
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      14,     0,    -1,    14,    15,    -1,    -1,    11,    12,     5,
-      -1,    -1,     6,     7,     5,    16,    20,    -1,    -1,     8,
-      12,     5,    17,    20,    -1,    -1,     9,    12,     5,    18,
-      20,    -1,    -1,    10,    12,    19,     5,    -1,     5,    -1,
-       4,    21,     5,    20,    -1,    -1,    12,     3,    12,    -1,
-      12,     3,    -1,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    63,    63,    64,    68,    73,    72,    78,    77,    94,
-      93,   109,   108,   114,   118,   119,   123,   148,   152
+       0,    97,    97,    99,   100,   104,   105,   109,   123,   128,
+     133,   141,   144,   150,   153,   166,   178,   187,   188
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+#if YYDEBUG || YYERROR_VERBOSE || 1
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "EQUAL", "FIRST_SPACES", "EOL", "CONFIG",
-  "SETUP", "CONN", "CA", "INCLUDE", "FILE_VERSION", "STRING", "$accept",
-  "config_file", "section_or_include", "$@1", "$@2", "$@3", "$@4",
-  "kw_section", "statement_kw", YY_NULL
+  "$end", "error", "$undefined", "STRING", "EQ", "SPACES", "NEWLINE",
+  "CONFIG_SETUP", "CONN", "CA", "$accept", "statements", "statement",
+  "section", "section_type", "section_name", "setting", "value", YY_NULLPTR
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum[] =
 {
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264
 };
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
+#define YYPACT_NINF -3
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-3)))
+
+#define YYTABLE_NINF -1
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int8 yypact[] =
 {
-       0,    13,    14,    14,    15,    16,    15,    17,    15,    18,
-      15,    19,    15,    15,    20,    20,    21,    21,    21
+      -3,     0,    -3,    -2,    -3,    -3,    -3,    -3,    -3,    -3,
+      -1,     6,    -3,    -3,    -3,     1,    -3,     8,    -3
 };
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint8 yydefact[] =
 {
-       0,     2,     2,     0,     3,     0,     5,     0,     5,     0,
-       5,     0,     4,     1,     4,     0,     3,     2,     0
+       2,     0,     1,    13,     3,     8,     9,    10,     4,     5,
+      11,    16,     6,    12,     7,    15,    17,    14,    18
 };
 
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const yytype_uint8 yydefact[] =
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
 {
-       3,     0,     1,    13,     0,     0,     0,     0,     0,     2,
-       0,     0,     0,    11,     0,     5,     7,     9,     0,     4,
-      15,    15,    15,    12,    18,     6,     8,    10,     0,     0,
-      17,    15,    16,    14
+      -3,    -3,    -3,    -3,    -3,    -3,    -3,    -3
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
+  /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -1,     1,     9,    20,    21,    22,    18,    25,    29
+      -1,     1,     8,     9,    10,    14,    12,    17
 };
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -20
-static const yytype_int8 yypact[] =
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+static const yytype_uint8 yytable[] =
 {
-     -20,     0,   -20,   -20,    -6,    -8,    -5,     1,     2,   -20,
-      10,    11,    12,   -20,    13,   -20,   -20,   -20,    14,   -20,
-      16,    16,    16,   -20,     9,   -20,   -20,   -20,    19,    18,
-      15,    16,   -20,   -20
+       2,    11,    13,     0,    16,     3,     4,     5,     6,     7,
+      15,    18
 };
 
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int8 yypgoto[] =
+static const yytype_int8 yycheck[] =
 {
-     -20,   -20,   -20,   -20,   -20,   -20,   -20,   -19,   -20
+       0,     3,     3,    -1,     3,     5,     6,     7,     8,     9,
+       4,     3
 };
 
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -1
-static const yytype_uint8 yytable[] =
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
 {
-       2,    10,    26,    27,    11,     3,     4,    12,     5,     6,
-       7,     8,    33,    13,    14,    15,    16,    17,    19,    23,
-      24,    28,    30,    31,     0,     0,     0,    32
+       0,    11,     0,     5,     6,     7,     8,     9,    12,    13,
+      14,     3,    16,     3,    15,     4,     3,    17,     3
 };
 
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-20)))
-
-#define yytable_value_is_error(Yytable_value) \
-  YYID (0)
-
-static const yytype_int8 yycheck[] =
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
 {
-       0,     7,    21,    22,    12,     5,     6,    12,     8,     9,
-      10,    11,    31,    12,    12,     5,     5,     5,     5,     5,
-       4,    12,     3,     5,    -1,    -1,    -1,    12
+       0,    10,    11,    11,    11,    12,    12,    13,    14,    14,
+      14,    15,    15,    16,    16,    16,    16,    17,    17
 };
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
 {
-       0,    14,     0,     5,     6,     8,     9,    10,    11,    15,
-       7,    12,    12,    12,    12,     5,     5,     5,    19,     5,
-      16,    17,    18,     5,     4,    20,    20,    20,    12,    21,
-       3,     5,    12,    20
+       0,     2,     0,     2,     2,     1,     2,     2,     1,     1,
+       1,     0,     1,     0,     3,     2,     1,     1,     2
 };
 
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
-
-#define YYFAIL		goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -663,28 +626,16 @@ do                                                              \
     }                                                           \
   else                                                          \
     {                                                           \
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;							\
-    }								\
-while (YYID (0))
+      yyerror (ctx, YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
 
 /* Error token number */
-#define YYTERROR	1
-#define YYERRCODE	256
+#define YYTERROR        1
+#define YYERRCODE       256
 
 
-/* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -694,50 +645,45 @@ while (YYID (0))
 #  define YYFPRINTF fprintf
 # endif
 
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (YYID (0))
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value, ctx); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
 static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, parser_helper_t *ctx)
 {
   FILE *yyo = yyoutput;
   YYUSE (yyo);
+  YYUSE (ctx);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
 # endif
   YYUSE (yytype);
 }
@@ -747,24 +693,13 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, parser_helper_t *ctx)
 {
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, ctx);
   YYFPRINTF (yyoutput, ")");
 }
 
@@ -773,16 +708,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
-#endif
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -793,49 +720,42 @@ yy_stack_print (yybottom, yytop)
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
 static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, parser_helper_t *ctx)
 {
+  unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	     yyrule - 1, yylno);
+             yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              , ctx);
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule, ctx); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -849,7 +769,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -872,15 +792,8 @@ int yydebug;
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
 {
   YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
@@ -896,16 +809,8 @@ yystrlen (yystr)
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
 {
   char *yyd = yydest;
   const char *yys = yysrc;
@@ -935,27 +840,27 @@ yytnamerr (char *yyres, const char *yystr)
       char const *yyp = yystr;
 
       for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyres[yyn] = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
 
@@ -978,11 +883,11 @@ static int
 yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                 yytype_int16 *yyssp, int yytoken)
 {
-  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
-  const char *yyformat = YY_NULL;
+  const char *yyformat = YY_NULLPTR;
   /* Arguments of yyformat. */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
   /* Number of reported tokens (one for the "unexpected", one per
@@ -990,10 +895,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
   int yycount = 0;
 
   /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
      - If this state is a consistent state with a default action, then
        the only way this function was invoked is if the default action
        is an error action.  In that case, don't check for expected
@@ -1043,7 +944,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                   }
                 yyarg[yycount++] = yytname[yyx];
                 {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
                   if (! (yysize <= yysize1
                          && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
                     return 2;
@@ -1110,83 +1011,73 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, parser_helper_t *ctx)
 {
   YYUSE (yyvaluep);
-
+  YYUSE (ctx);
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  switch (yytype)
+    {
+          case 3: /* STRING  */
+#line 86 "parser/parser.y" /* yacc.c:1257  */
+      { free(((*yyvaluep).s)); }
+#line 1030 "parser/parser.c" /* yacc.c:1257  */
+        break;
+
+    case 15: /* section_name  */
+#line 86 "parser/parser.y" /* yacc.c:1257  */
+      { free(((*yyvaluep).s)); }
+#line 1036 "parser/parser.c" /* yacc.c:1257  */
+        break;
+
+    case 17: /* value  */
+#line 86 "parser/parser.y" /* yacc.c:1257  */
+      { free(((*yyvaluep).s)); }
+#line 1042 "parser/parser.c" /* yacc.c:1257  */
+        break;
+
+
+      default:
+        break;
+    }
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
 
 
+/*----------.
+| yyparse.  |
+`----------*/
+
+int
+yyparse (parser_helper_t *ctx)
+{
 /* The lookahead symbol.  */
 int yychar;
 
 
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-
 /* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
-
-/* Number of syntax errors so far.  */
-int yynerrs;
+/* Default value used for initialization, for pacifying older GCCs
+   or non-GCC compilers.  */
+YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
+YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
+    /* Number of syntax errors so far.  */
+    int yynerrs;
 
-/*----------.
-| yyparse.  |
-`----------*/
-
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
-{
     int yystate;
     /* Number of tokens to shift before error messages enabled.  */
     int yyerrstatus;
 
     /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
+       'yyss': related to states.
+       'yyvs': related to semantic values.
 
        Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
@@ -1254,23 +1145,23 @@ yyparse ()
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack.  Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
@@ -1278,22 +1169,22 @@ yyparse ()
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;
 
       {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
 #endif /* no yyoverflow */
@@ -1302,10 +1193,10 @@ yyparse ()
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
+                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
+        YYABORT;
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1334,7 +1225,7 @@ yybackup:
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex (&yylval, ctx);
     }
 
   if (yychar <= YYEOF)
@@ -1399,7 +1290,7 @@ yyreduce:
   yylen = yyr2[yyn];
 
   /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
+     '$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
      This behavior is undocumented and Bison
@@ -1412,112 +1303,119 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-        case 4:
-/* Line 1787 of yacc.c  */
-#line 69 "parser.y"
+        case 7:
+#line 110 "parser/parser.y" /* yacc.c:1646  */
     {
-		free((yyvsp[(2) - (3)].s));
+		if ((yyvsp[-1].t) != CONF_PARSER_CONFIG_SETUP && (!(yyvsp[0].s) || !strlen((yyvsp[0].s))))
+		{
+			PARSER_DBG1(ctx, "section name missing");
+			free((yyvsp[0].s));
+			YYERROR;
+		}
+		conf_parser_t *parser = (conf_parser_t*)ctx->context;
+		parser->add_section(parser, (yyvsp[-1].t), (yyvsp[0].s));
 	}
+#line 1319 "parser/parser.c" /* yacc.c:1646  */
     break;
 
-  case 5:
-/* Line 1787 of yacc.c  */
-#line 73 "parser.y"
+  case 8:
+#line 124 "parser/parser.y" /* yacc.c:1646  */
     {
-		_parser_kw = &(_parser_cfg->config_setup);
-		_parser_kw_last = NULL;
+		(yyval.t) = CONF_PARSER_CONFIG_SETUP;
 	}
+#line 1327 "parser/parser.c" /* yacc.c:1646  */
     break;
 
-  case 7:
-/* Line 1787 of yacc.c  */
-#line 78 "parser.y"
+  case 9:
+#line 129 "parser/parser.y" /* yacc.c:1646  */
     {
-		section_list_t *section = malloc_thing(section_list_t);
-
-		section->name = strdupnull((yyvsp[(2) - (3)].s));
-		section->kw = NULL;
-		section->next = NULL;
-		_parser_kw = &(section->kw);
-		if (!_parser_cfg->conn_first)
-			_parser_cfg->conn_first = section;
-		if (_parser_cfg->conn_last)
-			_parser_cfg->conn_last->next = section;
-		_parser_cfg->conn_last = section;
-		_parser_kw_last = NULL;
-		free((yyvsp[(2) - (3)].s));
+		(yyval.t) = CONF_PARSER_CONN;
 	}
+#line 1335 "parser/parser.c" /* yacc.c:1646  */
     break;
 
-  case 9:
-/* Line 1787 of yacc.c  */
-#line 94 "parser.y"
+  case 10:
+#line 134 "parser/parser.y" /* yacc.c:1646  */
     {
-		section_list_t *section = malloc_thing(section_list_t);
-		section->name = strdupnull((yyvsp[(2) - (3)].s));
-		section->kw = NULL;
-		section->next = NULL;
-		_parser_kw = &(section->kw);
-		if (!_parser_cfg->ca_first)
-			_parser_cfg->ca_first = section;
-		if (_parser_cfg->ca_last)
-			_parser_cfg->ca_last->next = section;
-		_parser_cfg->ca_last = section;
-		_parser_kw_last = NULL;
-		free((yyvsp[(2) - (3)].s));
+		(yyval.t) = CONF_PARSER_CA;
 	}
+#line 1343 "parser/parser.c" /* yacc.c:1646  */
     break;
 
   case 11:
-/* Line 1787 of yacc.c  */
-#line 109 "parser.y"
+#line 141 "parser/parser.y" /* yacc.c:1646  */
     {
-		extern void _parser_y_include (const char *f);
-		_parser_y_include((yyvsp[(2) - (2)].s));
-		free((yyvsp[(2) - (2)].s));
+		(yyval.s) = NULL;
 	}
+#line 1351 "parser/parser.c" /* yacc.c:1646  */
     break;
 
-  case 16:
-/* Line 1787 of yacc.c  */
-#line 124 "parser.y"
+  case 12:
+#line 145 "parser/parser.y" /* yacc.c:1646  */
     {
-		kw_list_t  *new;
-		kw_entry_t *entry = in_word_set((yyvsp[(1) - (3)].s), strlen((yyvsp[(1) - (3)].s)));
+		(yyval.s) = (yyvsp[0].s);
+	}
+#line 1359 "parser/parser.c" /* yacc.c:1646  */
+    break;
 
-		if (entry == NULL)
+  case 14:
+#line 154 "parser/parser.y" /* yacc.c:1646  */
+    {
+		if (!strlen((yyvsp[-2].s)))
 		{
-			snprintf(errbuf, ERRSTRING_LEN, "unknown keyword '%s'", (yyvsp[(1) - (3)].s));
-			yyerror(errbuf);
+			PARSER_DBG1(ctx, "setting name can't be empty");
+			free((yyvsp[-2].s));
+			free((yyvsp[0].s));
+			YYERROR;
 		}
-		else if (_parser_kw)
+		conf_parser_t *parser = (conf_parser_t*)ctx->context;
+		parser->add_setting(parser, (yyvsp[-2].s), (yyvsp[0].s));
+	}
+#line 1375 "parser/parser.c" /* yacc.c:1646  */
+    break;
+
+  case 15:
+#line 167 "parser/parser.y" /* yacc.c:1646  */
+    {
+		if (!strlen((yyvsp[-1].s)))
 		{
-			new = (kw_list_t *)malloc_thing(kw_list_t);
-			new->entry = entry;
-			new->value = strdupnull((yyvsp[(3) - (3)].s));
-			new->next = NULL;
-			if (_parser_kw_last)
-				_parser_kw_last->next = new;
-			_parser_kw_last = new;
-			if (!*_parser_kw)
-				*_parser_kw = new;
+			PARSER_DBG1(ctx, "setting name can't be empty");
+			free((yyvsp[-1].s));
+			YYERROR;
 		}
-		free((yyvsp[(1) - (3)].s));
-		free((yyvsp[(3) - (3)].s));
+		conf_parser_t *parser = (conf_parser_t*)ctx->context;
+		parser->add_setting(parser, (yyvsp[-1].s), NULL);
 	}
+#line 1390 "parser/parser.c" /* yacc.c:1646  */
     break;
 
-  case 17:
-/* Line 1787 of yacc.c  */
-#line 149 "parser.y"
+  case 16:
+#line 179 "parser/parser.y" /* yacc.c:1646  */
     {
-		free((yyvsp[(1) - (2)].s));
-	  }
+		PARSER_DBG1(ctx, "missing value for setting '%s'", (yyvsp[0].s));
+		free((yyvsp[0].s));
+		YYERROR;
+	}
+#line 1400 "parser/parser.c" /* yacc.c:1646  */
+    break;
+
+  case 18:
+#line 189 "parser/parser.y" /* yacc.c:1646  */
+    {	/* just put a single space between them, use strings for more */
+		if (asprintf(&(yyval.s), "%s %s", (yyvsp[-1].s), (yyvsp[0].s)) < 0)
+		{
+			free((yyvsp[-1].s));
+			free((yyvsp[0].s));
+			YYERROR;
+		}
+		free((yyvsp[-1].s));
+		free((yyvsp[0].s));
+	}
+#line 1415 "parser/parser.c" /* yacc.c:1646  */
     break;
 
 
-/* Line 1787 of yacc.c  */
-#line 1521 "parser.c"
+#line 1419 "parser/parser.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -1539,7 +1437,7 @@ yyreduce:
 
   *++yyvsp = yyval;
 
-  /* Now `shift' the result of the reduction.  Determine what state
+  /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
 
@@ -1554,9 +1452,9 @@ yyreduce:
   goto yynewstate;
 
 
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
 yyerrlab:
   /* Make sure we have latest lookahead translation.  See comments at
      user semantic actions for why this is necessary.  */
@@ -1567,7 +1465,7 @@ yyerrlab:
     {
       ++yynerrs;
 #if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
+      yyerror (ctx, YY_("syntax error"));
 #else
 # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
                                         yyssp, yytoken)
@@ -1594,7 +1492,7 @@ yyerrlab:
                 yymsgp = yymsg;
               }
           }
-        yyerror (yymsgp);
+        yyerror (ctx, yymsgp);
         if (yysyntax_error_status == 2)
           goto yyexhaustedlab;
       }
@@ -1607,20 +1505,20 @@ yyerrlab:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
+         error, discard it.  */
 
       if (yychar <= YYEOF)
-	{
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-	}
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
       else
-	{
-	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval, ctx);
+          yychar = YYEMPTY;
+        }
     }
 
   /* Else will try to reuse lookahead token after shifting the error
@@ -1639,7 +1537,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -1652,29 +1550,29 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
   for (;;)
     {
       yyn = yypact[yystate];
       if (!yypact_value_is_default (yyn))
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
-	YYABORT;
+        YYABORT;
 
 
       yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
+                  yystos[yystate], yyvsp, ctx);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
@@ -1711,7 +1609,7 @@ yyabortlab:
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
+  yyerror (ctx, YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
@@ -1723,16 +1621,16 @@ yyreturn:
          user semantic actions for why this is necessary.  */
       yytoken = YYTRANSLATE (yychar);
       yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval);
+                  yytoken, &yylval, ctx);
     }
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
+                  yystos[*yyssp], yyvsp, ctx);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -1743,128 +1641,60 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
+#line 201 "parser/parser.y" /* yacc.c:1906  */
 
 
-/* Line 2050 of yacc.c  */
-#line 155 "parser.y"
-
-
-void yyerror(const char *s)
-{
-	if (_save_errors_)
-		_parser_y_error(parser_errstring, ERRSTRING_LEN, s);
-}
-
-config_parsed_t *parser_load_conf(const char *file)
+/**
+ * Referenced by the generated parser
+ */
+static void conf_parser_error(parser_helper_t *ctx, const char *s)
 {
-	config_parsed_t *cfg = NULL;
-	int err = 0;
-	FILE *f;
-
-	extern void _parser_y_init(const char *f);
-	extern void _parser_y_fini(void);
-	extern FILE *yyin;
-
-	memset(parser_errstring, 0, ERRSTRING_LEN+1);
-
-	cfg = (config_parsed_t *)malloc_thing(config_parsed_t);
-	if (cfg)
-	{
-		memset(cfg, 0, sizeof(config_parsed_t));
-		f = fopen(file, "r");
-		if (f)
-		{
-			yyin = f;
-			_parser_y_init(file);
-			_save_errors_ = 1;
-			_parser_cfg = cfg;
-
-			if (yyparse() !=0 )
-			{
-				if (parser_errstring[0] == '\0')
-				{
-					snprintf(parser_errstring, ERRSTRING_LEN, "Unknown error...");
-				}
-				_save_errors_ = 0;
-				while (yyparse() != 0);
-				err++;
-			}
-			else if (parser_errstring[0] != '\0')
-			{
-				err++;
-			}
-			else
-			{
-				/**
-				 * Config valid
-				 */
-			}
-
-			fclose(f);
-		}
-		else
-		{
-			snprintf(parser_errstring, ERRSTRING_LEN, "can't load file '%s'", file);
-			err++;
-		}
-	}
-	else
-	{
-		snprintf(parser_errstring, ERRSTRING_LEN, "can't allocate memory");
-		err++;
-	}
+	char *text = conf_parser_get_text(ctx->scanner);
+	int len = conf_parser_get_leng(ctx->scanner);
 
-	if (err)
-	{
-		DBG1(DBG_APP, "%s", parser_errstring);
-
-		if (cfg)
-			parser_free_conf(cfg);
-		cfg = NULL;
+	if (len && text[len-1] == '\n')
+	{	/* cut off newline at the end to avoid muti-line log messages */
+		len--;
 	}
-
-	_parser_y_fini();
-	return cfg;
+	PARSER_DBG1(ctx, "%s [%.*s]", s, (int)len, text);
 }
 
-static void parser_free_kwlist(kw_list_t *list)
+/**
+ * Parse the given file
+ */
+bool conf_parser_parse_file(conf_parser_t *this, char *name)
 {
-	kw_list_t *elt;
+	parser_helper_t *helper;
+	bool success = FALSE;
 
-	while (list)
+	helper = parser_helper_create(this);
+	helper->get_lineno = conf_parser_get_lineno;
+	if (conf_parser_lex_init_extra(helper, &helper->scanner) != 0)
 	{
-		elt = list;
-		list = list->next;
-		free(elt->value);
-		free(elt);
+		helper->destroy(helper);
+		return FALSE;
 	}
-}
-
-void parser_free_conf(config_parsed_t *cfg)
-{
-	section_list_t *sec;
-	if (cfg)
+	helper->file_include(helper, name);
+	if (!conf_parser_open_next_file(helper))
+	{
+		DBG1(DBG_CFG, "failed to open config file '%s'", name);
+	}
+	else
 	{
-		parser_free_kwlist(cfg->config_setup);
-		while (cfg->conn_first)
+		if (getenv("DEBUG_CONF_PARSER"))
 		{
-			sec = cfg->conn_first;
-			cfg->conn_first = cfg->conn_first->next;
-			free(sec->name);
-			parser_free_kwlist(sec->kw);
-			free(sec);
+			yydebug = 1;
+			conf_parser_set_debug(1, helper->scanner);
 		}
-		while (cfg->ca_first)
+		success = yyparse(helper) == 0;
+		if (!success)
 		{
-			sec = cfg->ca_first;
-			cfg->ca_first = cfg->ca_first->next;
-			free(sec->name);
-			parser_free_kwlist(sec->kw);
-			free(sec);
+			DBG1(DBG_CFG, "invalid config file '%s'", name);
 		}
-		free(cfg);
 	}
+	conf_parser_lex_destroy(helper->scanner);
+	helper->destroy(helper);
+	return success;
 }
diff --git a/src/starter/parser.h b/src/starter/parser/parser.h
index 3344f71f6..c10547be8 100644
--- a/src/starter/parser.h
+++ b/src/starter/parser/parser.h
@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
+/* A Bison parser, made by GNU Bison 3.0.2.  */
 
 /* Bison interface for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
-   
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,81 +26,61 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_YY_PARSER_H_INCLUDED
-# define YY_YY_PARSER_H_INCLUDED
-/* Enabling traces.  */
+#ifndef YY_CONF_PARSER_PARSER_PARSER_H_INCLUDED
+# define YY_CONF_PARSER_PARSER_PARSER_H_INCLUDED
+/* Debug traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 0
+# define YYDEBUG 1
 #endif
 #if YYDEBUG
-extern int yydebug;
+extern int conf_parser_debug;
 #endif
 
-/* Tokens.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     EQUAL = 258,
-     FIRST_SPACES = 259,
-     EOL = 260,
-     CONFIG = 261,
-     SETUP = 262,
-     CONN = 263,
-     CA = 264,
-     INCLUDE = 265,
-     FILE_VERSION = 266,
-     STRING = 267
-   };
+  enum yytokentype
+  {
+    STRING = 258,
+    EQ = 259,
+    SPACES = 260,
+    NEWLINE = 261,
+    CONFIG_SETUP = 262,
+    CONN = 263,
+    CA = 264
+  };
 #endif
 /* Tokens.  */
-#define EQUAL 258
-#define FIRST_SPACES 259
-#define EOL 260
-#define CONFIG 261
-#define SETUP 262
+#define STRING 258
+#define EQ 259
+#define SPACES 260
+#define NEWLINE 261
+#define CONFIG_SETUP 262
 #define CONN 263
 #define CA 264
-#define INCLUDE 265
-#define FILE_VERSION 266
-#define STRING 267
-
-
 
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
 {
-/* Line 2053 of yacc.c  */
-#line 52 "parser.y"
- char *s; 
+#line 71 "parser/parser.y" /* yacc.c:1909  */
+
+	char *s;
+	conf_parser_section_t t;
 
-/* Line 2053 of yacc.c  */
-#line 84 "parser.h"
-} YYSTYPE;
+#line 77 "parser/parser.h" /* yacc.c:1909  */
+};
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
-extern YYSTYPE yylval;
 
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
-#endif /* !YY_YY_PARSER_H_INCLUDED  */
+int conf_parser_parse (parser_helper_t *ctx);
+
+#endif /* !YY_CONF_PARSER_PARSER_PARSER_H_INCLUDED  */
diff --git a/src/starter/parser/parser.y b/src/starter/parser/parser.y
new file mode 100644
index 000000000..54dedc12b
--- /dev/null
+++ b/src/starter/parser/parser.y
@@ -0,0 +1,254 @@
+%{
+/*
+ * Copyright (C) 2013-2014 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#define _GNU_SOURCE /* for asprintf() */
+#include <stdio.h>
+
+#include <utils/parser_helper.h>
+#include <settings/settings_types.h>
+#include <parser/conf_parser.h>
+
+#include "parser.h"
+
+#define YYDEBUG 1
+
+/**
+ * Defined by the lexer
+ */
+int conf_parser_lex(YYSTYPE *lvalp, void *scanner);
+int conf_parser_lex_init_extra(parser_helper_t *extra, void *scanner);
+int conf_parser_lex_destroy(void *scanner);
+int conf_parser_set_in(FILE *in, void *scanner);
+void conf_parser_set_debug(int debug, void *scanner);
+char *conf_parser_get_text(void *scanner);
+int conf_parser_get_leng(void *scanner);
+int conf_parser_get_lineno(void *scanner);
+/* Custom functions in lexer */
+bool conf_parser_open_next_file(parser_helper_t *ctx);
+
+/**
+ * Forward declaration
+ */
+static void conf_parser_error(parser_helper_t *ctx, const char *s);
+
+/**
+ * Make sure to call lexer with the proper context
+ */
+#undef yylex
+static int yylex(YYSTYPE *lvalp, parser_helper_t *ctx)
+{
+	return conf_parser_lex(lvalp, ctx->scanner);
+}
+
+%}
+%debug
+
+/* generate verbose error messages */
+%error-verbose
+/* generate a reentrant parser */
+%define api.pure
+/* prefix function/variable declarations */
+%name-prefix "conf_parser_"
+
+/* interact properly with the reentrant lexer */
+%lex-param {parser_helper_t *ctx}
+%parse-param {parser_helper_t *ctx}
+
+/* types for terminal symbols... */
+%union {
+	char *s;
+	conf_parser_section_t t;
+}
+%token <s> STRING
+%token EQ SPACES NEWLINE CONFIG_SETUP CONN CA
+
+/* ...and other symbols */
+%type <t> section_type
+%type <s> section_name value
+
+/* make the equal sign left associative */
+%left EQ
+
+/* properly destroy STRING tokens, which are strdup()ed, on errors */
+%destructor { free($$); } STRING section_name value
+
+/* there are two shift/reduce conflicts because we allow empty lines (and lines
+ * with spaces) within settings and anywhere else (i.e. in the beginning) */
+//%expect 2
+
+%%
+
+/**
+ * ipsec.conf grammar rules
+ */
+statements:
+	/* empty */
+	| statements NEWLINE
+	| statements statement
+	;
+
+statement:
+	section
+	| SPACES setting
+	;
+
+section:
+	section_type section_name
+	{
+		if ($1 != CONF_PARSER_CONFIG_SETUP && (!$2 || !strlen($2)))
+		{
+			PARSER_DBG1(ctx, "section name missing");
+			free($2);
+			YYERROR;
+		}
+		conf_parser_t *parser = (conf_parser_t*)ctx->context;
+		parser->add_section(parser, $1, $2);
+	}
+	;
+
+section_type:
+	CONFIG_SETUP
+	{
+		$$ = CONF_PARSER_CONFIG_SETUP;
+	}
+	|
+	CONN
+	{
+		$$ = CONF_PARSER_CONN;
+	}
+	|
+	CA
+	{
+		$$ = CONF_PARSER_CA;
+	}
+	;
+
+section_name:
+	/* empty */
+	{
+		$$ = NULL;
+	}
+	| STRING
+	{
+		$$ = $1;
+	}
+	;
+
+setting:
+	/* empty */
+	|
+	STRING EQ value
+	{
+		if (!strlen($1))
+		{
+			PARSER_DBG1(ctx, "setting name can't be empty");
+			free($1);
+			free($3);
+			YYERROR;
+		}
+		conf_parser_t *parser = (conf_parser_t*)ctx->context;
+		parser->add_setting(parser, $1, $value);
+	}
+	|
+	STRING EQ
+	{
+		if (!strlen($1))
+		{
+			PARSER_DBG1(ctx, "setting name can't be empty");
+			free($1);
+			YYERROR;
+		}
+		conf_parser_t *parser = (conf_parser_t*)ctx->context;
+		parser->add_setting(parser, $1, NULL);
+	}
+	|
+	STRING
+	{
+		PARSER_DBG1(ctx, "missing value for setting '%s'", $1);
+		free($1);
+		YYERROR;
+	}
+	;
+
+value:
+	STRING
+	| value STRING
+	{	/* just put a single space between them, use strings for more */
+		if (asprintf(&$$, "%s %s", $1, $2) < 0)
+		{
+			free($1);
+			free($2);
+			YYERROR;
+		}
+		free($1);
+		free($2);
+	}
+	;
+
+%%
+
+/**
+ * Referenced by the generated parser
+ */
+static void conf_parser_error(parser_helper_t *ctx, const char *s)
+{
+	char *text = conf_parser_get_text(ctx->scanner);
+	int len = conf_parser_get_leng(ctx->scanner);
+
+	if (len && text[len-1] == '\n')
+	{	/* cut off newline at the end to avoid muti-line log messages */
+		len--;
+	}
+	PARSER_DBG1(ctx, "%s [%.*s]", s, (int)len, text);
+}
+
+/**
+ * Parse the given file
+ */
+bool conf_parser_parse_file(conf_parser_t *this, char *name)
+{
+	parser_helper_t *helper;
+	bool success = FALSE;
+
+	helper = parser_helper_create(this);
+	helper->get_lineno = conf_parser_get_lineno;
+	if (conf_parser_lex_init_extra(helper, &helper->scanner) != 0)
+	{
+		helper->destroy(helper);
+		return FALSE;
+	}
+	helper->file_include(helper, name);
+	if (!conf_parser_open_next_file(helper))
+	{
+		DBG1(DBG_CFG, "failed to open config file '%s'", name);
+	}
+	else
+	{
+		if (getenv("DEBUG_CONF_PARSER"))
+		{
+			yydebug = 1;
+			conf_parser_set_debug(1, helper->scanner);
+		}
+		success = yyparse(helper) == 0;
+		if (!success)
+		{
+			DBG1(DBG_CFG, "invalid config file '%s'", name);
+		}
+	}
+	conf_parser_lex_destroy(helper->scanner);
+	helper->destroy(helper);
+	return success;
+}
diff --git a/src/starter/starter.c b/src/starter/starter.c
index 33916c95c..ef5780843 100644
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -418,6 +418,7 @@ int main (int argc, char **argv)
 	bool no_fork = FALSE;
 	bool attach_gdb = FALSE;
 	bool load_warning = FALSE;
+	bool conftest = FALSE;
 
 	library_init(NULL, "starter");
 	atexit(library_deinit);
@@ -467,6 +468,10 @@ int main (int argc, char **argv)
 		{
 			config_file = argv[++i];
 		}
+		else if (streq(argv[i], "--conftest"))
+		{
+			conftest = TRUE;
+		}
 		else
 		{
 			usage(argv[0]);
@@ -485,6 +490,28 @@ int main (int argc, char **argv)
 
 	init_log("ipsec_starter");
 
+	if (conftest)
+	{
+		int status = LSB_RC_SUCCESS;
+
+		cfg = confread_load(config_file);
+		if (cfg == NULL || cfg->err > 0)
+		{
+			DBG1(DBG_APP, "config invalid!");
+			status = LSB_RC_INVALID_ARGUMENT;
+		}
+		else
+		{
+			DBG1(DBG_APP, "config OK");
+		}
+		if (cfg)
+		{
+			confread_free(cfg);
+		}
+		cleanup();
+		exit(status);
+	}
+
 	DBG1(DBG_APP, "Starting %sSwan "VERSION" IPsec [starter]...",
 		lib->settings->get_bool(lib->settings,
 			"charon.i_dont_care_about_security_and_use_aggressive_mode_psk",
diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c
index fca4b1e7d..1e305db8b 100644
--- a/src/starter/starterstroke.c
+++ b/src/starter/starterstroke.c
@@ -13,16 +13,9 @@
  * for more details.
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <stddef.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 
 #include <credentials/auth_cfg.h>
 
@@ -56,48 +49,38 @@ static char* push_string(stroke_msg_t *msg, char *string)
 
 static int send_stroke_msg (stroke_msg_t *msg)
 {
-	struct sockaddr_un ctl_addr;
-	int byte_count;
-	char buffer[64];
-
-	ctl_addr.sun_family = AF_UNIX;
-	strcpy(ctl_addr.sun_path, CHARON_CTL_FILE);
+	stream_t *stream;
+	char *uri, buffer[64];
+	int count;
 
 	/* starter is not called from commandline, and therefore absolutely silent */
 	msg->output_verbosity = -1;
 
-	int sock = socket(AF_UNIX, SOCK_STREAM, 0);
-
-	if (sock < 0)
-	{
-		DBG1(DBG_APP, "socket() failed: %s", strerror(errno));
-		return -1;
-	}
-	if (connect(sock, (struct sockaddr *)&ctl_addr, offsetof(struct sockaddr_un, sun_path) + strlen(ctl_addr.sun_path)) < 0)
+	uri = lib->settings->get_str(lib->settings, "%s.plugins.stroke.socket",
+								 "unix://" CHARON_CTL_FILE, daemon_name);
+	stream = lib->streams->connect(lib->streams, uri);
+	if (!stream)
 	{
-		DBG1(DBG_APP, "connect(charon_ctl) failed: %s", strerror(errno));
-		close(sock);
+		DBG1(DBG_APP, "failed to connect to stroke socket '%s'", uri);
 		return -1;
 	}
 
-	/* send message */
-	if (write(sock, msg, msg->length) != msg->length)
+	if (!stream->write_all(stream, msg, msg->length))
 	{
-		DBG1(DBG_APP, "write(charon_ctl) failed: %s", strerror(errno));
-		close(sock);
+		DBG1(DBG_APP, "sending stroke message failed");
+		stream->destroy(stream);
 		return -1;
 	}
-	while ((byte_count = read(sock, buffer, sizeof(buffer)-1)) > 0)
+	while ((count = stream->read(stream, buffer, sizeof(buffer)-1, TRUE)) > 0)
 	{
-		buffer[byte_count] = '\0';
+		buffer[count] = '\0';
 		DBG1(DBG_APP, "%s", buffer);
 	}
-	if (byte_count < 0)
+	if (count < 0)
 	{
-		DBG1(DBG_APP, "read() failed: %s", strerror(errno));
+		DBG1(DBG_APP, "reading stroke response failed");
 	}
-
-	close(sock);
+	stream->destroy(stream);
 	return 0;
 }
 
@@ -202,6 +185,7 @@ int starter_stroke_add_conn(starter_config_t *cfg, starter_conn_t *conn)
 	msg.add_conn.ikeme.mediated_by = push_string(&msg, conn->me_mediated_by);
 	msg.add_conn.ikeme.peerid = push_string(&msg, conn->me_peerid);
 	msg.add_conn.reqid = conn->reqid;
+	msg.add_conn.replay_window = conn->replay_window;
 	msg.add_conn.mark_in.value = conn->mark_in.value;
 	msg.add_conn.mark_in.mask = conn->mark_in.mask;
 	msg.add_conn.mark_out.value = conn->mark_out.value;
diff --git a/src/starter/tests/Makefile.am b/src/starter/tests/Makefile.am
new file mode 100644
index 000000000..f84327b6b
--- /dev/null
+++ b/src/starter/tests/Makefile.am
@@ -0,0 +1,19 @@
+TESTS = starter_tests
+
+check_PROGRAMS = $(TESTS)
+
+starter_tests_SOURCES = \
+	suites/test_parser.c \
+	starter_tests.h starter_tests.c
+
+starter_tests_CFLAGS = \
+	-I$(top_srcdir)/src/libstrongswan \
+	-I$(top_srcdir)/src/libstrongswan/tests \
+	-I$(top_srcdir)/src/starter \
+	@COVERAGE_CFLAGS@
+
+starter_tests_LDFLAGS = @COVERAGE_LDFLAGS@
+starter_tests_LDADD = \
+	$(top_builddir)/src/libstrongswan/libstrongswan.la \
+	$(top_builddir)/src/libstrongswan/tests/libtest.la \
+	../libstarter.la
diff --git a/src/starter/tests/Makefile.in b/src/starter/tests/Makefile.in
new file mode 100644
index 000000000..c72f23e34
--- /dev/null
+++ b/src/starter/tests/Makefile.in
@@ -0,0 +1,856 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+TESTS = starter_tests$(EXEEXT)
+check_PROGRAMS = $(am__EXEEXT_1)
+subdir = src/starter/tests
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \
+	$(top_srcdir)/m4/config/ltoptions.m4 \
+	$(top_srcdir)/m4/config/ltsugar.m4 \
+	$(top_srcdir)/m4/config/ltversion.m4 \
+	$(top_srcdir)/m4/config/lt~obsolete.m4 \
+	$(top_srcdir)/m4/macros/split-package-version.m4 \
+	$(top_srcdir)/m4/macros/with.m4 \
+	$(top_srcdir)/m4/macros/enable-disable.m4 \
+	$(top_srcdir)/m4/macros/add-plugin.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__EXEEXT_1 = starter_tests$(EXEEXT)
+am__dirstamp = $(am__leading_dot)dirstamp
+am_starter_tests_OBJECTS = suites/starter_tests-test_parser.$(OBJEXT) \
+	starter_tests-starter_tests.$(OBJEXT)
+starter_tests_OBJECTS = $(am_starter_tests_OBJECTS)
+starter_tests_DEPENDENCIES =  \
+	$(top_builddir)/src/libstrongswan/libstrongswan.la \
+	$(top_builddir)/src/libstrongswan/tests/libtest.la \
+	../libstarter.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+starter_tests_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(starter_tests_CFLAGS) \
+	$(CFLAGS) $(starter_tests_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(starter_tests_SOURCES)
+DIST_SOURCES = $(starter_tests_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BFDLIB = @BFDLIB@
+BTLIB = @BTLIB@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
+COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLIB = @DLLIB@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GENHTML = @GENHTML@
+GPERF = @GPERF@
+GPRBUILD = @GPRBUILD@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LCOV = @LCOV@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MYSQLCFLAG = @MYSQLCFLAG@
+MYSQLCONFIG = @MYSQLCONFIG@
+MYSQLLIB = @MYSQLLIB@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_LIB = @OPENSSL_LIB@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PACKAGE_VERSION_BUILD = @PACKAGE_VERSION_BUILD@
+PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@
+PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@
+PACKAGE_VERSION_REVIEW = @PACKAGE_VERSION_REVIEW@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGIN_CFLAGS = @PLUGIN_CFLAGS@
+PTHREADLIB = @PTHREADLIB@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RTLIB = @RTLIB@
+RUBY = @RUBY@
+RUBYINCLUDE = @RUBYINCLUDE@
+RUBYLIB = @RUBYLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOCKLIB = @SOCKLIB@
+STRIP = @STRIP@
+UNWINDLIB = @UNWINDLIB@
+VERSION = @VERSION@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+aikgen_plugins = @aikgen_plugins@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+attest_plugins = @attest_plugins@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+c_plugins = @c_plugins@
+charon_natt_port = @charon_natt_port@
+charon_plugins = @charon_plugins@
+charon_udp_port = @charon_udp_port@
+clearsilver_LIBS = @clearsilver_LIBS@
+cmd_plugins = @cmd_plugins@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dbusservicedir = @dbusservicedir@
+dev_headers = @dev_headers@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+fips_mode = @fips_mode@
+gtk_CFLAGS = @gtk_CFLAGS@
+gtk_LIBS = @gtk_LIBS@
+h_plugins = @h_plugins@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+imcvdir = @imcvdir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+ipsec_script = @ipsec_script@
+ipsec_script_upper = @ipsec_script_upper@
+ipsecdir = @ipsecdir@
+ipsecgroup = @ipsecgroup@
+ipseclibdir = @ipseclibdir@
+ipsecuser = @ipsecuser@
+libdir = @libdir@
+libexecdir = @libexecdir@
+linux_headers = @linux_headers@
+localedir = @localedir@
+localstatedir = @localstatedir@
+maemo_CFLAGS = @maemo_CFLAGS@
+maemo_LIBS = @maemo_LIBS@
+manager_plugins = @manager_plugins@
+mandir = @mandir@
+medsrv_plugins = @medsrv_plugins@
+mkdir_p = @mkdir_p@
+nm_CFLAGS = @nm_CFLAGS@
+nm_LIBS = @nm_LIBS@
+nm_ca_dir = @nm_ca_dir@
+nm_plugins = @nm_plugins@
+oldincludedir = @oldincludedir@
+pcsclite_CFLAGS = @pcsclite_CFLAGS@
+pcsclite_LIBS = @pcsclite_LIBS@
+pdfdir = @pdfdir@
+piddir = @piddir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+pki_plugins = @pki_plugins@
+plugindir = @plugindir@
+pool_plugins = @pool_plugins@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+random_device = @random_device@
+resolv_conf = @resolv_conf@
+routing_table = @routing_table@
+routing_table_prio = @routing_table_prio@
+s_plugins = @s_plugins@
+sbindir = @sbindir@
+scepclient_plugins = @scepclient_plugins@
+scripts_plugins = @scripts_plugins@
+sharedstatedir = @sharedstatedir@
+soup_CFLAGS = @soup_CFLAGS@
+soup_LIBS = @soup_LIBS@
+srcdir = @srcdir@
+starter_plugins = @starter_plugins@
+strongswan_conf = @strongswan_conf@
+strongswan_options = @strongswan_options@
+swanctldir = @swanctldir@
+sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
+t_plugins = @t_plugins@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+urandom_device = @urandom_device@
+xml_CFLAGS = @xml_CFLAGS@
+xml_LIBS = @xml_LIBS@
+starter_tests_SOURCES = \
+	suites/test_parser.c \
+	starter_tests.h starter_tests.c
+
+starter_tests_CFLAGS = \
+	-I$(top_srcdir)/src/libstrongswan \
+	-I$(top_srcdir)/src/libstrongswan/tests \
+	-I$(top_srcdir)/src/starter \
+	@COVERAGE_CFLAGS@
+
+starter_tests_LDFLAGS = @COVERAGE_LDFLAGS@
+starter_tests_LDADD = \
+	$(top_builddir)/src/libstrongswan/libstrongswan.la \
+	$(top_builddir)/src/libstrongswan/tests/libtest.la \
+	../libstarter.la
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/starter/tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/starter/tests/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+suites/$(am__dirstamp):
+	@$(MKDIR_P) suites
+	@: > suites/$(am__dirstamp)
+suites/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) suites/$(DEPDIR)
+	@: > suites/$(DEPDIR)/$(am__dirstamp)
+suites/starter_tests-test_parser.$(OBJEXT): suites/$(am__dirstamp) \
+	suites/$(DEPDIR)/$(am__dirstamp)
+
+starter_tests$(EXEEXT): $(starter_tests_OBJECTS) $(starter_tests_DEPENDENCIES) $(EXTRA_starter_tests_DEPENDENCIES) 
+	@rm -f starter_tests$(EXEEXT)
+	$(AM_V_CCLD)$(starter_tests_LINK) $(starter_tests_OBJECTS) $(starter_tests_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f suites/*.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/starter_tests-starter_tests.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@suites/$(DEPDIR)/starter_tests-test_parser.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+suites/starter_tests-test_parser.o: suites/test_parser.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(starter_tests_CFLAGS) $(CFLAGS) -MT suites/starter_tests-test_parser.o -MD -MP -MF suites/$(DEPDIR)/starter_tests-test_parser.Tpo -c -o suites/starter_tests-test_parser.o `test -f 'suites/test_parser.c' || echo '$(srcdir)/'`suites/test_parser.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) suites/$(DEPDIR)/starter_tests-test_parser.Tpo suites/$(DEPDIR)/starter_tests-test_parser.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='suites/test_parser.c' object='suites/starter_tests-test_parser.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(starter_tests_CFLAGS) $(CFLAGS) -c -o suites/starter_tests-test_parser.o `test -f 'suites/test_parser.c' || echo '$(srcdir)/'`suites/test_parser.c
+
+suites/starter_tests-test_parser.obj: suites/test_parser.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(starter_tests_CFLAGS) $(CFLAGS) -MT suites/starter_tests-test_parser.obj -MD -MP -MF suites/$(DEPDIR)/starter_tests-test_parser.Tpo -c -o suites/starter_tests-test_parser.obj `if test -f 'suites/test_parser.c'; then $(CYGPATH_W) 'suites/test_parser.c'; else $(CYGPATH_W) '$(srcdir)/suites/test_parser.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) suites/$(DEPDIR)/starter_tests-test_parser.Tpo suites/$(DEPDIR)/starter_tests-test_parser.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='suites/test_parser.c' object='suites/starter_tests-test_parser.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(starter_tests_CFLAGS) $(CFLAGS) -c -o suites/starter_tests-test_parser.obj `if test -f 'suites/test_parser.c'; then $(CYGPATH_W) 'suites/test_parser.c'; else $(CYGPATH_W) '$(srcdir)/suites/test_parser.c'; fi`
+
+starter_tests-starter_tests.o: starter_tests.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(starter_tests_CFLAGS) $(CFLAGS) -MT starter_tests-starter_tests.o -MD -MP -MF $(DEPDIR)/starter_tests-starter_tests.Tpo -c -o starter_tests-starter_tests.o `test -f 'starter_tests.c' || echo '$(srcdir)/'`starter_tests.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/starter_tests-starter_tests.Tpo $(DEPDIR)/starter_tests-starter_tests.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='starter_tests.c' object='starter_tests-starter_tests.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(starter_tests_CFLAGS) $(CFLAGS) -c -o starter_tests-starter_tests.o `test -f 'starter_tests.c' || echo '$(srcdir)/'`starter_tests.c
+
+starter_tests-starter_tests.obj: starter_tests.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(starter_tests_CFLAGS) $(CFLAGS) -MT starter_tests-starter_tests.obj -MD -MP -MF $(DEPDIR)/starter_tests-starter_tests.Tpo -c -o starter_tests-starter_tests.obj `if test -f 'starter_tests.c'; then $(CYGPATH_W) 'starter_tests.c'; else $(CYGPATH_W) '$(srcdir)/starter_tests.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/starter_tests-starter_tests.Tpo $(DEPDIR)/starter_tests-starter_tests.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='starter_tests.c' object='starter_tests-starter_tests.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(starter_tests_CFLAGS) $(CFLAGS) -c -o starter_tests-starter_tests.obj `if test -f 'starter_tests.c'; then $(CYGPATH_W) 'starter_tests.c'; else $(CYGPATH_W) '$(srcdir)/starter_tests.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	srcdir=$(srcdir); export srcdir; \
+	list=' $(TESTS) '; \
+	$(am__tty_colors); \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=XPASS; \
+	      ;; \
+	      *) \
+		col=$$grn; res=PASS; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xfail=`expr $$xfail + 1`; \
+		col=$$lgn; res=XFAIL; \
+	      ;; \
+	      *) \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=FAIL; \
+	      ;; \
+	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      col=$$blu; res=SKIP; \
+	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
+	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="$$All$$all $$tests passed"; \
+	    else \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	    fi; \
+	  else \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all $$tests failed"; \
+	    else \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	    fi; \
+	  fi; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+	  if test "$$failed" -eq 0; then \
+	    col="$$grn"; \
+	  else \
+	    col="$$red"; \
+	  fi; \
+	  echo "$${col}$$dashes$${std}"; \
+	  echo "$${col}$$banner$${std}"; \
+	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+	  echo "$${col}$$dashes$${std}"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f suites/$(DEPDIR)/$(am__dirstamp)
+	-rm -f suites/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR) suites/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR) suites/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/starter/tests/starter_tests.c b/src/starter/tests/starter_tests.c
new file mode 100644
index 000000000..4194c5256
--- /dev/null
+++ b/src/starter/tests/starter_tests.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2014 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include <test_runner.h>
+
+/* declare test suite constructors */
+#define TEST_SUITE(x) test_suite_t* x();
+#include "starter_tests.h"
+#undef TEST_SUITE
+
+static test_configuration_t tests[] = {
+#define TEST_SUITE(x) \
+	{ .suite = x, },
+#include "starter_tests.h"
+	{ .suite = NULL, }
+};
+
+static bool test_runner_init(bool init)
+{
+	if (!init)
+	{
+		lib->processor->set_threads(lib->processor, 0);
+		lib->processor->cancel(lib->processor);
+	}
+	return TRUE;
+}
+
+int main(int argc, char *argv[])
+{
+	return test_runner_run("stroke", tests, test_runner_init);
+}
diff --git a/src/starter/tests/starter_tests.h b/src/starter/tests/starter_tests.h
new file mode 100644
index 000000000..3486597a0
--- /dev/null
+++ b/src/starter/tests/starter_tests.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2014 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+TEST_SUITE(parser_suite_create)
diff --git a/src/starter/tests/suites/test_parser.c b/src/starter/tests/suites/test_parser.c
new file mode 100644
index 000000000..26a41ba55
--- /dev/null
+++ b/src/starter/tests/suites/test_parser.c
@@ -0,0 +1,575 @@
+/*
+ * Copyright (C) 2014 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include <unistd.h>
+
+#include <test_suite.h>
+
+#include "../../parser/conf_parser.h"
+
+static char *path = "/tmp/strongswan-starter-parser-test";
+static conf_parser_t *parser;
+
+static void create_parser(chunk_t contents)
+{
+	ck_assert(chunk_write(contents, path, 0022, TRUE));
+	parser = conf_parser_create(path);
+}
+
+START_TEARDOWN(teardown_parser)
+{
+	parser->destroy(parser);
+	unlink(path);
+}
+END_TEARDOWN
+
+START_TEST(test_get_sections_config_setup)
+{
+	enumerator_t *enumerator;
+
+	create_parser(chunk_from_str(""));
+	ck_assert(parser->parse(parser));
+	enumerator = parser->get_sections(parser, CONF_PARSER_CONFIG_SETUP);
+	ck_assert(enumerator);
+	ck_assert(!enumerator->enumerate(enumerator, NULL));
+	enumerator->destroy(enumerator);
+	parser->destroy(parser);
+
+	create_parser(chunk_from_str("config setup\n\tfoo=bar"));
+	ck_assert(parser->parse(parser));
+	enumerator = parser->get_sections(parser, CONF_PARSER_CONFIG_SETUP);
+	ck_assert(enumerator);
+	ck_assert(!enumerator->enumerate(enumerator, NULL));
+	enumerator->destroy(enumerator);
+}
+END_TEST
+
+START_TEST(test_get_sections_conn)
+{
+	enumerator_t *enumerator;
+	char *name;
+
+	create_parser(chunk_from_str(""));
+	ck_assert(parser->parse(parser));
+	enumerator = parser->get_sections(parser, CONF_PARSER_CONN);
+	ck_assert(enumerator);
+	ck_assert(!enumerator->enumerate(enumerator, NULL));
+	enumerator->destroy(enumerator);
+	parser->destroy(parser);
+
+	create_parser(chunk_from_str(
+		"conn foo\n"
+		"conn bar\n"
+		"conn foo\n"));
+	ck_assert(parser->parse(parser));
+	enumerator = parser->get_sections(parser, CONF_PARSER_CONN);
+	ck_assert(enumerator);
+	ck_assert(enumerator->enumerate(enumerator, &name));
+	ck_assert_str_eq("foo", name);
+	ck_assert(enumerator->enumerate(enumerator, &name));
+	ck_assert_str_eq("bar", name);
+	ck_assert(!enumerator->enumerate(enumerator, &name));
+	enumerator->destroy(enumerator);
+}
+END_TEST
+
+START_TEST(test_get_section_config_setup)
+{
+	dictionary_t *dict;
+
+	create_parser(chunk_from_str(""));
+	ck_assert(parser->parse(parser));
+	dict = parser->get_section(parser, CONF_PARSER_CONFIG_SETUP, "foo");
+	ck_assert(dict);
+	dict->destroy(dict);
+	parser->destroy(parser);
+
+	create_parser(chunk_from_str("config setup\n\tfoo=bar"));
+	ck_assert(parser->parse(parser));
+	dict = parser->get_section(parser, CONF_PARSER_CONFIG_SETUP, NULL);
+	ck_assert(dict);
+	dict->destroy(dict);
+	parser->destroy(parser);
+
+	create_parser(chunk_from_str("config setup\n\tfoo=bar"));
+	ck_assert(parser->parse(parser));
+	dict = parser->get_section(parser, CONF_PARSER_CONFIG_SETUP, "foo");
+	ck_assert(dict);
+	dict->destroy(dict);
+}
+END_TEST
+
+START_TEST(test_get_section_conn)
+{
+	dictionary_t *dict;
+
+	create_parser(chunk_from_str(""));
+	ck_assert(parser->parse(parser));
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "foo");
+	ck_assert(!dict);
+	parser->destroy(parser);
+
+	create_parser(chunk_from_str("conn foo\n"));
+	ck_assert(parser->parse(parser));
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "foo");
+	ck_assert(!parser->get_section(parser, CONF_PARSER_CONN, "bar"));
+	ck_assert(dict);
+	dict->destroy(dict);
+	parser->destroy(parser);
+
+	create_parser(chunk_from_str("conn foo\n\tfoo=bar"));
+	ck_assert(parser->parse(parser));
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "foo");
+	ck_assert(dict);
+	dict->destroy(dict);
+}
+END_TEST
+
+START_TEST(test_enumerate_values)
+{
+	enumerator_t *enumerator;
+	dictionary_t *dict;
+	char *key, *value;
+	int i;
+
+	create_parser(chunk_from_str(
+		"conn foo\n"
+		"	foo=bar\n"
+		"	bar=baz"));
+	ck_assert(parser->parse(parser));
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "foo");
+	ck_assert(dict);
+	ck_assert_str_eq("bar", dict->get(dict, "foo"));
+	ck_assert_str_eq("baz", dict->get(dict, "bar"));
+	enumerator = dict->create_enumerator(dict);
+	for (i = 0; enumerator->enumerate(enumerator, &key, &value); i++)
+	{
+		if ((streq(key, "foo") && !streq(value, "bar")) ||
+			(streq(key, "bar") && !streq(value, "baz")))
+		{
+			fail("unexpected setting %s=%s", key, value);
+		}
+	}
+	enumerator->destroy(enumerator);
+	ck_assert_int_eq(i, 2);
+	dict->destroy(dict);
+}
+END_TEST
+
+#define extensibility_config(section) \
+	section "\n" \
+	"	foo=bar\n" \
+	"	dup=one\n" \
+	"	dup=two\n" \
+	"\n" \
+	"	nope=val\n" \
+	"\n" \
+	section "\n" \
+	"	foo=baz\n" \
+	section "\n" \
+	"	answer=42\n" \
+	"	nope=\n"
+
+static struct {
+	char *conf;
+	conf_parser_section_t type;
+	char *name;
+} extensibility_data[] = {
+	{ extensibility_config("config setup"), CONF_PARSER_CONFIG_SETUP, NULL },
+	{ extensibility_config("ca ca-foo"), CONF_PARSER_CA, "ca-foo" },
+	{ extensibility_config("conn conn-foo"), CONF_PARSER_CONN, "conn-foo" },
+};
+
+START_TEST(test_extensibility)
+{
+	dictionary_t *dict;
+
+	create_parser(chunk_from_str(extensibility_data[_i].conf));
+	ck_assert(parser->parse(parser));
+
+	dict = parser->get_section(parser, extensibility_data[_i].type,
+							   extensibility_data[_i].name);
+	ck_assert(dict);
+	ck_assert_str_eq("baz", dict->get(dict, "foo"));
+	ck_assert_str_eq("two", dict->get(dict, "dup"));
+	ck_assert_str_eq("42", dict->get(dict, "answer"));
+	ck_assert(!dict->get(dict, "nope"));
+	ck_assert(!dict->get(dict, "anything"));
+	dict->destroy(dict);
+}
+END_TEST
+
+static struct {
+	char *conf;
+	bool check_section;
+	char *value;
+} comments_data[] = {
+	{ "# conn foo", FALSE, NULL },
+	{ "# conn foo\n", FALSE, NULL },
+	{ "conn foo # asdf", TRUE, NULL },
+	{ "conn foo # asdf", TRUE, NULL },
+	{ "conn foo# asdf\n", TRUE, NULL },
+	{ "conn foo # asdf\n\tkey=val", TRUE, "val" },
+	{ "conn foo # asdf\n#\tkey=val", TRUE, NULL },
+	{ "conn foo # asdf\n\t#key=val", TRUE, NULL },
+	{ "conn foo # asdf\n\tkey=@#keyid", TRUE, "@#keyid" },
+	{ "conn foo # asdf\n\tkey=\"@#keyid\"", TRUE, "@#keyid" },
+	{ "conn foo # asdf\n\tkey=asdf@#keyid", TRUE, "asdf@" },
+	{ "conn foo # asdf\n\tkey=#val", TRUE, NULL },
+	{ "conn foo # asdf\n\tkey=val#asdf", TRUE, "val" },
+	{ "conn foo # asdf\n\tkey=\"val#asdf\"", TRUE, "val#asdf" },
+	{ "conn foo # asdf\n\tkey=val # asdf\n", TRUE, "val" },
+	{ "conn foo # asdf\n# asdf\n\tkey=val\n", TRUE, "val" },
+	{ "conn foo # asdf\n\t# asdf\n\tkey=val\n", TRUE, "val" },
+};
+
+START_TEST(test_comments)
+{
+	dictionary_t *dict;
+
+	create_parser(chunk_from_str(comments_data[_i].conf));
+	ck_assert(parser->parse(parser));
+	if (comments_data[_i].check_section)
+	{
+		dict = parser->get_section(parser, CONF_PARSER_CONN, "foo");
+		ck_assert(dict);
+		if (comments_data[_i].value)
+		{
+			ck_assert_str_eq(comments_data[_i].value, dict->get(dict, "key"));
+		}
+		else
+		{
+			ck_assert(!dict->get(dict, "key"));
+		}
+		dict->destroy(dict);
+	}
+	else
+	{
+		ck_assert(!parser->get_section(parser, CONF_PARSER_CONN, "foo"));
+	}
+}
+END_TEST
+
+static struct {
+	char *conf;
+	bool check_section;
+	char *value;
+} whitespace_data[] = {
+	{ "conn foo   ", FALSE, NULL },
+	{ "conn    foo", FALSE, NULL },
+	{ "conn    foo\n", FALSE, NULL },
+	{ "conn    foo  \n", FALSE, NULL },
+	{ "conn foo\n   ", FALSE, NULL },
+	{ "conn foo\n   \n", FALSE, NULL },
+	{ "conn foo\nconn bar", TRUE, NULL },
+	{ "conn foo\n   \nconn bar", TRUE, NULL },
+	{ "conn foo\n key=val", FALSE, "val" },
+	{ "conn foo\n\tkey=val", FALSE, "val" },
+	{ "conn foo\n\t  \tkey=val", FALSE, "val" },
+	{ "conn foo\n\tkey  =  val  ", FALSE, "val" },
+};
+
+START_TEST(test_whitespace)
+{
+	dictionary_t *dict;
+
+	create_parser(chunk_from_str(whitespace_data[_i].conf));
+	ck_assert(parser->parse(parser));
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "foo");
+	ck_assert(dict);
+	if (whitespace_data[_i].value)
+	{
+		ck_assert_str_eq(whitespace_data[_i].value, dict->get(dict, "key"));
+	}
+	else
+	{
+		ck_assert(!dict->get(dict, "key"));
+	}
+	dict->destroy(dict);
+	if (whitespace_data[_i].check_section)
+	{
+		dict = parser->get_section(parser, CONF_PARSER_CONN, "bar");
+		ck_assert(dict);
+		dict->destroy(dict);
+	}
+	else
+	{
+		ck_assert(!parser->get_section(parser, CONF_PARSER_CONN, "bar"));
+	}
+}
+END_TEST
+
+static struct {
+	bool valid;
+	char *conf;
+	char *section;
+	char *value;
+} strings_data[] = {
+	{ FALSE, "\"conn foo\"", NULL, NULL },
+	{ TRUE, "conn \"foo\"", "foo", NULL },
+	{ FALSE, "conn foo bar", NULL, NULL },
+	{ TRUE, "conn \"foo bar\"", "foo bar", NULL },
+	{ TRUE, "conn \"#foo\"", "#foo", NULL },
+	{ FALSE, "conn foo\n\t\"key=val\"", "foo", NULL },
+	{ TRUE, "conn foo\n\t\"key\"=val", "foo", "val" },
+	{ TRUE, "conn foo\n\tkey=val ue", "foo", "val ue" },
+	{ TRUE, "conn foo\n\tkey=val     ue", "foo", "val ue" },
+	{ TRUE, "conn foo\n\tkey=\"val   ue\"", "foo", "val   ue" },
+	{ TRUE, "conn foo\n\tkey=\"val\\nue\"", "foo", "val\nue" },
+};
+
+START_TEST(test_strings)
+{
+	dictionary_t *dict;
+
+	create_parser(chunk_from_str(strings_data[_i].conf));
+	ck_assert(parser->parse(parser) == strings_data[_i].valid);
+	if (strings_data[_i].section)
+	{
+		dict = parser->get_section(parser, CONF_PARSER_CONN,
+								   strings_data[_i].section);
+		ck_assert(dict);
+		if (strings_data[_i].value)
+		{
+			ck_assert_str_eq(strings_data[_i].value, dict->get(dict, "key"));
+		}
+		else
+		{
+			ck_assert(!dict->get(dict, "key"));
+		}
+		dict->destroy(dict);
+	}
+}
+END_TEST
+
+START_TEST(test_refcounting)
+{
+	dictionary_t *dict;
+
+	create_parser(chunk_from_str(
+		"conn foo\n"
+		"	key=val"));
+
+	ck_assert(parser->parse(parser));
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "foo");
+	ck_assert(dict);
+	ck_assert_str_eq("val", dict->get(dict, "key"));
+	parser->destroy(parser);
+	ck_assert_str_eq("val", dict->get(dict, "key"));
+	dict->destroy(dict);
+}
+END_TEST
+
+START_TEST(test_default)
+{
+	enumerator_t *enumerator;
+	dictionary_t *dict;
+	char *name;
+
+	create_parser(chunk_from_str(
+		"conn %default\n"
+		"	key=valdef\n"
+		"	unset=set\n"
+		"conn A\n"
+		"	key=vala\n"
+		"	unset=\n"
+		"conn B\n"
+		"	keyb=valb\n"
+		""));
+
+	ck_assert(parser->parse(parser));
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "%default");
+	ck_assert(!dict);
+	enumerator = parser->get_sections(parser, CONF_PARSER_CONN);
+	ck_assert(enumerator);
+	ck_assert(enumerator->enumerate(enumerator, &name));
+	ck_assert_str_eq("A", name);
+	ck_assert(enumerator->enumerate(enumerator, &name));
+	ck_assert_str_eq("B", name);
+	ck_assert(!enumerator->enumerate(enumerator, &name));
+	enumerator->destroy(enumerator);
+
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "A");
+	ck_assert(dict);
+	ck_assert_str_eq("vala", dict->get(dict, "key"));
+	ck_assert(!dict->get(dict, "unset"));
+	dict->destroy(dict);
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "B");
+	ck_assert(dict);
+	ck_assert_str_eq("valdef", dict->get(dict, "key"));
+	ck_assert_str_eq("valb", dict->get(dict, "keyb"));
+	ck_assert_str_eq("set", dict->get(dict, "unset"));
+	dict->destroy(dict);
+}
+END_TEST
+
+START_TEST(test_also)
+{
+	dictionary_t *dict;
+
+	create_parser(chunk_from_str(
+		"conn A\n"
+		"	key=vala\n"
+		"	keya=val1\n"
+		"	unset=set\n"
+		"conn B\n"
+		"	also=A\n"
+		"	key=valb\n"
+		"	keyb=val2\n"
+		"	unset=\n"
+		"conn C\n"
+		"	keyc=val3\n"
+		"	unset=set again\n"
+		"	also=B\n"
+		"conn D\n"
+		"	keyd=val4\n"
+		"	also=A\n"
+		"	also=B\n"
+		"conn E\n"
+		"	keye=val5\n"
+		"	also=B\n"
+		"	also=A\n"
+		""));
+
+	ck_assert(parser->parse(parser));
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "B");
+	ck_assert(dict);
+	ck_assert_str_eq("valb", dict->get(dict, "key"));
+	ck_assert_str_eq("val1", dict->get(dict, "keya"));
+	ck_assert_str_eq("val2", dict->get(dict, "keyb"));
+	ck_assert(!dict->get(dict, "unset"));
+	dict->destroy(dict);
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "C");
+	ck_assert(dict);
+	ck_assert_str_eq("valb", dict->get(dict, "key"));
+	ck_assert_str_eq("val1", dict->get(dict, "keya"));
+	ck_assert_str_eq("val2", dict->get(dict, "keyb"));
+	ck_assert_str_eq("val3", dict->get(dict, "keyc"));
+	ck_assert_str_eq("set again", dict->get(dict, "unset"));
+	dict->destroy(dict);
+	/* since B includes A too the inclusion in D and E has no effect */
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "D");
+	ck_assert(dict);
+	ck_assert_str_eq("valb", dict->get(dict, "key"));
+	ck_assert_str_eq("val1", dict->get(dict, "keya"));
+	ck_assert_str_eq("val2", dict->get(dict, "keyb"));
+	ck_assert(!dict->get(dict, "keyc"));
+	ck_assert_str_eq("val4", dict->get(dict, "keyd"));
+	ck_assert(!dict->get(dict, "unset"));
+	dict->destroy(dict);
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "E");
+	ck_assert(dict);
+	ck_assert_str_eq("valb", dict->get(dict, "key"));
+	ck_assert_str_eq("val1", dict->get(dict, "keya"));
+	ck_assert_str_eq("val2", dict->get(dict, "keyb"));
+	ck_assert(!dict->get(dict, "keyc"));
+	ck_assert(!dict->get(dict, "keyd"));
+	ck_assert_str_eq("val5", dict->get(dict, "keye"));
+	ck_assert(!dict->get(dict, "unset"));
+	dict->destroy(dict);
+}
+END_TEST
+
+START_TEST(test_ambiguous)
+{
+	dictionary_t *dict;
+
+	create_parser(chunk_from_str(
+		"conn A\n"
+		"	key=vala\n"
+		"conn B\n"
+		"	key=valb\n"
+		"conn C\n"
+		"	also=A\n"
+		"	also=B\n"
+		"conn D\n"
+		"	also=B\n"
+		"	also=A\n"
+		"conn E\n"
+		"	also=C\n"
+		"	also=D\n"
+		"conn F\n"
+		"	also=D\n"
+		"	also=C\n"));
+
+	ck_assert(parser->parse(parser));
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "E");
+	ck_assert(dict);
+	ck_assert_str_eq("valb", dict->get(dict, "key"));
+	dict->destroy(dict);
+	dict = parser->get_section(parser, CONF_PARSER_CONN, "F");
+	ck_assert(dict);
+	ck_assert_str_eq("vala", dict->get(dict, "key"));
+	dict->destroy(dict);
+}
+END_TEST
+
+Suite *parser_suite_create()
+{
+	Suite *s;
+	TCase *tc;
+
+	s = suite_create("ipsec.conf parser");
+
+	tc = tcase_create("get_section(s)");
+	tcase_add_checked_fixture(tc, NULL, teardown_parser);
+	tcase_add_test(tc, test_get_sections_config_setup);
+	tcase_add_test(tc, test_get_sections_conn);
+	tcase_add_test(tc, test_get_section_config_setup);
+	tcase_add_test(tc, test_get_section_conn);
+	suite_add_tcase(s, tc);
+
+	tc = tcase_create("enumerate settings");
+	tcase_add_checked_fixture(tc, NULL, teardown_parser);
+	tcase_add_test(tc, test_enumerate_values);
+	suite_add_tcase(s, tc);
+
+	tc = tcase_create("extensibility");
+	tcase_add_checked_fixture(tc, NULL, teardown_parser);
+	tcase_add_loop_test(tc, test_extensibility, 0, countof(extensibility_data));
+	suite_add_tcase(s, tc);
+
+	tc = tcase_create("comments");
+	tcase_add_checked_fixture(tc, NULL, teardown_parser);
+	tcase_add_loop_test(tc, test_comments, 0, countof(comments_data));
+	suite_add_tcase(s, tc);
+
+	tc = tcase_create("whitespace");
+	tcase_add_checked_fixture(tc, NULL, teardown_parser);
+	tcase_add_loop_test(tc, test_whitespace, 0, countof(whitespace_data));
+	suite_add_tcase(s, tc);
+
+	tc = tcase_create("strings");
+	tcase_add_checked_fixture(tc, NULL, teardown_parser);
+	tcase_add_loop_test(tc, test_strings, 0, countof(strings_data));
+	suite_add_tcase(s, tc);
+
+	tc = tcase_create("refcounting");
+	tcase_add_test(tc, test_refcounting);
+	suite_add_tcase(s, tc);
+
+	tc = tcase_create("%default");
+	tcase_add_checked_fixture(tc, NULL, teardown_parser);
+	tcase_add_test(tc, test_default);
+	suite_add_tcase(s, tc);
+
+	tc = tcase_create("also=");
+	tcase_add_checked_fixture(tc, NULL, teardown_parser);
+	tcase_add_test(tc, test_also);
+	tcase_add_test(tc, test_ambiguous);
+	suite_add_tcase(s, tc);
+
+	return s;
+}