From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 22 Jan 2022 07:47:25 +0000 (+0000)
Subject: APR (and APR-util) 1.3 is a requirement for building httpd 2.4 and above.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~560
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=388bb3a501cb090832c8218364f7913d46c55a76;p=thirdparty%2Fapache%2Fhttpd.git

APR (and APR-util) 1.3 is a requirement for building httpd 2.4 and above.

So these compatibility tests can be removed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897326 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/aaa/mod_authn_dbd.c b/modules/aaa/mod_authn_dbd.c
index 9a5a721a585..83828697ac0 100644
--- a/modules/aaa/mod_authn_dbd.c
+++ b/modules/aaa/mod_authn_dbd.c
@@ -143,7 +143,6 @@ static authn_status authn_dbd_password(request_rec *r, const char *user,
             return AUTH_GENERAL_ERROR;
         }
         if (dbd_password == NULL) {
-#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;
             const char *name;
@@ -168,7 +167,7 @@ static authn_status authn_dbd_password(request_rec *r, const char *user,
                               apr_dbd_get_entry(dbd->driver, row, i));
                 i++;
             }
-#endif
+
             dbd_password = apr_pstrdup(r->pool,
                                        apr_dbd_get_entry(dbd->driver, row, 0));
         }
@@ -239,7 +238,6 @@ static authn_status authn_dbd_realm(request_rec *r, const char *user,
             return AUTH_GENERAL_ERROR;
         }
         if (dbd_hash == NULL) {
-#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;
             const char *name;
@@ -264,7 +262,7 @@ static authn_status authn_dbd_realm(request_rec *r, const char *user,
                               apr_dbd_get_entry(dbd->driver, row, i));
                 i++;
             }
-#endif
+
             dbd_hash = apr_pstrdup(r->pool,
                                    apr_dbd_get_entry(dbd->driver, row, 0));
         }