|
 |
f92ce9 |
From d14caafc91ea6f417b1c602a91153764cc70f1d9 Mon Sep 17 00:00:00 2001
|
|
|
f92ce9 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
f92ce9 |
Date: Wed, 12 Nov 2014 10:15:46 -0500
|
|
|
f92ce9 |
Subject: [PATCH 29/30] Ticket 47953 - Should not check aci syntax when
|
|
|
f92ce9 |
deleting an aci
|
|
|
f92ce9 |
|
|
|
f92ce9 |
Bug Description: Trying to delete an aci that has an invalid sytenx, generates a
|
|
|
f92ce9 |
syntax error when trying to remove it.
|
|
|
f92ce9 |
|
|
|
f92ce9 |
Fix Description: Do not check the syntax of an aci if it's being deleted.
|
|
|
f92ce9 |
|
|
|
f92ce9 |
https://fedorahosted.org/389/ticket/47953
|
|
|
f92ce9 |
|
|
|
f92ce9 |
Reviewed by: ?
|
|
|
f92ce9 |
|
|
|
f92ce9 |
(cherry picked from commit 3ce60db0a404b4663df6005b78027332d0e56f95)
|
|
|
f92ce9 |
(cherry picked from commit 6a435f1cce137990c9c55f3f571f97c09ad6d9f4)
|
|
|
f92ce9 |
---
|
|
|
f92ce9 |
ldap/servers/plugins/acl/acl.c | 7 ++++---
|
|
|
f92ce9 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
f92ce9 |
|
|
|
f92ce9 |
diff --git a/ldap/servers/plugins/acl/acl.c b/ldap/servers/plugins/acl/acl.c
|
|
|
f92ce9 |
index fe863c8..5416330 100644
|
|
|
f92ce9 |
--- a/ldap/servers/plugins/acl/acl.c
|
|
|
f92ce9 |
+++ b/ldap/servers/plugins/acl/acl.c
|
|
|
f92ce9 |
@@ -1553,11 +1553,12 @@ acl_check_mods(
|
|
|
f92ce9 |
|
|
|
f92ce9 |
/* Are we adding/replacing a aci attribute
|
|
|
f92ce9 |
** value. In that case, we need to make
|
|
|
f92ce9 |
- ** sure that the new value has thr right
|
|
|
f92ce9 |
+ ** sure that the new value has the right
|
|
|
f92ce9 |
** syntax
|
|
|
f92ce9 |
*/
|
|
|
f92ce9 |
- if (strcmp(mod->mod_type,
|
|
|
f92ce9 |
- aci_attr_type) == 0) {
|
|
|
f92ce9 |
+ if (!SLAPI_IS_MOD_DELETE(mod->mod_op) &&
|
|
|
f92ce9 |
+ strcmp(mod->mod_type, aci_attr_type) == 0)
|
|
|
f92ce9 |
+ {
|
|
|
f92ce9 |
if ( 0 != (rv = acl_verify_syntax(pb, e_sdn,
|
|
|
f92ce9 |
mod->mod_bvalues[i], errbuf))) {
|
|
|
f92ce9 |
aclutil_print_err(rv, e_sdn,
|
|
|
f92ce9 |
--
|
|
|
f92ce9 |
1.9.3
|
|
|
f92ce9 |
|