From: Jim Jagielski <jim@apache.org>
Date: Tue, 6 Sep 2016 17:35:31 +0000 (+0000)
Subject: Merge r1756846 from trunk:
X-Git-Tag: 2.4.24~266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75056ab4db8ca2366dc8ab6b327cc056c1b6fda9;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1756846 from trunk:

Remove unused typedef uthn_dbd_conf
Submitted by: jailletc36
Reviewed/backported by: jim


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

diff --git a/STATUS b/STATUS
index 2b7f5f6b477..235a8db3c1d 100644
--- a/STATUS
+++ b/STATUS
@@ -138,12 +138,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: jailletc36, jchampion, covener
 
-   * mod_authn_dbd: Remove an unused structure
-     trunk patch: http://svn.apache.org/r1756846
-     2.4.x patch: trunk works
-     +1: jailletc36, jchampion, covener
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/modules/aaa/mod_authn_dbd.c b/modules/aaa/mod_authn_dbd.c
index b9bd3739ae2..57090d27615 100644
--- a/modules/aaa/mod_authn_dbd.c
+++ b/modules/aaa/mod_authn_dbd.c
@@ -34,11 +34,6 @@ typedef struct {
     const char *realm;
 } authn_dbd_conf;
 
-typedef struct {
-    const char *label;
-    const char *query;
-} authn_dbd_rec;
-
 /* optional function - look it up once in post_config */
 static ap_dbd_t *(*authn_dbd_acquire_fn)(request_rec*) = NULL;
 static void (*authn_dbd_prepare_fn)(server_rec*, const char*, const char*) = NULL;