From: Volker Lendecke <vl@samba.org>
Date: Mon, 1 Jul 2019 19:07:55 +0000 (+0200)
Subject: lib: Fix return of server_id_db_prune_name()
X-Git-Tag: ldb-2.0.5~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa2d5b3daa0eaae41e2c2348cb2a81adf9da3b62;p=thirdparty%2Fsamba.git

lib: Fix return of server_id_db_prune_name()

The tdb routines return 0/-1 and return the specific error via
tdb_error(). server_id_db_prune_name() is expected to return an errno,
not 0/-1.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Noel Power <npower@samba.org>

Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Wed Jul  3 10:51:32 UTC 2019 on sn-devel-184
---

diff --git a/lib/util/server_id_db.c b/lib/util/server_id_db.c
index bb61f316d29..17b157706b4 100644
--- a/lib/util/server_id_db.c
+++ b/lib/util/server_id_db.c
@@ -184,7 +184,12 @@ int server_id_db_prune_name(struct server_id_db *db, const char *name,
 
 	tdb_chainunlock(tdb, key);
 
-	return ret;
+	if (ret == -1) {
+		enum TDB_ERROR err = tdb_error(tdb);
+		return map_unix_error_from_tdb(err);
+	}
+
+	return 0;
 }
 
 int server_id_db_remove(struct server_id_db *db, const char *name)