|
Jan F. Chadima |
436bfc7 |
--- a/sasldb/db_berkeley.c
|
|
Jan F. Chadima |
436bfc7 |
+++ b/sasldb/db_berkeley.c
|
|
Jan F. Chadima |
436bfc7 |
@@ -100,7 +100,7 @@ static int berkeleydb_open(const sasl_ut
|
|
Jan F. Chadima |
436bfc7 |
ret = db_create(mbdb, NULL, 0);
|
|
Jan F. Chadima |
436bfc7 |
if (ret == 0 && *mbdb != NULL)
|
|
Jan F. Chadima |
436bfc7 |
{
|
|
Jan F. Chadima |
436bfc7 |
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
|
|
Jan F. Chadima |
436bfc7 |
+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
|
|
Jan F. Chadima |
436bfc7 |
ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
|
|
Jan F. Chadima |
436bfc7 |
#else
|
|
Jan F. Chadima |
436bfc7 |
ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
|
|
Jan F. Chadima |
436bfc7 |
--- a/utils/dbconverter-2.c
|
|
Jan F. Chadima |
436bfc7 |
+++ b/utils/dbconverter-2.c
|
|
Jan F. Chadima |
436bfc7 |
@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
|
|
Jan F. Chadima |
436bfc7 |
ret = db_create(mbdb, NULL, 0);
|
|
Jan F. Chadima |
436bfc7 |
if (ret == 0 && *mbdb != NULL)
|
|
Jan F. Chadima |
436bfc7 |
{
|
|
Jan F. Chadima |
436bfc7 |
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
|
|
Jan F. Chadima |
436bfc7 |
+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
|
|
Jan F. Chadima |
436bfc7 |
ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
|
|
Jan F. Chadima |
436bfc7 |
#else
|
|
Jan F. Chadima |
436bfc7 |
ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
|