From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 9 Aug 2019 05:18:22 +0000 (+0000)
Subject: Axe some dead code + slighly improve a comment
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1939
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56ad5f6835c81481851f907afa274525b81375b7;p=thirdparty%2Fapache%2Fhttpd.git

Axe some dead code + slighly improve a comment

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

diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c
index 958511446ef..9c12003018b 100644
--- a/modules/aaa/mod_authz_core.c
+++ b/modules/aaa/mod_authz_core.c
@@ -196,9 +196,9 @@ static authz_status authz_alias_check_authorization(request_rec *r,
     authz_status ret = AUTHZ_DENIED;
 
     /* Look up the provider alias in the alias list.
-     * Get the dir_config and call ap_Merge_per_dir_configs()
+     * Get the dir_config and call ap_merge_per_dir_configs()
      * Call the real provider->check_authorization() function
-     * return the result of the above function call
+     * Return the result of the above function call
      */
 
     provider_name = apr_table_get(r->notes, AUTHZ_PROVIDER_NAME_NOTE);
@@ -234,9 +234,6 @@ static authz_status authz_alias_check_authorization(request_rec *r,
                           provider_name);
         }
     }
-    else {
-        ap_assert(provider_name != NULL);
-    }
 
     return ret;
 }