From: Jan Janssen <medhefgo@web.de>
Date: Mon, 25 Jun 2018 18:33:31 +0000 (+0200)
Subject: crypt-util: Translate libcryptsetup log level instead of using log_debug()
X-Git-Tag: v240~1039
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa2cc005d77890b07e8c579f25e1333ff8ba8dac;p=thirdparty%2Fsystemd.git

crypt-util: Translate libcryptsetup log level instead of using log_debug()

This makes sure that errors reported by libcryptsetup are shown to the
user instead of getting swallowed up by log_debug().
---

diff --git a/src/basic/crypt-util.c b/src/basic/crypt-util.c
index b181ba3ba02..20bdc5489e5 100644
--- a/src/basic/crypt-util.c
+++ b/src/basic/crypt-util.c
@@ -5,6 +5,24 @@
 #include "log.h"
 
 void cryptsetup_log_glue(int level, const char *msg, void *usrptr) {
-        log_debug("%s", msg);
+        switch (level) {
+        case CRYPT_LOG_NORMAL:
+                level = LOG_NOTICE;
+                break;
+        case CRYPT_LOG_ERROR:
+                level = LOG_ERR;
+                break;
+        case CRYPT_LOG_VERBOSE:
+                level = LOG_INFO;
+                break;
+        case CRYPT_LOG_DEBUG:
+                level = LOG_DEBUG;
+                break;
+        default:
+                log_error("Unknown libcryptsetup log level: %d", level);
+                level = LOG_ERR;
+        }
+
+        log_full(level, "%s", msg);
 }
 #endif