|
 |
dc8c34 |
From cd7689ed869b91751f673b0bd1bdb800a6843c00 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
dc8c34 |
Date: Wed, 21 May 2014 14:36:01 -0400
|
|
|
dc8c34 |
Subject: [PATCH 214/225] Ticket 47670 - Aci warnings in error log
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Bug Description: Some aci warnings are unneccesarily written to the
|
|
|
dc8c34 |
error log.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Fix Description: Lower the log messaages from SLAPI_LOG_FATAL to SLAPI_LOG_ACL
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Patch provided by: chatfield(Thanks!)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/47670
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Reviewed by: nhosoi(Thanks!)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
(cherry picked from commit 4f14e7df8215e30d6dd1205638886a877f46a70c)
|
|
|
dc8c34 |
(cherry picked from commit 7fbf16bdd9a45dcef00b8607474dfa21c645c2f7)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/plugins/acl/acllas.c | 6 +++---
|
|
|
dc8c34 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/plugins/acl/acllas.c b/ldap/servers/plugins/acl/acllas.c
|
|
|
dc8c34 |
index a71d04f..81e486f 100644
|
|
|
dc8c34 |
--- a/ldap/servers/plugins/acl/acllas.c
|
|
|
dc8c34 |
+++ b/ldap/servers/plugins/acl/acllas.c
|
|
|
dc8c34 |
@@ -3624,7 +3624,7 @@ acllas__client_match_URL (struct acl_pblock *aclpb, char *n_clientdn, char *url
|
|
|
dc8c34 |
/* Check the scope */
|
|
|
dc8c34 |
if ( ludp->lud_scope == LDAP_SCOPE_SUBTREE ) {
|
|
|
dc8c34 |
if (!slapi_dn_issuffix(n_clientdn, ludp->lud_dn)) {
|
|
|
dc8c34 |
- slapi_log_error( SLAPI_LOG_FATAL, plugin_name,
|
|
|
dc8c34 |
+ slapi_log_error( SLAPI_LOG_ACL, plugin_name,
|
|
|
dc8c34 |
"acllas__client_match_URL: url [%s] scope is subtree but dn [%s] "
|
|
|
dc8c34 |
"is not a suffix of [%s]\n",
|
|
|
dc8c34 |
normed, ludp->lud_dn, n_clientdn );
|
|
|
dc8c34 |
@@ -3634,7 +3634,7 @@ acllas__client_match_URL (struct acl_pblock *aclpb, char *n_clientdn, char *url
|
|
|
dc8c34 |
char *parent = slapi_dn_parent (n_clientdn);
|
|
|
dc8c34 |
|
|
|
dc8c34 |
if (slapi_utf8casecmp ((ACLUCHP)parent, (ACLUCHP)ludp->lud_dn) != 0 ) {
|
|
|
dc8c34 |
- slapi_log_error( SLAPI_LOG_FATAL, plugin_name,
|
|
|
dc8c34 |
+ slapi_log_error( SLAPI_LOG_ACL, plugin_name,
|
|
|
dc8c34 |
"acllas__client_match_URL: url [%s] scope is onelevel but dn [%s] "
|
|
|
dc8c34 |
"is not a direct child of [%s]\n",
|
|
|
dc8c34 |
normed, ludp->lud_dn, parent );
|
|
|
dc8c34 |
@@ -3644,7 +3644,7 @@ acllas__client_match_URL (struct acl_pblock *aclpb, char *n_clientdn, char *url
|
|
|
dc8c34 |
slapi_ch_free_string(&parent);
|
|
|
dc8c34 |
} else { /* default */
|
|
|
dc8c34 |
if (slapi_utf8casecmp ( (ACLUCHP)n_clientdn, (ACLUCHP)ludp->lud_dn) != 0 ) {
|
|
|
dc8c34 |
- slapi_log_error( SLAPI_LOG_FATAL, plugin_name,
|
|
|
dc8c34 |
+ slapi_log_error( SLAPI_LOG_ACL, plugin_name,
|
|
|
dc8c34 |
"acllas__client_match_URL: url [%s] scope is base but dn [%s] "
|
|
|
dc8c34 |
"does not match [%s]\n",
|
|
|
dc8c34 |
normed, ludp->lud_dn, n_clientdn );
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|