From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 30 Apr 1999 02:34:46 +0000 (+0000)
Subject: Modify meaning of SLAPD_CHILD_MODIFICATION_ENTRY_ACL to augment
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~106
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d8aef0422416715b1ac5a1e0f0eba7c75c502bde;p=openldap

Modify meaning of SLAPD_CHILD_MODIFICATION_ENTRY_ACL to augment
"children" ACLs with "entry" ACLs (versus replacement of children
ACLs with "entry" ACLs).
---

diff --git a/servers/slapd/back-bdb2/delete.c b/servers/slapd/back-bdb2/delete.c
index 1e094893d5..b00c155ec3 100644
--- a/servers/slapd/back-bdb2/delete.c
+++ b/servers/slapd/back-bdb2/delete.c
@@ -70,7 +70,6 @@ bdb2i_back_delete_internal(
 			goto return_results;
 		}
 
-#ifndef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
 		/* check parent for "children" acl */
 		if ( ! access_allowed( be, conn, op, p,
 			"children", NULL, ACL_WRITE ) )
@@ -81,7 +80,6 @@ bdb2i_back_delete_internal(
 				"", "" );
 			goto return_results;
 		}
-#endif
 
 	} else {
 		/* no parent, must be root to delete */
diff --git a/servers/slapd/back-bdb2/modrdn.c b/servers/slapd/back-bdb2/modrdn.c
index d906e08866..0506a87252 100644
--- a/servers/slapd/back-bdb2/modrdn.c
+++ b/servers/slapd/back-bdb2/modrdn.c
@@ -93,7 +93,6 @@ bdb2i_back_modrdn_internal(
 			goto return_results;
 		}
 
-#ifndef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
 		/* check parent for "children" acl */
 		if ( ! access_allowed( be, conn, op, p,
 			"children", NULL, ACL_WRITE ) )
@@ -104,7 +103,6 @@ bdb2i_back_modrdn_internal(
 				"", "" );
 			goto return_results;
 		}
-#endif
 
 		p_dn = dn_parent( be, e->e_dn );
 
@@ -159,7 +157,6 @@ bdb2i_back_modrdn_internal(
 		       "ldbm_back_modrdn: wr to new parent OK np=%p, id=%d\n",
 		       np, np->e_id, 0 );
 	    
-#ifndef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
 		/* check newSuperior for "children" acl */
 		if ( !access_allowed( be, conn, op, np, "children", NULL,
 				      ACL_WRITE ) )
@@ -171,7 +168,6 @@ bdb2i_back_modrdn_internal(
 					  "", "" );
 			goto return_results;
 		}
-#endif
 
 		Debug( LDAP_DEBUG_TRACE,
 		       "ldbm_back_modrdn: wr to new parent's children OK\n",
diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index 6292cf0657..d0be72d6c6 100644
--- a/servers/slapd/back-ldbm/delete.c
+++ b/servers/slapd/back-ldbm/delete.c
@@ -72,7 +72,6 @@ ldbm_back_delete(
 			goto return_results;
 		}
 
-#ifndef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
 		/* check parent for "children" acl */
 		if ( ! access_allowed( be, conn, op, p,
 			"children", NULL, ACL_WRITE ) )
@@ -84,7 +83,6 @@ ldbm_back_delete(
 				"", "" );
 			goto return_results;
 		}
-#endif
 
 	} else {
 		/* no parent, must be root to delete */
diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index 21b48e2002..b0e4fe1a76 100644
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -100,7 +100,6 @@ ldbm_back_modrdn(
 			goto return_results;
 		}
 
-#ifndef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
 		/* check parent for "children" acl */
 		if ( ! access_allowed( be, conn, op, p,
 			"children", NULL, ACL_WRITE ) )
@@ -115,7 +114,6 @@ ldbm_back_modrdn(
 		Debug( LDAP_DEBUG_TRACE,
 		       "ldbm_back_modrdn: wr to children of entry %s OK\n",
 		       p_ndn, 0, 0 );
-#endif
 		
 		p_dn = dn_parent( be, e->e_dn );
 	
@@ -173,7 +171,6 @@ ldbm_back_modrdn(
 		       "ldbm_back_modrdn: wr to new parent OK np=%p, id=%d\n",
 		       np, np->e_id, 0 );
 	    
-#ifndef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
 		/* check newSuperior for "children" acl */
 		if ( !access_allowed( be, conn, op, np, "children", NULL,
 				      ACL_WRITE ) )
@@ -185,7 +182,6 @@ ldbm_back_modrdn(
 					  "", "" );
 			goto return_results;
 		}
-#endif
 
 		Debug( LDAP_DEBUG_TRACE,
 		       "ldbm_back_modrdn: wr to new parent's children OK\n",
@@ -242,7 +238,6 @@ ldbm_back_modrdn(
 	}
 
 
-
 	/* Get attribute type and attribute value of our new rdn, we will
 	 * need to add that to our new entry
 	 */