httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject cvs commit: apache-1.3/src/modules/standard mod_auth_db.c
Date Wed, 04 Sep 2002 14:29:14 GMT
martin      2002/09/04 07:29:13

  Modified:    src      CHANGES
               src/modules/standard mod_auth_db.c
  Log:
  Add support for Berkeley-DB/4.x to mod_auth_db.c
  
  Revision  Changes    Path
  1.1847    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1846
  retrieving revision 1.1847
  diff -u -r1.1846 -r1.1847
  --- CHANGES	4 Sep 2002 04:39:41 -0000	1.1846
  +++ CHANGES	4 Sep 2002 14:29:12 -0000	1.1847
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.27
   
  +  *) Added support for Berkeley-DB/4.x to mod_auth_db.
  +     [Martin Kraemer]
  +
     *) PR 10993: add image/x-icon to default httpd.conf files
        [Ian Holsman, Peter Bieringer <pb@bieringer.de>
   
  
  
  
  1.48      +6 -3      apache-1.3/src/modules/standard/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth_db.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- mod_auth_db.c	13 Mar 2002 21:05:33 -0000	1.47
  +++ mod_auth_db.c	4 Sep 2002 14:29:13 -0000	1.48
  @@ -105,6 +105,9 @@
   #if (DB_VERSION_MAJOR == 3)
   #define DB3
   #endif
  +#if (DB_VERSION_MAJOR == 4)
  +#define DB4
  +#endif
   #endif
   
   typedef struct {
  @@ -167,7 +170,7 @@
       q.data = user;
       q.size = strlen(q.data);
   
  -#if defined(DB3)
  +#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,7 +183,7 @@
   	return NULL;
       }
   
  -#if defined(DB2) || defined(DB3)
  +#if defined(DB2) || defined(DB3) || defined(DB4)
       if (!((f->get) (f, NULL, &q, &d, 0))) {
   #else
       if (!((f->get) (f, &q, &d, 0))) {
  @@ -190,7 +193,7 @@
   	pw[d.size] = '\0';	/* Terminate the string */
       }
   
  -#if defined(DB2) || defined(DB3)
  +#if defined(DB2) || defined(DB3) || defined(DB4)
       (f->close) (f, 0);
   #else
       (f->close) (f);
  
  
  

Mime
View raw message