3 files changed, 7 insertions, 20 deletions

diff --git a/src/scepclient/Makefile.in b/src/scepclient/Makefile.in
index 880715697..9f8ac874e 100644
--- a/src/scepclient/Makefile.in
+++ b/src/scepclient/Makefile.in
@@ -228,13 +228,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@
@@ -255,6 +249,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@
@@ -273,14 +269,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/scepclient/scepclient.8 b/src/scepclient/scepclient.8
index d717ba309..72750e155 100644
--- a/src/scepclient/scepclient.8
+++ b/src/scepclient/scepclient.8
@@ -239,20 +239,12 @@ Log raw hex dumps.
 .PP 
 .B \-C, \-\-debug\-control
 .RS 4
-<<<<<<< HEAD
-Log informations about control flow.
-=======
 Log information about control flow.
->>>>>>> upstream/4.5.1
 .RE
 .PP 
 .B \-M, \-\-debug\-controlmore
 .RS 4
-<<<<<<< HEAD
-Log more detailed informations about control flow.
-=======
 Log more detailed information about control flow.
->>>>>>> upstream/4.5.1
 .RE
 .PP 
 .B \-X, \-\-debug\-private
diff --git a/src/scepclient/scepclient.c b/src/scepclient/scepclient.c
index 448854acd..d9f6b0925 100644
--- a/src/scepclient/scepclient.c
+++ b/src/scepclient/scepclient.c
@@ -279,14 +279,15 @@ usage(const char *message)
  */
 static void print_plugins()
 {
-	char buf[BUF_LEN], *plugin;
+	char buf[BUF_LEN];
+	plugin_t *plugin;
 	int len = 0;
 	enumerator_t *enumerator;
 
 	enumerator = lib->plugins->create_plugin_enumerator(lib->plugins);
 	while (len < BUF_LEN && enumerator->enumerate(enumerator, &plugin))
 	{
-		len += snprintf(&buf[len], BUF_LEN-len, "%s ", plugin);
+		len += snprintf(&buf[len], BUF_LEN-len, "%s ", plugin->get_name(plugin));
 	}
 	enumerator->destroy(enumerator);
 	DBG1(DBG_LIB, "  loaded plugins: %s", buf);
@@ -1019,6 +1020,7 @@ int main(int argc, char **argv)
 	 */
 	if (filetype_out & CERT)
 	{
+		bool stored = FALSE;
 		certificate_t *cert;
 		enumerator_t  *enumerator;
 		char *path = concatenate_paths(CA_CERT_PATH, file_in_cacert_sig);
@@ -1128,7 +1130,6 @@ int main(int argc, char **argv)
 		enumerator = certs->create_enumerator(certs);
 		while (enumerator->enumerate(enumerator, &cert))
 		{
-			bool stored = FALSE;
 			x509_t *x509 = (x509_t*)cert;
 
 			if (!(x509->get_flags(x509) & X509_CA))