Merge upstream version 4.5.2

3 files changed, 11 insertions, 58 deletions

diff --git a/src/libstrongswan/plugins/mysql/Makefile.in b/src/libstrongswan/plugins/mysql/Makefile.in
index 7a6c57dd1..32067d5b4 100644
--- a/src/libstrongswan/plugins/mysql/Makefile.in
+++ b/src/libstrongswan/plugins/mysql/Makefile.in
@@ -221,13 +221,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@
@@ -248,6 +242,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@
@@ -266,14 +262,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@
diff --git a/src/libstrongswan/plugins/mysql/mysql_database.c b/src/libstrongswan/plugins/mysql/mysql_database.c
index 0b9f8285d..5fbfa0f28 100644
--- a/src/libstrongswan/plugins/mysql/mysql_database.c
+++ b/src/libstrongswan/plugins/mysql/mysql_database.c
@@ -474,15 +474,8 @@ static bool mysql_enumerator_enumerate(mysql_enumerator_t *this, ...)
 	return TRUE;
 }
 
-<<<<<<< HEAD
-/**
- * Implementation of database_t.query.
- */
-static enumerator_t* query(private_mysql_database_t *this, char *sql, ...)
-=======
 METHOD(database_t, query, enumerator_t*,
 	private_mysql_database_t *this, char *sql, ...)
->>>>>>> upstream/4.5.1
 {
 	MYSQL_STMT *stmt;
 	va_list args;
@@ -568,15 +561,8 @@ METHOD(database_t, query, enumerator_t*,
 	return (enumerator_t*)enumerator;
 }
 
-<<<<<<< HEAD
-/**
- * Implementation of database_t.execute.
- */
-static int execute(private_mysql_database_t *this, int *rowid, char *sql, ...)
-=======
 METHOD(database_t, execute, int,
 	private_mysql_database_t *this, int *rowid, char *sql, ...)
->>>>>>> upstream/4.5.1
 {
 	MYSQL_STMT *stmt;
 	va_list args;
@@ -604,28 +590,14 @@ METHOD(database_t, execute, int,
 	return affected;
 }
 
-<<<<<<< HEAD
-/**
- * Implementation of database_t.get_driver
- */
-static db_driver_t get_driver(private_mysql_database_t *this)
-=======
 METHOD(database_t, get_driver,db_driver_t,
 	private_mysql_database_t *this)
->>>>>>> upstream/4.5.1
 {
 	return DB_MYSQL;
 }
 
-<<<<<<< HEAD
-/**
- * Implementation of database_t.destroy
- */
-static void destroy(private_mysql_database_t *this)
-=======
 METHOD(database_t, destroy, void,
 	private_mysql_database_t *this)
->>>>>>> upstream/4.5.1
 {
 	this->pool->destroy_function(this->pool, (void*)conn_destroy);
 	this->mutex->destroy(this->mutex);
@@ -697,14 +669,6 @@ mysql_database_t *mysql_database_create(char *uri)
 		return NULL;
 	}
 
-<<<<<<< HEAD
-	this = malloc_thing(private_mysql_database_t);
-
-	this->public.db.query = (enumerator_t* (*)(database_t *this, char *sql, ...))query;
-	this->public.db.execute = (int (*)(database_t *this, int *rowid, char *sql, ...))execute;
-	this->public.db.get_driver = (db_driver_t(*)(database_t*))get_driver;
-	this->public.db.destroy = (void(*)(database_t*))destroy;
-=======
 	INIT(this,
 		.public = {
 			.db = {
@@ -715,7 +679,6 @@ mysql_database_t *mysql_database_create(char *uri)
 			},
 		},
 	);
->>>>>>> upstream/4.5.1
 
 	if (!parse_uri(this, uri))
 	{
diff --git a/src/libstrongswan/plugins/mysql/mysql_plugin.c b/src/libstrongswan/plugins/mysql/mysql_plugin.c
index 738bbeddb..579df4d50 100644
--- a/src/libstrongswan/plugins/mysql/mysql_plugin.c
+++ b/src/libstrongswan/plugins/mysql/mysql_plugin.c
@@ -32,15 +32,14 @@ struct private_mysql_plugin_t {
 	mysql_plugin_t public;
 };
 
-<<<<<<< HEAD
-/**
- * Implementation of plugin_t.destroy
- */
-static void destroy(private_mysql_plugin_t *this)
-=======
+METHOD(plugin_t, get_name, char*,
+	private_mysql_plugin_t *this)
+{
+	return "mysql";
+}
+
 METHOD(plugin_t, destroy, void,
 	private_mysql_plugin_t *this)
->>>>>>> upstream/4.5.1
 {
 	lib->db->remove_database(lib->db,
 							 (database_constructor_t)mysql_database_create);
@@ -61,18 +60,15 @@ plugin_t *mysql_plugin_create()
 		return NULL;
 	}
 
-<<<<<<< HEAD
-	this = malloc_thing(private_mysql_plugin_t);
-	this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
-=======
 	INIT(this,
 		.public = {
 			.plugin = {
+				.get_name = _get_name,
+				.reload = (void*)return_false,
 				.destroy = _destroy,
 			},
 		},
 	);
->>>>>>> upstream/4.5.1
 
 	lib->db->add_database(lib->db,
 						  (database_constructor_t)mysql_database_create);