* src/modules/standard/mod_usertrack.c (spot_cookie): Remove unused

variable 'i' added in r1.57.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@102317 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/modules/standard/mod_auth_db.c b/src/modules/standard/mod_auth_db.c
index 76888ceaa79d6664b6bc70ff56b560d360266620..03c155916951f9e5d2efcb3c4381eaa031642d62 100644 (file)
--- a/src/modules/standard/mod_auth_db.c
+++ b/src/modules/standard/mod_auth_db.c
@@ -172,7 +172,11 @@ static char *get_db_pw(request_rec *r, char *user, const char *auth_dbpwfile)
 
 #if defined(DB3) || defined(DB4)
     if (   db_create(&f, NULL, 0) != 0 
+#if 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) {
+#endif
 #elif defined(DB2)
     if (db_open(auth_dbpwfile, DB_HASH, DB_RDONLY, 0664, NULL, NULL, &f) != 0) {
 #else

diff --git a/src/modules/standard/mod_usertrack.c b/src/modules/standard/mod_usertrack.c
index f8fd00cecf159c360621640e89bc20150e140bfd..492a9778df3c6cfaf1e84dd780a09c582e1e4769 100644 (file)
--- a/src/modules/standard/mod_usertrack.c
+++ b/src/modules/standard/mod_usertrack.c
@@ -296,7 +296,6 @@ static int spot_cookie(request_rec *r)
                                                &usertrack_module);
     const char *cookie_header;
     regmatch_t regm[NUM_SUBS];
-    int i;
 
     if (!dcfg->enabled) {
         return DECLINED;