From: Robin Geuze <robing@transip.nl>
Date: Fri, 25 Sep 2020 13:32:07 +0000 (+0200)
Subject: Fix a small coverity issue in lmdb backend and fix a compiler warning
X-Git-Tag: auth-4.4.0-alpha1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8d66def7df305872fce2b6a3912302cfe23b8f6;p=thirdparty%2Fpdns.git

Fix a small coverity issue in lmdb backend and fix a compiler warning
---

diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc
index 0f26c38e65..adccc89d35 100644
--- a/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@ -238,7 +238,7 @@ std::string serToString(const vector<DNSResourceRecord>& rrs)
   return ret;
 }
 
-size_t serOneRRFromString(const string_view& str, DNSResourceRecord& rr)
+static inline size_t serOneRRFromString(const string_view& str, DNSResourceRecord& rr)
 {
   uint16_t len;
   memcpy(&len, &str[0], 2);
@@ -546,8 +546,8 @@ bool LMDBBackend::upgradeToSchemav3()
 {
   for(auto i = 0; i < d_shards; i++) {
     string filename = getArg("filename")+"-"+std::to_string(i);
-    if (!access(filename.c_str(), F_OK)) {
-      rename(filename.c_str(), (filename+"-old").c_str());
+    if (rename(filename.c_str(), (filename+"-old").c_str()) < 0) {
+        unixDie("Rename failed during LMDB upgrade");
     }
 
     LMDBBackend::RecordsDB oldShard, newShard;