Fix first secure log ignoring the config

Change-Id: Ifb575f0077fd35556e4263ef002535e274b95187
Signed-off-by: Michal Bloch <m.bloch@samsung.com>

diff --git a/src/libdlog/log.c b/src/libdlog/log.c
index c6d4606..e5e5d17 100644 (file)
--- a/src/libdlog/log.c
+++ b/src/libdlog/log.c
@@ -328,7 +328,7 @@ static int __write_to_log_critical_section(log_id_t log_id, int prio, const char
        return write_to_log(log_id, prio, tag, buf);
 }
 
-static int __write_to_log(log_id_t log_id, int prio, const char *tag, const char *fmt, va_list ap, bool check_should_log)
+static int __write_to_log(log_id_t log_id, int prio, const char *tag, const char *fmt, va_list ap, bool check_should_log, bool secure_log)
 {
        int ret = dlog_check_validity(log_id, prio, tag);
        if (ret < 0)
@@ -351,10 +351,12 @@ static int __write_to_log(log_id_t log_id, int prio, const char *tag, const char
         * pointer could be made to point at a null handler instead of a true NULL)
         * but giving this guarantee makes everything a lot simpler as it removes
         * the risk of something suddenly becoming NULL during processing. */
-       ret = !initialize() || !write_to_log
-               ? DLOG_ERROR_NOT_PERMITTED
-               : __write_to_log_critical_section(log_id, prio, tag, fmt, ap, check_should_log)
-               ;
+       if (!initialize() || !write_to_log)
+               ret = DLOG_ERROR_NOT_PERMITTED;
+       else if (secure_log && !enable_secure_logs)
+               ret = 0;
+       else
+               ret = __write_to_log_critical_section(log_id, prio, tag, fmt, ap, check_should_log);
 
        pthread_setcancelstate(old_cancel_state, NULL);
 
@@ -543,7 +545,7 @@ int __dlog_critical_print(log_id_t log_id, int prio, const char *tag, const char
  */
 int __dlog_vprint(log_id_t log_id, int prio, const char *tag, const char *fmt, va_list ap)
 {
-       int ret = __write_to_log(log_id, prio, tag, fmt, ap, true);
+       int ret = __write_to_log(log_id, prio, tag, fmt, ap, true, false);
        __dlog_fatal_assert(prio);
 
        return ret;
@@ -586,7 +588,8 @@ int __dlog_sec_print(log_id_t log_id, int prio, const char *tag, const char *fmt
        va_list ap;
 
        va_start(ap, fmt);
-       int ret = __dlog_vprint(log_id, prio, tag, fmt, ap);
+       int ret = __write_to_log(log_id, prio, tag, fmt, ap, true, true);
+       __dlog_fatal_assert(prio);
        va_end(ap);
 
        return ret;
@@ -594,7 +597,7 @@ int __dlog_sec_print(log_id_t log_id, int prio, const char *tag, const char *fmt
 
 int dlog_vprint(log_priority prio, const char *tag, const char *fmt, va_list ap)
 {
-       return __write_to_log(LOG_ID_APPS, prio, tag, fmt, ap, false);
+       return __write_to_log(LOG_ID_APPS, prio, tag, fmt, ap, false, false);
 }
 
 int dlog_print(log_priority prio, const char *tag, const char *fmt, ...)