Minor fixes in result.c (ITS#574)

[christian.lorenz@suse.de]

Full_Name: Christian Lorenz
Version: 2.0-devel
OS: linux-2.2.14
URL: ftp://ftp.openldap.org/incoming/
Submission from: (NULL) (194.112.123.201)


In pkg/ldap/servers/slapd/result.c,v 1.93:

--- result.c.orig   Wed May 31 16:22:32 2000
+++ result.c    Wed Jun  7 12:05:58 2000
@@ -729,8 +729,13 @@
        }

        if ( ! access_allowed( be, conn, op, e, desc, NULL, ACL_READ ) ) {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+           Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
+               desc->ad_cname->bv_val, 0, 0 );
+#else
            Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
                desc, 0, 0 );
+#endif
            continue;
        }

@@ -747,9 +752,15 @@
                if ( ! access_allowed( be, conn, op, e,
                    desc, a->a_vals[i], ACL_READ ) )
                {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+                   Debug( LDAP_DEBUG_ACL,
+                       "acl: access to attribute %s, value %d not allowed\n",
+                       desc->ad_cname->bv_val, i, 0 );
+#else
                    Debug( LDAP_DEBUG_ACL,
                        "acl: access to attribute %s, value %d not allowed\n",
                        desc, i, 0 );
+#endif
                    continue;
                }

@@ -816,8 +827,13 @@
        }

        if ( ! access_allowed( be, conn, op, e, desc, NULL, ACL_READ ) ) {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
            Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
-               desc, 0, 0 );
+               desc->ad_cname->bv_val, 0, 0 );
+#else
+           Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
+               desc, 0, 0 );
+#endif
            continue;
        }

@@ -834,9 +850,15 @@
                if ( ! access_allowed( be, conn, op, e,
                    desc, a->a_vals[i], ACL_READ ) )
                {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
                    Debug( LDAP_DEBUG_ACL,
                        "acl: access to attribute %s, value %d not allowed\n",
-                       desc, i, 0 );
+                       desc->ad_cname->bv_val, i, 0 );
+#else
+                   Debug( LDAP_DEBUG_ACL,
+                       "acl: access to attribute %s, value %d not allowed\n",
+                       desc, i, 0 );
+#endif
                    continue;
                }