[packages/apache1.git] / apache1-db4.patch

--- apache_1.3.42/src/modules/standard/mod_auth_db.c.orig	2011-02-09 16:58:54.748693904 +0100
+++ apache_1.3.42/src/modules/standard/mod_auth_db.c	2011-02-09 17:34:00.304686361 +0100
@@ -63,7 +63,7 @@
 #if (DB_VERSION_MAJOR == 3)
 #define DB3
 #endif
-#if (DB_VERSION_MAJOR == 4)
+#if (DB_VERSION_MAJOR >= 4)
 #define DB4
 #endif
 #endif
@@ -130,7 +130,7 @@
 
 #if defined(DB3) || defined(DB4)
     if (   db_create(&f, NULL, 0) != 0 
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0
+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
         || f->open(f, NULL, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
 #else
         || f->open(f, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
Commit	Line	Data
d8d1ac13 JB	1	--- apache_1.3.42/src/modules/standard/mod_auth_db.c.orig 2011-02-09 16:58:54.748693904 +0100
	2	+++ apache_1.3.42/src/modules/standard/mod_auth_db.c 2011-02-09 17:34:00.304686361 +0100
	3	@@ -63,7 +63,7 @@
	4	#if (DB_VERSION_MAJOR == 3)
	5	#define DB3
098d451e	6	#endif
d8d1ac13	7	-#if (DB_VERSION_MAJOR == 4)
99afd3d1	8	+#if (DB_VERSION_MAJOR >= 4)
098d451e	9	#define DB4
098d451e JB	10	#endif
098d451e JB	11	#endif
d8d1ac13	12	@@ -130,7 +130,7 @@
098d451e	13
d8d1ac13	14	#if defined(DB3) \|\| defined(DB4)
098d451e	15	if ( db_create(&f, NULL, 0) != 0
d8d1ac13 JB	16	-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0
	17	+#if (DB_VERSION_MAJOR > 4) \|\| (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
	18	\|\| f->open(f, NULL, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
	19	#else
098d451e	20	\|\| f->open(f, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {