--- libaacs-git-37b8a4807.old/src/file/keydbcfg.c
+++ libaacs-git-37b8a4807/src/file/keydbcfg.c
@@ -56,7 +56,7 @@
 
     size = file_size(fp);
     if (size < MIN_FILE_SIZE || size > MAX_FILE_SIZE) {
-        BD_DEBUG(DBG_FILE, "Invalid file size\n");
+        BD_DEBUG(DBG_FILE|DBG_CRIT, "Invalid file size\n");
         return NULL;
     }
 
@@ -66,7 +66,7 @@
     }
 
     if (file_read(fp, data, size) != size) {
-        BD_DEBUG(DBG_FILE, "Error reading file\n");
+        BD_DEBUG(DBG_FILE|DBG_CRIT, "Error reading file\n");
         X_FREE(data);
         return NULL;
     }
@@ -107,7 +107,7 @@
 
     AACS_FILE_H *fp = file_open(cfg_file, mode);
 
-    BD_DEBUG(DBG_FILE, fp ? "Opened %s for %s\n" : "%s not found\n", cfg_file, mode);
+    BD_DEBUG(DBG_FILE|DBG_CRIT, fp ? "Opened %s for %s\n" : "%s not found\n", cfg_file, mode);
 
     if (fp && path) {
         *path = cfg_file;
@@ -131,7 +131,7 @@
 
         AACS_FILE_H *fp = file_open(cfg_file, "r");
         if (fp) {
-            BD_DEBUG(DBG_FILE, "Reading %s\n", cfg_file);
+            BD_DEBUG(DBG_FILE|DBG_CRIT, "Reading %s\n", cfg_file);
 
             if (path) {
                 *path = cfg_file;
@@ -142,7 +142,7 @@
             return fp;
         }
 
-        BD_DEBUG(DBG_FILE, "%s not found\n", cfg_file);
+        BD_DEBUG(DBG_FILE|DBG_CRIT, "%s not found\n", cfg_file);
         X_FREE(cfg_file);
     }
 
@@ -173,7 +173,7 @@
             char *str = str_get_hex_string(p, 2*16);
 
             if (str) {
-                BD_DEBUG(DBG_FILE, "Found processing key %s\n", str);
+                BD_DEBUG(DBG_FILE|DBG_CRIT, "Found processing key %s\n", str);
 
                 pk_list *e = calloc(1, sizeof(pk_list));
                 if (e) {
@@ -181,7 +181,7 @@
                         BD_DEBUG(DBG_FILE, "Skipping invalid processing key %s\n", str);
                         X_FREE(e);
                     } else if (_is_duplicate_pk(cf->pkl, e->key)) {
-                        BD_DEBUG(DBG_FILE, "Skipping duplicate processing key %s\n", str);
+                        BD_DEBUG(DBG_FILE|DBG_CRIT, "Skipping duplicate processing key %s\n", str);
                         X_FREE(e);
                     } else {
                         e->next = cf->pkl;
@@ -232,10 +232,10 @@
         X_FREE(data);
 
         if (!host_priv_key || !host_cert) {
-            BD_DEBUG(DBG_FILE, "Invalid file\n");
+            BD_DEBUG(DBG_FILE|DBG_CRIT, "Invalid file\n");
 
         } else {
-            BD_DEBUG(DBG_FILE, "Found certificate: %s %s\n", host_priv_key, host_cert);
+            BD_DEBUG(DBG_FILE|DBG_CRIT, "Found certificate: %s %s\n", host_priv_key, host_cert);
 
             cert_list  *e = calloc(1, sizeof(cert_list));
             if (e) {
@@ -244,7 +244,7 @@
                     BD_DEBUG(DBG_FILE, "Skipping invalid certificate entry %s %s\n", host_priv_key, host_cert);
                     X_FREE(e);
                 } else if (_is_duplicate_cert(cf->host_cert_list, e)) {
-                    BD_DEBUG(DBG_FILE, "Skipping duplicate certificate entry %s %s\n", host_priv_key, host_cert);
+                    BD_DEBUG(DBG_FILE|DBG_CRIT, "Skipping duplicate certificate entry %s %s\n", host_priv_key, host_cert);
                     X_FREE(e);
                 } else {
                     e->next = cf->host_cert_list;
@@ -346,11 +346,11 @@
 
                 if (file_write(fp, key_str, len*2) == len*2 &&
                     file_write(fp, key_str, 0) == 0) {
-                    BD_DEBUG(DBG_FILE, "Wrote %s to %s\n", type, file);
+                    BD_DEBUG(DBG_FILE|DBG_CRIT, "Wrote %s to %s\n", type, file);
                     result = 1;
 
                 } else {
-                    BD_DEBUG(DBG_FILE, "Error writing to %s\n", file);
+                    BD_DEBUG(DBG_FILE|DBG_CRIT, "Error writing to %s\n", file);
                 }
 
                 file_close(fp);
@@ -380,17 +380,17 @@
         if (fp) {
             char *key_str = malloc(len*2);
 
-            BD_DEBUG(DBG_FILE, "Reading %s\n", file);
+            BD_DEBUG(DBG_FILE|DBG_CRIT, "Reading %s\n", file);
 
             if (key_str && file_read(fp, key_str, len*2) == len*2) {
 
                 result = hexstring_to_hex_array(key, len, key_str);
                 if (!result) {
-                    BD_DEBUG(DBG_FILE, "Error converting %s\n", file);
+                    BD_DEBUG(DBG_FILE|DBG_CRIT, "Error converting %s\n", file);
                 }
 
             } else {
-                BD_DEBUG(DBG_FILE, "Error reading from %s\n", file);
+                BD_DEBUG(DBG_FILE|DBG_CRIT, "Error reading from %s\n", file);
             }
 
             X_FREE(key_str);
@@ -398,7 +398,7 @@
             file_close(fp);
 
         } else {
-            BD_DEBUG(DBG_FILE, "%s not found\n", file);
+            BD_DEBUG(DBG_FILE|DBG_CRIT, "%s not found\n", file);
         }
 
         X_FREE(file);
@@ -435,7 +435,7 @@
                     file_write(fp, &len,     4)   == 4 &&
                     file_write(fp, data,     len) == len &&
                     file_write(fp, data,     0) == 0) {
-                    BD_DEBUG(DBG_FILE, "Wrote %d bytes to %s\n", len + 8, file);
+                    BD_DEBUG(DBG_FILE|DBG_CRIT, "Wrote %d bytes to %s\n", len + 8, file);
                     result = 1;
 
                 } else {
@@ -474,24 +474,24 @@
         AACS_FILE_H *fp = file_open(file, "r");
 
         if (fp) {
-            BD_DEBUG(DBG_FILE, "Reading %s\n", file);
+            BD_DEBUG(DBG_FILE|DBG_CRIT, "Reading %s\n", file);
 
             if (file_read(fp, version, 4) == 4 &&
                 (!len || file_read(fp, len, 4) == 4) &&
                 (!len || (size_t)*len <= buf_size) &&
                 (!buf || file_read(fp, buf, *len) == *len)) {
 
-              BD_DEBUG(DBG_FILE, "Read %d bytes from %s, version %d\n", 4 + (len ? 4 : 0) + (buf ? *len : 0), file, *version);
+              BD_DEBUG(DBG_FILE|DBG_CRIT, "Read %d bytes from %s, version %d\n", 4 + (len ? 4 : 0) + (buf ? *len : 0), file, *version);
               result = 1;
 
             } else {
-              BD_DEBUG(DBG_FILE, "Error reading from %s\n", file);
+              BD_DEBUG(DBG_FILE|DBG_CRIT, "Error reading from %s\n", file);
             }
 
             file_close(fp);
 
         } else {
-            BD_DEBUG(DBG_FILE, "%s not found\n", file);
+            BD_DEBUG(DBG_FILE|DBG_CRIT, "%s not found\n", file);
         }
 
         X_FREE(file);
@@ -551,16 +551,16 @@
     *len = 0;
 
     if (fp) {
-        BD_DEBUG(DBG_FILE, "Reading %s\n", path);
+        BD_DEBUG(DBG_FILE|DBG_CRIT, "Reading %s\n", path);
 
         if (file_read(fp, len, 4) == 4 && (size <= *len) &&
             (!buf || file_read(fp, buf, *len) == *len)) {
 
-            BD_DEBUG(DBG_FILE, "Read %d bytes from %s\n", 4 + (buf ? *len : 0), path);
+            BD_DEBUG(DBG_FILE|DBG_CRIT, "Read %d bytes from %s\n", 4 + (buf ? *len : 0), path);
             result = 1;
 
         } else {
-            BD_DEBUG(DBG_FILE | DBG_CRIT, "Error reading from %s\n", path);
+            BD_DEBUG(DBG_FILE|DBG_CRIT | DBG_CRIT, "Error reading from %s\n", path);
         }
 
         file_close(fp);
@@ -587,7 +587,7 @@
     }
 
     if (fp) {
-        BD_DEBUG(DBG_FILE, "found config file: %s\n", cfg_file);
+        BD_DEBUG(DBG_FILE|DBG_CRIT, "found config file: %s\n", cfg_file);
         file_close(fp);
 
         result = keydbcfg_parse_config(cf, cfg_file, disc_id, 0);