file-logger: Don't log <> if ike_name is disabled and no IKE_SA is available

Fixes: a2fba6db4a17 ("file-logger: Add option to log messages as JSON objects")

diff --git a/src/libcharon/bus/listeners/file_logger.c b/src/libcharon/bus/listeners/file_logger.c
index 3a05aa47ce6fdcae3eaa3fcaa7d06a0274d0de27..d5d2a3d6909068277dfd02a7d5861de1546a4d4d 100644 (file)
--- a/src/libcharon/bus/listeners/file_logger.c
+++ b/src/libcharon/bus/listeners/file_logger.c
@@ -101,7 +101,7 @@ METHOD(logger_t, log_, void,
        ike_sa_t* ike_sa, const char *message)
 {
        char groupstr[5], timestr[128];
-       char idstr[11] = "", namestr[128] = "", nameidstr[142];
+       char idstr[11] = "", namestr[128] = "", nameidstr[142] = "";
        const char *current = message, *next = NULL;
        struct tm tm;
        timeval_t tv;
@@ -199,8 +199,11 @@ METHOD(logger_t, log_, void,
                {
                        snprintf(groupstr, sizeof(groupstr), "%N", debug_names, group);
                }
-               snprintf(nameidstr, sizeof(nameidstr), " <%s%s%s>", namestr,
-                                namestr[0] ? "|" : "", idstr);
+               if (idstr[0])
+               {
+                       snprintf(nameidstr, sizeof(nameidstr), " <%s%s%s>", namestr,
+                                        namestr[0] ? "|" : "", idstr);
+               }
                /* prepend the prefix in front of every line */
                while (TRUE)
                {