add logs; fix bug in group/dn selection logic

[openldap] / servers / slapd / acl.c

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 823efe7728e3a9bda2a2bf078c480e97a82b7755..c337b8fe78ee8e21c61085933a4dbdda32b2362a 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -228,7 +228,7 @@ access_allowed(
 #endif /* LDAP_SLAPI */
 
        /* grant database root access */
-       if ( be != NULL && be_isroot( be, &op->o_ndn ) ) {
+       if ( be != NULL && be_isroot( op ) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( ACL, INFO, 
                        "access_allowed: conn %lu root access granted\n", 
@@ -1207,7 +1207,7 @@ dn_match_cleanup:;
 
                if ( b->a_group_pat.bv_len ) {
                        struct berval bv;
-                       struct berval ndn = { 0, NULL };
+                       struct berval ndn = BER_BVNULL;
                        int rc;
 
                        if ( op->o_ndn.bv_len == 0 ) {
@@ -1568,7 +1568,7 @@ acl_check_modlist(
        assert( be != NULL );
 
        /* short circuit root database access */
-       if ( be_isroot_dn( op ) ) {
+       if ( be_isroot( op ) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( ACL, DETAIL1, 
                           "acl_check_modlist: conn %lu  access granted to root user\n",
@@ -1632,12 +1632,12 @@ acl_check_modlist(
                                goto done;
                        }
 
-                       if ( mlist->sml_bvalues == NULL ) break;
+                       if ( mlist->sml_values == NULL ) break;
 
                        /* fall thru to check value to add */
 
                case LDAP_MOD_ADD:
-                       assert( mlist->sml_bvalues != NULL );
+                       assert( mlist->sml_values != NULL );
 
                        for ( bv = mlist->sml_nvalues
                                        ? mlist->sml_nvalues : mlist->sml_values;
@@ -1653,7 +1653,7 @@ acl_check_modlist(
                        break;
 
                case LDAP_MOD_DELETE:
-                       if ( mlist->sml_bvalues == NULL ) {
+                       if ( mlist->sml_values == NULL ) {
                                if ( ! access_allowed( op, e,
                                        mlist->sml_desc, NULL, ACL_WRITE, NULL ) )
                                {
@@ -1763,14 +1763,14 @@ aci_match_set (
        int setref
 )
 {
-       struct berval set = { 0, NULL };
+       struct berval set = BER_BVNULL;
        int rc = 0;
        AciSetCookie cookie;
 
        if (setref == 0) {
                ber_dupbv_x( &set, subj, op->o_tmpmemctx );
        } else {
-               struct berval subjdn, ndn = { 0, NULL };
+               struct berval subjdn, ndn = BER_BVNULL;
                struct berval setat;
                BerVarray bvals;
                const char *text;