shortened file loading debug output

diff --git a/src/charon/plugins/stroke/stroke_cred.c b/src/charon/plugins/stroke/stroke_cred.c
index 8e49b4aa80013c24b937cddae88eaf55cec4a1fc..73db8d0fd1cb28c1dc7a8b73eee720a49444a8b6 100644 (file)
--- a/src/charon/plugins/stroke/stroke_cred.c
+++ b/src/charon/plugins/stroke/stroke_cred.c
@@ -432,12 +432,11 @@ static certificate_t* load_peer(private_stroke_cred_t *this, char *filename)
        if (cert)
        {
                cert = add_cert(this, cert);
-               DBG1(DBG_CFG, "  loaded certificate '%Y' from "
-                                "file '%s'", cert->get_subject(cert), filename);
+               DBG1(DBG_CFG, "  loaded certificate '%Y' from '%s'",
+                                         cert->get_subject(cert), filename);
                return cert->get_ref(cert);
        }
-       DBG1(DBG_CFG, "  loading certificate from file "
-                "'%s' failed", filename);
+       DBG1(DBG_CFG, "  loading certificate from '%s' failed", filename);
        return NULL;
 }
 
@@ -471,8 +470,8 @@ static void load_certdir(private_stroke_cred_t *this, char *path,
                {
                        case CERT_X509:
                                if (flag & X509_CA)
-                               {       /* for CA certificates, we strictly require CA
-                                        * basicconstraints to be set */
+                               {       /* for CA certificates, we strictly require
+                                        * the CA basic constraint to be set */
                                        cert = lib->creds->create(lib->creds,
                                                                                CRED_CERTIFICATE, CERT_X509,
                                                                                BUILD_FROM_FILE, file, BUILD_END);
@@ -482,22 +481,22 @@ static void load_certdir(private_stroke_cred_t *this, char *path,
 
                                                if (!(x509->get_flags(x509) & X509_CA))
                                                {
-                                                       DBG1(DBG_CFG, "  ca certificate '%Y' misses "
-                                                                "ca basic constraint, discarded",
+                                                       DBG1(DBG_CFG, "  CA certificate '%Y' misses "
+                                                                "CA basic constraint, discarded",
                                                                 cert->get_subject(cert));
                                                        cert->destroy(cert);
                                                        cert = NULL;
                                                }
                                                else
                                                {
-                                                       DBG1(DBG_CFG, "  loaded CA certificate '%Y' from "
-                                                                "file '%s'", cert->get_subject(cert), file);
+                                                       DBG1(DBG_CFG, "  loaded CA certificate '%Y' from '%s'",
+                                                                                 cert->get_subject(cert), file);
                                                }
                                        }
                                        else
                                        {
-                                               DBG1(DBG_CFG, "  loading CA certificate from file "
-                                                        "'%s' failed", file);
+                                               DBG1(DBG_CFG, "  loading CA certificate from '%s' "
+                                                                         "failed", file);
                                        }
                                }
                                else
@@ -508,13 +507,13 @@ static void load_certdir(private_stroke_cred_t *this, char *path,
                                                                                BUILD_X509_FLAG, flag, BUILD_END);
                                        if (cert)
                                        {
-                                               DBG1(DBG_CFG, "  loaded certificate '%Y' from "
-                                                                "file '%s'", cert->get_subject(cert), file);
+                                               DBG1(DBG_CFG, "  loaded certificate '%Y' from '%s'",
+                                                                         cert->get_subject(cert), file);
                                        }
                                        else
                                        {
-                                               DBG1(DBG_CFG, "  loading certificate from file "
-                                                        "'%s' failed", file);
+                                               DBG1(DBG_CFG, "  loading certificate from '%s' "
+                                                                         "failed", file);
                                        }
                                }
                                if (cert)
@@ -530,11 +529,11 @@ static void load_certdir(private_stroke_cred_t *this, char *path,
                                if (cert)
                                {
                                        add_crl(this, (crl_t*)cert);
-                                       DBG1(DBG_CFG, "  loaded crl from file '%s'",  file);
+                                       DBG1(DBG_CFG, "  loaded crl from '%s'",  file);
                                }
                                else
                                {
-                                       DBG1(DBG_CFG, "  loading crl from file '%s' failed", file);
+                                       DBG1(DBG_CFG, "  loading crl from '%s' failed", file);
                                }
                                break;
                        case CERT_X509_AC:
@@ -545,13 +544,13 @@ static void load_certdir(private_stroke_cred_t *this, char *path,
                                if (cert)
                                {
                                        add_ac(this, (ac_t*)cert);
-                                       DBG1(DBG_CFG, "  loaded attribute certificate from "
-                                                "file '%s'", file);
+                                       DBG1(DBG_CFG, "  loaded attribute certificate from '%s'",
+                                                                 file);
                                }
                                else
                                {
-                                       DBG1(DBG_CFG, "  loading attribute certificate from "
-                                                "file '%s' failed", file);
+                                       DBG1(DBG_CFG, "  loading attribute certificate from '%s' "
+                                                                 "failed", file);
                                }
                                break;
                        default:
@@ -915,7 +914,7 @@ static void load_secrets(private_stroke_cred_t *this, char *file, int level,
                        }
                        else
                        {
-                               DBG1(DBG_CFG, "  skipped private key file '%s'", path);
+                               DBG1(DBG_CFG, "  loading private key file '%s' failed", path);
                        }
                        chunk_clear(&secret);
                }

diff --git a/testing/tests/ikev2/crl-from-cache/evaltest.dat b/testing/tests/ikev2/crl-from-cache/evaltest.dat
index 26d8549ef8746eb6409eacc8efc9b2b71fa34578..2f4cf7afab809fb68fbc3b910eea1be3f9a1dda7 100644 (file)
--- a/testing/tests/ikev2/crl-from-cache/evaltest.dat
+++ b/testing/tests/ikev2/crl-from-cache/evaltest.dat
@@ -1,8 +1,8 @@
-moon::cat /var/log/daemon.log::loaded crl from file::YES
+moon::cat /var/log/daemon.log::loaded crl from::YES
 moon::cat /var/log/daemon.log::crl is valid::YES
 moon::cat /var/log/daemon.log::certificate status is good::YES
 moon::ipsec listcrls:: ok::YES
-carol::cat /var/log/daemon.log::loaded crl from file::YES
+carol::cat /var/log/daemon.log::loaded crl from::YES
 carol::cat /var/log/daemon.log::crl is valid::YES
 carol::cat /var/log/daemon.log::certificate status is good::YES
 carol::ipsec listcrls:: ok::YES

diff --git a/testing/tests/ikev2/crl-ldap/evaltest.dat b/testing/tests/ikev2/crl-ldap/evaltest.dat
index d98df8c7ca1af89d7158aa7e3600288310d31099..5ab094401ba06e79b210549bd1b95460056ef0cf 100644 (file)
--- a/testing/tests/ikev2/crl-ldap/evaltest.dat
+++ b/testing/tests/ikev2/crl-ldap/evaltest.dat
@@ -1,9 +1,9 @@
-moon::cat /var/log/daemon.log::loaded crl file::YES
+moon::cat /var/log/daemon.log::loaded crl from::YES
 moon::cat /var/log/daemon.log::crl is stale::YES
 moon::cat /var/log/daemon.log::fetching crl from.*ldap::YES
 moon::cat /var/log/daemon.log::crl is valid::YES
 moon::cat /var/log/daemon.log::certificate status is good::YES
-carol::cat /var/log/daemon.log::loaded crl file::YES
+carol::cat /var/log/daemon.log::loaded crl from::YES
 carol::cat /var/log/daemon.log::crl is stale::YES
 carol::cat /var/log/daemon.log::fetching crl from.*ldap::YES
 carol::cat /var/log/daemon.log::crl is valid::YES