From def1777ecaaf370c5e10d9e0d9528297a02d2825 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Sat, 18 Jul 2009 11:23:27 +0200
Subject: [PATCH] streamlined integrity test output some more

---
 src/charon/daemon.c                       | 2 ++
 src/libstrongswan/plugins/plugin_loader.c | 7 ++-----
 src/pluto/plutomain.c                     | 2 ++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/charon/daemon.c b/src/charon/daemon.c
index fe8f96fe2..30b28a6bb 100644
--- a/src/charon/daemon.c
+++ b/src/charon/daemon.c
@@ -467,6 +467,8 @@ static bool initialize(private_daemon_t *this, bool syslog, level_t levels[])
 	if (lib->integrity)
 	{
 		DBG1(DBG_DMN, "integrity tests enabled:");
+		DBG1(DBG_DMN, "lib    'libstrongswan': passed file and segment integrity tests");
+		DBG1(DBG_DMN, "daemon 'charon': passed file integrity test");
 	}
 
 	/* load secrets, ca certificates and crls */
diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c
index b402090df..459ba9ba9 100644
--- a/src/libstrongswan/plugins/plugin_loader.c
+++ b/src/libstrongswan/plugins/plugin_loader.c
@@ -66,12 +66,9 @@ static plugin_t* load_plugin(private_plugin_loader_t *this,
 	{
 		if (!lib->integrity->check_file(lib->integrity, name, file))
 		{
-			DBG1("plugin '%s': failed file integrity test of"
-				 " 'libstrongswan-%s.so'", name, name);
+			DBG1("plugin '%s': failed file integrity test of '%s'", name, file);
 			return NULL;
 		}
-		DBG1("plugin '%s': passed file integrity test of"
-			 " 'libstrongswan-%s.so'", name, name);
 	}
 	handle = dlopen(file, RTLD_LAZY);
 	if (handle == NULL)
@@ -94,7 +91,7 @@ static plugin_t* load_plugin(private_plugin_loader_t *this,
 			dlclose(handle);
 			return NULL;
 		}
-		DBG1("plugin '%s': passed segment integrity test", name);
+		DBG1("plugin '%s': passed file and segment integrity tests", name);
 	}
 	plugin = constructor();
 	if (plugin == NULL)
diff --git a/src/pluto/plutomain.c b/src/pluto/plutomain.c
index 407f5181e..af0c98821 100644
--- a/src/pluto/plutomain.c
+++ b/src/pluto/plutomain.c
@@ -646,6 +646,8 @@ int main(int argc, char **argv)
 	if (lib->integrity)
 	{
 		plog("integrity tests enabled:");
+		plog("lib    'libstrongswan': passed file and segment integrity tests");
+		plog("daemon 'pluto': passed file integrity test");
 	}
 
 	/* load plugins, further infrastructure may need it */