Commit 06530a33 authored by Mathieu Parent's avatar Mathieu Parent

Merge branch 'EBADE' into 'master'

Fix FTBFS on kfreebsd

See merge request !4
parents 7128b7e4 5c21701a
ldb (2:1.4.2-4) UNRELEASED; urgency=medium
* 03_EBADE: Add patch from upstream to fix FTBFS on architectures with no
EBADE error code, such as GNU/kFreeBSD.
-- James Clarke <jrtc27@debian.org> Mon, 29 Oct 2018 22:14:48 +0000
ldb (2:1.4.2-3) experimental; urgency=medium
* Fix FTBFS on 32-bit architectures (Samba #13630):
......
From 591d72f9c7981350eba19221398dbe7bcf0c098b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 26 Jul 2018 02:29:10 +0200
Subject: [PATCH] ldb_mdb: #ifdef EBADE as it is not portable
E.g. FreeBSD 11.2 doesn't have it.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---
ldb_mdb/ldb_mdb.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ldb_mdb/ldb_mdb.c b/ldb_mdb/ldb_mdb.c
index af552feb317..bd84fe10bcd 100644
--- a/ldb_mdb/ldb_mdb.c
+++ b/ldb_mdb/ldb_mdb.c
@@ -40,7 +40,9 @@ int ldb_mdb_err_map(int lmdb_err)
return LDB_SUCCESS;
case EIO:
return LDB_ERR_OPERATIONS_ERROR;
+#ifdef EBADE
case EBADE:
+#endif
case MDB_INCOMPATIBLE:
case MDB_CORRUPTED:
case MDB_INVALID:
00_Enable-make-test-even-without-lmdb.patch
01_manpage_dates
02_hurd
03_EBADE
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment