- applied patch from andreas

- added charonstart option to config
  - new ikev2 tests for UML

src/starter/confread.h

@@ -151,6 +151,8 @@ struct starter_config {
 		lset_t	seen;
 		char	**interfaces;
 		char	*dumpdir;
+		bool	charonstart;
+		bool	plutostart;
 
 		/* pluto keywords */
 		char	**plutodebug;