jim at apache
May 9, 2008, 6:28 AM
Post #1 of 1
(20 views)
Permalink
|
|
svn commit: r654801 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/aaa/mod_authn_dbd.c
|
|
Author: jim
Date: Fri May 9 06:28:09 2008
New Revision: 654801
URL: http://svn.apache.org/viewvc?rev=654801&view=rev
Log:
Backport r639079 and r468042. This patch also lacked the
corresponding CHANGEs entry, so I grabbed from trunk
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/aaa/mod_authn_dbd.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=654801&r1=654800&r2=654801&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri May 9 06:28:09 2008
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.9
+ *) mod_authn_dbd: Disambiguate and tidy database authentication
+ error messages. PR 43210. [Chris Darroch, Phil Endecott
+ <spam_from_apache_bugzilla chezphil.org>]
+
*) mod_headers: Add 'merge' option to avoid duplicate values within
the same header. [Chris Darroch]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=654801&r1=654800&r2=654801&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri May 9 06:28:09 2008
@@ -88,16 +88,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_authn_dbd: Disambiguate and tidy database authentication
- error messages. Also move assignment statements after #if blocks
- to avoid having them treated as variable declarations.
- PR: 43210.
- Trunk version of patch:
- http://svn.apache.org/viewvc?view=rev&revision=639079
- http://svn.apache.org/viewvc?view=rev&revision=468042
- Backport version for 2.2.x of patch:
- http://people.apache.org/~chrisd/patches/mod_authn_dbd_msgs/mod_authn_dbd-msgs-2.2.x.patch
- +1: chrisd, niq, rpluem
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[. New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/modules/aaa/mod_authn_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/mod_authn_dbd.c?rev=654801&r1=654800&r2=654801&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/mod_authn_dbd.c (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/mod_authn_dbd.c Fri May 9 06:28:09 2008
@@ -98,24 +98,29 @@
ap_dbd_t *dbd = authn_dbd_acquire_fn(r);
if (dbd == NULL) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "Error looking up %s in database", user);
+ "Failed to acquire database connection to look up "
+ "user '%s'", user);
return AUTH_GENERAL_ERROR;
}
if (conf->user == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "No AuthDBDUserPWQuery has been specified.");
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "No AuthDBDUserPWQuery has been specified");
return AUTH_GENERAL_ERROR;
}
statement = apr_hash_get(dbd->prepared, conf->user, APR_HASH_KEY_STRING);
if (statement == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "A prepared statement could not be found for AuthDBDUserPWQuery, key '%s'.", conf->user);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "A prepared statement could not be found for "
+ "AuthDBDUserPWQuery with the key '%s'", conf->user);
return AUTH_GENERAL_ERROR;
}
if (apr_dbd_pvselect(dbd->driver, r->pool, dbd->handle, &res, statement,
0, user, NULL) != 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "Error looking up %s in database", user);
+ "Query execution error looking up '%s' "
+ "in database", user);
return AUTH_GENERAL_ERROR;
}
for (rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1);
@@ -123,12 +128,11 @@
rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1)) {
if (rv != 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
- "Error looking up %s in database", user);
+ "Error retrieving results while looking up '%s' "
+ "in database", user);
return AUTH_GENERAL_ERROR;
}
if (dbd_password == NULL) {
- dbd_password = apr_dbd_get_entry(dbd->driver, row, 0);
-
#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
/* add the rest of the columns to the environment */
int i = 1;
@@ -155,6 +159,7 @@
i++;
}
#endif
+ dbd_password = apr_dbd_get_entry(dbd->driver, row, 0);
}
/* we can't break out here or row won't get cleaned up */
}
@@ -185,22 +190,27 @@
ap_dbd_t *dbd = authn_dbd_acquire_fn(r);
if (dbd == NULL) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "Error looking up %s in database", user);
+ "Failed to acquire database connection to look up "
+ "user '%s:%s'", user, realm);
return AUTH_GENERAL_ERROR;
}
if (conf->realm == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "No AuthDBDUserRealmQuery has been specified.");
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "No AuthDBDUserRealmQuery has been specified");
return AUTH_GENERAL_ERROR;
}
statement = apr_hash_get(dbd->prepared, conf->realm, APR_HASH_KEY_STRING);
if (statement == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "A prepared statement could not be found for AuthDBDUserRealmQuery, key '%s'.", conf->realm);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "A prepared statement could not be found for "
+ "AuthDBDUserRealmQuery with the key '%s'", conf->realm);
return AUTH_GENERAL_ERROR;
}
if (apr_dbd_pvselect(dbd->driver, r->pool, dbd->handle, &res, statement,
0, user, realm, NULL) != 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "Error looking up %s:%s in database", user, realm);
+ "Query execution error looking up '%s:%s' "
+ "in database", user, realm);
return AUTH_GENERAL_ERROR;
}
for (rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1);
@@ -208,12 +218,11 @@
rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1)) {
if (rv != 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
- "Error looking up %s in database", user);
+ "Error retrieving results while looking up '%s:%s' "
+ "in database", user, realm);
return AUTH_GENERAL_ERROR;
}
if (dbd_hash == NULL) {
- dbd_hash = apr_dbd_get_entry(dbd->driver, row, 0);
-
#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
/* add the rest of the columns to the environment */
int i = 1;
@@ -240,6 +249,7 @@
i++;
}
#endif
+ dbd_hash = apr_dbd_get_entry(dbd->driver, row, 0);
}
/* we can't break out here or row won't get cleaned up */
}
|
