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