UTIL: Allow to append new line in sss_vdebug_fn

libldb is not consistent with appending line feed
in debug messages. AS a result of this two messages can be on the same line
in sssd log files. Which makes analyzing log files more difficult.

Reviewed-by: Pavel Březina <pbrezina@redhat.com>

3 files changed, 11 insertions, 3 deletions

diff --git a/src/util/debug.c b/src/util/debug.c
index 2aeaee580..ca4fa4c6f 100644
--- a/src/util/debug.c
+++ b/src/util/debug.c
@@ -210,6 +210,7 @@ void sss_vdebug_fn(const char *file,
                    long line,
                    const char *function,
                    int level,
+                   int flags,
                    const char *format,
                    va_list ap)
 {
@@ -265,6 +266,9 @@ void sss_vdebug_fn(const char *file,
     }
 
     debug_vprintf(format, ap);
+    if (flags & APPEND_LINE_FEED) {
+        debug_printf("\n");
+    }
     debug_fflush();
 }
 
@@ -277,7 +281,7 @@ void sss_debug_fn(const char *file,
     va_list ap;
 
     va_start(ap, format);
-    sss_vdebug_fn(file, line, function, level, format, ap);
+    sss_vdebug_fn(file, line, function, level, 0, format, ap);
     va_end(ap);
 }
 
@@ -302,7 +306,8 @@ void ldb_debug_messages(void *context, enum ldb_debug_level level,
     }
 
     if (DEBUG_IS_SET(loglevel)) {
-        sss_vdebug_fn(__FILE__, __LINE__, "ldb", loglevel, fmt, ap);
+        sss_vdebug_fn(__FILE__, __LINE__, "ldb", loglevel, APPEND_LINE_FEED,
+                      fmt, ap);
     }
 }
 
diff --git a/src/util/debug.h b/src/util/debug.h
index 667021ba1..2a1bd4ffd 100644
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -29,6 +29,8 @@
 #define SSS_ATTRIBUTE_PRINTF(a1, a2)
 #endif
 
+#define APPEND_LINE_FEED 0x1
+
 extern const char *debug_prg_name;
 extern int debug_level;
 extern int debug_timestamps;
@@ -40,6 +42,7 @@ void sss_vdebug_fn(const char *file,
                    long line,
                    const char *function,
                    int level,
+                   int flags,
                    const char *format,
                    va_list ap);
 void sss_debug_fn(const char *file,
diff --git a/src/util/sss_semanage.c b/src/util/sss_semanage.c
index 7f7464911..d76677ee7 100644
--- a/src/util/sss_semanage.c
+++ b/src/util/sss_semanage.c
@@ -55,7 +55,7 @@ static void sss_semanage_error_callback(void *varg,
 
     va_start(ap, fmt);
     if (DEBUG_IS_SET(level)) {
-        sss_vdebug_fn(__FILE__, __LINE__, "libsemanage", level, fmt, ap);
+        sss_vdebug_fn(__FILE__, __LINE__, "libsemanage", level, 0, fmt, ap);
     }
     va_end(ap);
 }