Mailing List Archive

[Bug 7917] New: - mod_auth_db patch for DB 4.xx
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7917>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7917

mod_auth_db patch for DB 4.xx

Summary: mod_auth_db patch for DB 4.xx
Product: Apache httpd-1.3
Version: 1.3.24
Platform: PC
URL: http://www.suvimax.org/
OS/Version: Linux
Status: NEW
Severity: Enhancement
Priority: Other
Component: Other mods
AssignedTo: bugs@httpd.apache.org
ReportedBy: preziosi@cnam.fr


Please find enclosed a small fix to allow mod_auth_db to compile
with DB 4.xx.

Best regards

*** mod_auth_db.c.~1~ Wed Mar 13 22:05:33 2002
--- mod_auth_db.c Wed Apr 10 13:35:58 2002
***************
*** 105,110 ****
--- 105,113 ----
#if (DB_VERSION_MAJOR == 3)
#define DB3
#endif
+ #if (DB_VERSION_MAJOR == 4)
+ #define DB4
+ #endif
#endif

typedef struct {
***************
*** 167,173 ****
q.data = user;
q.size = strlen(q.data);

! #if defined(DB3)
if ( db_create(&f, NULL, 0) != 0
|| f->open(f, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
#elif defined(DB2)
--- 170,176 ----
q.data = user;
q.size = strlen(q.data);

! #if defined(DB3) || defined(DB4)
if ( db_create(&f, NULL, 0) != 0
|| f->open(f, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
#elif defined(DB2)
***************
*** 180,186 ****
return NULL;
}

! #if defined(DB2) || defined(DB3)
if (!((f->get) (f, NULL, &q, &d, 0))) {
#else
if (!((f->get) (f, &q, &d, 0))) {
--- 183,189 ----
return NULL;
}

! #if defined(DB2) || defined(DB3) || defined(DB4)
if (!((f->get) (f, NULL, &q, &d, 0))) {
#else
if (!((f->get) (f, &q, &d, 0))) {
***************
*** 190,196 ****
pw[d.size] = '\0'; /* Terminate the string */
}

! #if defined(DB2) || defined(DB3)
(f->close) (f, 0);
#else
(f->close) (f);
--- 193,199 ----
pw[d.size] = '\0'; /* Terminate the string */
}

! #if defined(DB2) || defined(DB3) || defined(DB4)
(f->close) (f, 0);
#else
(f->close) (f);