[httpd/f15] - restore authnoprov patch (#736104)

[jorton]

commit a67c9d52fc8e98de84b3a80061f8b5070d998065
Author: Joe Orton <jorton at redhat.com>
Date:   Tue Sep 13 13:53:30 2011 +0100

    - restore authnoprov patch (#736104)

 httpd-2.2.21-authnoprov.patch |   30 ++++++++++++++++++++++++++++++
 httpd.spec                    |    3 +++
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/httpd-2.2.21-authnoprov.patch b/httpd-2.2.21-authnoprov.patch
new file mode 100644
index 0000000..e04116e
--- /dev/null
+++ b/httpd-2.2.21-authnoprov.patch
@@ -0,0 +1,30 @@
+--- httpd-2.2.21/modules/aaa/mod_auth_basic.c.authnoprov
++++ httpd-2.2.21/modules/aaa/mod_auth_basic.c
+@@ -252,6 +252,14 @@ static int authenticate_basic_user(reque
+             return DECLINED;
+         }
+ 
++        /* If no providers were configured, and the default file
++         * provider gave a general error (which will happen only if
++         * has not been configured), presume that a non-provider-based
++         * authn module is configured, and get out of the way. */
++        if (!conf->providers && auth_result == AUTH_GENERAL_ERROR) {
++            return DECLINED;
++        }
++
+         switch (auth_result) {
+         case AUTH_DENIED:
+             ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+--- httpd-2.2.21/modules/aaa/mod_authn_file.c.authnoprov
++++ httpd-2.2.21/modules/aaa/mod_authn_file.c
+@@ -76,6 +76,10 @@ static authn_status check_password(reque
+         return AUTH_GENERAL_ERROR;
+     }
+ 
++    if (!conf->pwfile) {
++        return AUTH_GENERAL_ERROR;
++    }
++
+     status = ap_pcfg_openfile(&f, r->pool, conf->pwfile);
+ 
+     if (status != APR_SUCCESS) {
diff --git a/httpd.spec b/httpd.spec
index 0c1a376..6578056 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -31,6 +31,7 @@ Patch4: httpd-2.1.10-disablemods.patch
 Patch5: httpd-2.1.10-layout.patch
 # Features/functional changes
 Patch20: httpd-2.0.48-release.patch
+Patch21: httpd-2.2.0-authnoprov.patch
 Patch22: httpd-2.1.10-pod.patch
 Patch23: httpd-2.0.45-export.patch
 Patch24: httpd-2.2.11-corelimit.patch
@@ -115,6 +116,7 @@ Security (TLS) protocols.
 %patch4 -p1 -b .disablemods
 %patch5 -p1 -b .layout
 
+%patch21 -p1 -b .authnoprov
 %patch22 -p1 -b .pod
 %patch23 -p1 -b .export
 %patch24 -p1 -b .corelimit
@@ -496,6 +498,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Sep 13 2011 Joe Orton <jorton at redhat.com> - 2.2.21-1
 - update to 2.2.21
+- restore authnoprov patch (#736104)
 
 * Wed Jul 20 2011 Jan Kaluza <jkaluza at redhat.com> - 2.2.19-2
 - fix #716621 - suexec now works without setuid bit