1 Author: Ondřej Surý <ondrej@debian.org>
2 Description: Support newer Berkeley DB versions
3 --- a/sasldb/db_berkeley.c
4 +++ b/sasldb/db_berkeley.c
5 @@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
6 ret = db_create(mbdb, NULL, 0);
7 if (ret == 0 && *mbdb != NULL)
8 {
9 -#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
10 +#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
11 ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
12 #else
13 ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
14 --- a/utils/dbconverter-2.c
15 +++ b/utils/dbconverter-2.c
16 @@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
17 ret = db_create(mbdb, NULL, 0);
18 if (ret == 0 && *mbdb != NULL)
19 {
20 -#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
21 +#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
22 ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
23 #else
24 ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
|
