From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 17 Mar 2023 09:09:19 +0000 (+0100)
Subject: remove pdnsutil lmdb-get-schema-version, it breaks building with dynmodule lmdb
X-Git-Tag: auth-4.8.0-alpha1~1^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef144e73629ef045a119e56bd8ee171be5652c60;p=thirdparty%2Fpdns.git

remove pdnsutil lmdb-get-schema-version, it breaks building with dynmodule lmdb
---

diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc
index 84b91c00bb..9e51159cb4 100644
--- a/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <lmdb.h>
+#include <utility>
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index e9337ddde0..f1fa348954 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -1,5 +1,4 @@
 
-#include "modules/lmdbbackend/lmdbbackend.hh"
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -1518,7 +1517,6 @@ static int createZone(const DNSName &zone, const DNSName& nsname) {
     return EXIT_FAILURE;
   }
 
-  cerr<<"di.id="<<di.id<<endl;
   rr.domain_id = di.id;
   di.backend->startTransaction(zone, di.id);
   di.backend->feedRecord(rr, DNSName());
@@ -2644,6 +2642,7 @@ try
     cout << "test-schema ZONE                   Test DB schema - will create ZONE" << endl;
     cout << "raw-lua-from-content TYPE CONTENT  Display record contents in a form suitable for dnsdist's `SpoofRawAction`" << endl;
     cout << "zonemd-verify-file ZONE FILE       Validate ZONEMD for ZONE" << endl;
+    cout << "lmdb-get-backend-version           Get schema version supported by backend" << endl;
     cout << desc << endl;
 
     return 0;
@@ -2651,18 +2650,8 @@ try
 
   loadMainConfig(g_vm["config-dir"].as<string>());
 
-  if (cmds.at(0) == "lmdb-get-schema-version") {
-    // FIXME: add command to help
-    if(cmds.size() != 2) {
-      cerr << "Syntax: pdnsutil lmdb-get-schema-version /path/to/pdns.lmdb"<<endl;
-      return 0;
-    }
-
-    auto res = LMDBBackend::getSchemaVersionAndShards(cmds.at(1));
-    cerr << "schemaversion: "<<res.first<<endl;
-    cerr << "shards: "<<res.second<<endl;
-    cout << res.first <<endl;
-
+  if (cmds.at(0) == "lmdb-get-backend-version") {
+    cout << "5" << endl; // FIXME this should reuse the constant from lmdbbackend but that is currently a #define in a .cc
     return 0;
   }
   if (cmds.at(0) == "test-algorithm") {