Merge upstream version 4.5.2

4 files changed, 12 insertions, 50 deletions

diff --git a/src/libcharon/plugins/maemo/Makefile.am b/src/libcharon/plugins/maemo/Makefile.am
index 95a76fe90..0bf7fad5d 100644
--- a/src/libcharon/plugins/maemo/Makefile.am
+++ b/src/libcharon/plugins/maemo/Makefile.am
@@ -19,13 +19,9 @@ libstrongswan_maemo_la_LIBADD  = ${maemo_LIBS}
 
 dbusservice_DATA = org.strongswan.charon.service
 
-<<<<<<< HEAD
-EXTRA_DIST = $(dbusservice_DATA)
-=======
 org.strongswan.charon.service: $(srcdir)/org.strongswan.charon.service.in
 	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' $< >$@
 
 EXTRA_DIST = org.strongswan.charon.service.in
 CLEANFILES = $(dbusservice_DATA)
->>>>>>> upstream/4.5.1
 
diff --git a/src/libcharon/plugins/maemo/Makefile.in b/src/libcharon/plugins/maemo/Makefile.in
index cfa6e6115..27e72295c 100644
--- a/src/libcharon/plugins/maemo/Makefile.in
+++ b/src/libcharon/plugins/maemo/Makefile.in
@@ -224,13 +224,7 @@ includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 ipsecdir = @ipsecdir@
-<<<<<<< HEAD
-ipsecgid = @ipsecgid@
 ipsecgroup = @ipsecgroup@
-ipsecuid = @ipsecuid@
-=======
-ipsecgroup = @ipsecgroup@
->>>>>>> upstream/4.5.1
 ipsecuser = @ipsecuser@
 libcharon_plugins = @libcharon_plugins@
 libdir = @libdir@
@@ -251,6 +245,8 @@ nm_ca_dir = @nm_ca_dir@
 oldincludedir = @oldincludedir@
 openac_plugins = @openac_plugins@
 p_plugins = @p_plugins@
+pcsclite_CFLAGS = @pcsclite_CFLAGS@
+pcsclite_LIBS = @pcsclite_LIBS@
 pdfdir = @pdfdir@
 piddir = @piddir@
 pki_plugins = @pki_plugins@
@@ -269,14 +265,12 @@ sbindir = @sbindir@
 scepclient_plugins = @scepclient_plugins@
 scripts_plugins = @scripts_plugins@
 sharedstatedir = @sharedstatedir@
-<<<<<<< HEAD
-=======
 soup_CFLAGS = @soup_CFLAGS@
 soup_LIBS = @soup_LIBS@
->>>>>>> upstream/4.5.1
 srcdir = @srcdir@
 strongswan_conf = @strongswan_conf@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -297,12 +291,8 @@ libstrongswan_maemo_la_SOURCES = \
 libstrongswan_maemo_la_LDFLAGS = -module -avoid-version
 libstrongswan_maemo_la_LIBADD = ${maemo_LIBS}
 dbusservice_DATA = org.strongswan.charon.service
-<<<<<<< HEAD
-EXTRA_DIST = $(dbusservice_DATA)
-=======
 EXTRA_DIST = org.strongswan.charon.service.in
 CLEANFILES = $(dbusservice_DATA)
->>>>>>> upstream/4.5.1
 all: all-am
 
 .SUFFIXES:
@@ -542,10 +532,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-<<<<<<< HEAD
-=======
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
->>>>>>> upstream/4.5.1
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -644,12 +631,9 @@ uninstall-am: uninstall-dbusserviceDATA uninstall-pluginLTLIBRARIES
 	uninstall-pluginLTLIBRARIES
 
 
-<<<<<<< HEAD
-=======
 org.strongswan.charon.service: $(srcdir)/org.strongswan.charon.service.in
 	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' $< >$@
 
->>>>>>> upstream/4.5.1
 # 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/libcharon/plugins/maemo/maemo_plugin.c b/src/libcharon/plugins/maemo/maemo_plugin.c
index d4549f43a..38cb031b5 100644
--- a/src/libcharon/plugins/maemo/maemo_plugin.c
+++ b/src/libcharon/plugins/maemo/maemo_plugin.c
@@ -34,11 +34,16 @@ struct private_maemo_plugin_t {
 	 * service
 	 */
 	maemo_service_t *service;
-
 };
 
+METHOD(plugin_t, get_name, char*,
+	private_maemo_plugin_t *this)
+{
+	return "maemo";
+}
+
 METHOD(plugin_t, destroy, void,
-	   private_maemo_plugin_t *this)
+	private_maemo_plugin_t *this)
 {
 	this->service->destroy(this->service);
 	free(this);
@@ -54,6 +59,8 @@ plugin_t *maemo_plugin_create()
 	INIT(this,
 		.public = {
 			.plugin = {
+				.get_name = _get_name,
+				.reload = (void*)return_false,
 				.destroy = _destroy,
 			},
 		},
diff --git a/src/libcharon/plugins/maemo/maemo_service.c b/src/libcharon/plugins/maemo/maemo_service.c
index 38ac6f8fc..0e9fd8ccc 100644
--- a/src/libcharon/plugins/maemo/maemo_service.c
+++ b/src/libcharon/plugins/maemo/maemo_service.c
@@ -115,20 +115,11 @@ METHOD(listener_t, ike_updown, bool,
 	return TRUE;
 }
 
-<<<<<<< HEAD
-METHOD(listener_t, child_state_change, bool,
-	   private_maemo_service_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa,
-	   child_sa_state_t state)
-{
-	/* this call back is only registered during initiation */
-	if (this->ike_sa == ike_sa && state == CHILD_DESTROYING)
-=======
 METHOD(listener_t, ike_state_change, bool,
 	   private_maemo_service_t *this, ike_sa_t *ike_sa, ike_sa_state_t state)
 {
 	/* this call back is only registered during initiation */
 	if (this->ike_sa == ike_sa && state == IKE_DESTROYING)
->>>>>>> upstream/4.5.1
 	{
 		change_status(this, VPN_STATUS_CONNECTION_FAILED);
 		return FALSE;
@@ -146,11 +137,7 @@ METHOD(listener_t, child_updown, bool,
 		{
 			/* disable hooks registered to catch initiation failures */
 			this->public.listener.ike_updown = NULL;
-<<<<<<< HEAD
-			this->public.listener.child_state_change = NULL;
-=======
 			this->public.listener.ike_state_change = NULL;
->>>>>>> upstream/4.5.1
 			change_status(this, VPN_STATUS_CONNECTED);
 		}
 		else
@@ -359,11 +346,7 @@ static gboolean initiate_connection(private_maemo_service_t *this,
 
 	child_cfg = child_cfg_create(this->current, &lifetime, NULL /* updown */,
 								 TRUE, MODE_TUNNEL, ACTION_NONE, ACTION_NONE,
-<<<<<<< HEAD
-								 FALSE, 0, 0, NULL, NULL);
-=======
 								 ACTION_NONE, FALSE, 0, 0, NULL, NULL, 0);
->>>>>>> upstream/4.5.1
 	child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
 	ts = traffic_selector_create_dynamic(0, 0, 65535);
 	child_cfg->add_traffic_selector(child_cfg, TRUE, ts);
@@ -387,11 +370,7 @@ static gboolean initiate_connection(private_maemo_service_t *this,
 	this->ike_sa = ike_sa;
 	this->status = VPN_STATUS_CONNECTING;
 	this->public.listener.ike_updown = _ike_updown;
-<<<<<<< HEAD
-	this->public.listener.child_state_change = _child_state_change;
-=======
 	this->public.listener.ike_state_change = _ike_state_change;
->>>>>>> upstream/4.5.1
 	charon->bus->add_listener(charon->bus, &this->public.listener);
 
 	if (ike_sa->initiate(ike_sa, child_cfg, 0, NULL, NULL) != SUCCESS)
@@ -484,11 +463,7 @@ maemo_service_t *maemo_service_create()
 		.public = {
 			.listener = {
 				.ike_updown = _ike_updown,
-<<<<<<< HEAD
-				.child_state_change = _child_state_change,
-=======
 				.ike_state_change = _ike_state_change,
->>>>>>> upstream/4.5.1
 				.child_updown = _child_updown,
 				.ike_rekey = _ike_rekey,
 			},