25 lines
1 KiB
Diff
25 lines
1 KiB
Diff
|
Author: Ondřej Surý <ondrej@debian.org>
|
||
|
|
Description: Support newer Berkeley DB versions
|
||
|
|
--- a/sasldb/db_berkeley.c
|
||
|
|
+++ b/sasldb/db_berkeley.c
|
||
|
|
@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
|
||
|
|
ret = db_create(mbdb, NULL, 0);
|
||
|
|
if (ret == 0 && *mbdb != NULL)
|
||
|
|
{
|
||
|
|
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
|
||
|
|
+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
|
||
|
|
ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
|
||
|
|
#else
|
||
|
|
ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
|
||
|
|
--- a/utils/dbconverter-2.c
|
||
|
|
+++ b/utils/dbconverter-2.c
|
||
|
|
@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
|
||
|
|
ret = db_create(mbdb, NULL, 0);
|
||
|
|
if (ret == 0 && *mbdb != NULL)
|
||
|
|
{
|
||
|
|
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
|
||
|
|
+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
|
||
|
|
ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
|
||
|
|
#else
|
||
|
|
ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
|