You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ch...@apache.org on 2008/10/22 22:11:08 UTC
svn commit: r707183 - /httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
Author: chrisd
Date: Wed Oct 22 13:11:07 2008
New Revision: 707183
URL: http://svn.apache.org/viewvc?rev=707183&view=rev
Log:
Implement checks for NULL r->user as per r705361.
NOTE: If someone with an LDAP setup can ensure this compiles and works,
that would be great.
Modified:
httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
Modified: httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c?rev=707183&r1=707182&r2=707183&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authnz_ldap.c Wed Oct 22 13:11:07 2008
@@ -518,7 +518,13 @@
*/
/* Check that we have a userid to start with */
- if ((!r->user) || (strlen(r->user) == 0)) {
+ if (!r->user) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "access to %s failed, reason: no authenticated user", r->uri);
+ return AUTHZ_DENIED;
+ }
+
+ if (!strlen(r->user)) {
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
"ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type);
@@ -686,7 +692,13 @@
*/
/* Check that we have a userid to start with */
- if ((!r->user) || (strlen(r->user) == 0)) {
+ if (!r->user) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "access to %s failed, reason: no authenticated user", r->uri);
+ return AUTHZ_DENIED;
+ }
+
+ if (!strlen(r->user)) {
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
"ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type);
@@ -843,7 +855,13 @@
*/
/* Check that we have a userid to start with */
- if ((!r->user) || (strlen(r->user) == 0)) {
+ if (!r->user) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "access to %s failed, reason: no authenticated user", r->uri);
+ return AUTHZ_DENIED;
+ }
+
+ if (!strlen(r->user)) {
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
"ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type);
@@ -951,7 +969,13 @@
*/
/* Check that we have a userid to start with */
- if ((!r->user) || (strlen(r->user) == 0)) {
+ if (!r->user) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "access to %s failed, reason: no authenticated user", r->uri);
+ return AUTHZ_DENIED;
+ }
+
+ if (!strlen(r->user)) {
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
"ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type);
@@ -1064,7 +1088,13 @@
*/
/* Check that we have a userid to start with */
- if ((!r->user) || (strlen(r->user) == 0)) {
+ if (!r->user) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "access to %s failed, reason: no authenticated user", r->uri);
+ return AUTHZ_DENIED;
+ }
+
+ if (!strlen(r->user)) {
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
"ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type);