diff options
| author | Bradley Nicholes <bnicholes@apache.org> | 2006-10-26 17:39:41 +0200 |
|---|---|---|
| committer | Bradley Nicholes <bnicholes@apache.org> | 2006-10-26 17:39:41 +0200 |
| commit | 9362559bc143d343fbc9f1e0267974250fb96cb7 (patch) | |
| tree | 4fdd14138156b9c37b0c9d6816e7771d5d1a08a0 /modules/aaa/mod_authn_dbd.c | |
| parent | Optimise the alternate case. Fail fast and stop splitting buckets if (diff) | |
| download | apache2-9362559bc143d343fbc9f1e0267974250fb96cb7.tar.xz apache2-9362559bc143d343fbc9f1e0267974250fb96cb7.zip | |
Move the assignment statements after the #if code to eliminate the C++ style inline variable declarations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@468042 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/aaa/mod_authn_dbd.c')
| -rw-r--r-- | modules/aaa/mod_authn_dbd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/aaa/mod_authn_dbd.c b/modules/aaa/mod_authn_dbd.c index d6bebc4130..d557c6b43b 100644 --- a/modules/aaa/mod_authn_dbd.c +++ b/modules/aaa/mod_authn_dbd.c @@ -127,8 +127,6 @@ static authn_status authn_dbd_password(request_rec *r, const char *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 +153,7 @@ static authn_status authn_dbd_password(request_rec *r, const char *user, 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 */ } @@ -212,8 +211,6 @@ static authn_status authn_dbd_realm(request_rec *r, const char *user, 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 +237,7 @@ static authn_status authn_dbd_realm(request_rec *r, const char *user, 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 */ } |