From 1936be0078dcd7a53b35577220bca8228792356a Mon Sep 17 00:00:00 2001
From: lda <lda@ari.lt>
Date: Sat, 8 Feb 2025 08:45:21 +0000
Subject: [PATCH] [FIX] Fix minor DB fuckup with tools

Used to open a flatfile database whenever it couldn't find an LMDB one,
which obviously caused *problems*
---
 tools/adminify.c | 39 +++++++++++++++++++--------------------
 tools/common.h   |  2 +-
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/tools/adminify.c b/tools/adminify.c
index e87d97e..1fdd6cf 100644
--- a/tools/adminify.c
+++ b/tools/adminify.c
@@ -89,31 +89,30 @@ Main(Array *args, HashMap *env)
     glob = ArrayGet(args, 2);
 
     parsee = GetDB(db_path);
-    if (parsee)
+    if (!parsee)
     {
+        Log(LOG_ERR, "%s: couldn't open config '%s' or couldnt edit DB", exec, db_path);
+        (void) env;
+        return EXIT_FAILURE;
+    }
 
-        if (glob)
-        {
-            Log(LOG_NOTICE, "Adding glob '%s' to database %s", glob, db_path);
-            AddAdmin(parsee, glob);
-            Log(LOG_INFO, "Successfully added glob %s.", glob);
-            Log(LOG_INFO, "*I'm jealous of all these admins!*");
-
-            DbClose(parsee);
-            return EXIT_SUCCESS;
-        }
-
-        /* List admins */
-        Log(LOG_INFO, "Admin list:");
-        LogConfigIndent(LogConfigGlobal());
-        ListAdmins(parsee);
-        LogConfigUnindent(LogConfigGlobal());
+    if (glob)
+    {
+        Log(LOG_NOTICE, "Adding glob '%s' to database %s", glob, db_path);
+        AddAdmin(parsee, glob);
+        Log(LOG_INFO, "Successfully added glob %s.", glob);
+        Log(LOG_INFO, "*I'm jealous of all these admins!*");
 
         DbClose(parsee);
         return EXIT_SUCCESS;
     }
 
-    Log(LOG_ERR, "%s: couldn't open config '%s' or couldnt edit DB", exec, db_path);
-    (void) env;
-    return EXIT_FAILURE;
+    /* List admins */
+    Log(LOG_INFO, "Admin list:");
+    LogConfigIndent(LogConfigGlobal());
+    ListAdmins(parsee);
+    LogConfigUnindent(LogConfigGlobal());
+
+    DbClose(parsee);
+    return EXIT_SUCCESS;
 }
diff --git a/tools/common.h b/tools/common.h
index eee4793..9687ea3 100644
--- a/tools/common.h
+++ b/tools/common.h
@@ -108,7 +108,7 @@ GetDB(char *config)
     {
         ret = DbOpenLMDB(db_path, lmdb_size);
     }
-    if (!ret)
+    else
     {
         ret = DbOpen(db_path, 0);
     }