Fix up debug statement as suggested by christian.lorenz@suse.de

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index fd059b6f3b4583e69bf445cfe488ddbbe8f8be2f..771fa341a41d5f1bb527fc6b7e8e2171e6d0f26c 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -414,7 +414,7 @@ acl_mask(
                        const char *desc = b->a_dn_at->ad_cname->bv_val;
 
                        Debug( LDAP_DEBUG_ACL, "<= check a_dn_at: %s\n",
-                               b->a_dn_at, 0, 0);
+                               desc, 0, 0);
 
                        bv.bv_val = op->o_ndn;
                        bv.bv_len = strlen( bv.bv_val );

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 1fc1b7c538377a803271c73d1d991b8a72fa490a..55a6d04fc96a3f506ccd190311b57366e51f0a91 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -464,7 +464,7 @@ parse_acl(
                                                        fprintf( stderr,
                                                                "%s: line %d: group: \"%s\" not allowed by \"%s\"\n",
                                                                fname, lineno,
-                                                               b->a_group_at->ad_type,
+                                                               b->a_group_at->ad_cname->bv_val,
                                                                b->a_group_oc->soc_oid );
                                                        acl_usage();
                                                }
@@ -985,7 +985,8 @@ print_access( Access *b )
                fprintf( stderr, " group: %s", b->a_group_pat );
 
                if ( b->a_group_oc ) {
-                       fprintf( stderr, " objectClass: %s", b->a_group_oc );
+                       fprintf( stderr, " objectClass: %s",
+                               b->a_group_oc->soc_oclass.oc_oid );
 
                        if ( b->a_group_at ) {
                                fprintf( stderr, " attributeType: %s", b->a_group_at->ad_cname->bv_val );

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index fbe18144dea7b65fded6816371ef3efe4368c949..bd3e62eaed3b187d0c59f20822e00718b06d9996 100644 (file)
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -126,11 +126,7 @@ test_filter(
 #ifdef SLAPD_EXT_FILTERS
        case LDAP_FILTER_EXT:
                Debug( LDAP_DEBUG_FILTER, "    EXT\n", 0, 0, 0 );
-#if SLAPD_SCHEMA_NOT_COMPAT
                rc = test_mra_filter( be, conn, op, e, f->f_mra );
-#else
-               rc = LDAP_UNWILLING_TO_PERFORM;
-#endif
                break;
 #endif
 

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index ced99d95cf754f64b6ed3b8e0febd64ba72c37e1..8c185e07e50841c32bc9635e789f5849d732d567 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -49,8 +49,7 @@ int is_entry_objectclass(
        AttributeDescription *objectClass = slap_schema.si_ad_objectClass;
        assert(!( e == NULL || oc == NULL ));
 
-       if( e == NULL || oc == NULL
-       ) {
+       if( e == NULL || oc == NULL ) {
                return 0;
        }
 
@@ -63,7 +62,8 @@ int is_entry_objectclass(
                /* no objectClass attribute */
                Debug( LDAP_DEBUG_ANY, "is_entry_objectclass(\"%s\", \"%s\") "
                        "no objectClass attribute\n",
-                       e->e_dn == NULL ? "" : e->e_dn, oc, 0 );
+                       e->e_dn == NULL ? "" : e->e_dn,
+                       oc->soc_oclass.oc_oid, 0 );
 
                return 0;
        }

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 2c998bfffe8e091da5a95568d919df4baeadd428..5fcf3b7ec3c5a9f54f4bc1bdfa0d16b5e4a3970c 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -713,7 +713,7 @@ send_search_entry(
 
                if ( ! access_allowed( be, conn, op, e, desc, NULL, ACL_READ ) ) {
                        Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
-                           desc, 0, 0 );
+                           desc->ad_cname->bv_val, 0, 0 );
                        continue;
                }
 
@@ -732,7 +732,7 @@ send_search_entry(
                                {
                                        Debug( LDAP_DEBUG_ACL,
                                                "acl: access to attribute %s, value %d not allowed\n",
-                                       desc, i, 0 );
+                                       desc->ad_cname->bv_val, i, 0 );
                                        continue;
                                }
 
@@ -788,7 +788,7 @@ send_search_entry(
 
                if ( ! access_allowed( be, conn, op, e, desc, NULL, ACL_READ ) ) {
                        Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
-                           desc, 0, 0 );
+                           desc->ad_cname->bv_val, 0, 0 );
                        continue;
                }
 
@@ -807,7 +807,7 @@ send_search_entry(
                                {
                                        Debug( LDAP_DEBUG_ACL,
                                                "acl: access to attribute %s, value %d not allowed\n",
-                                       desc, i, 0 );
+                                       desc->ad_cname->bv_val, i, 0 );
                                        continue;
                                }