← Back to branch summary

~ubuntu-branches/ubuntu/utopic/389-ds-base/utopic

« back to all changes in this revision

Viewing changes to ldap/servers/plugins/acl/aclplugin.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2014-02-19 01:43:25 UTC
  • mfrom: (1.2.3)
  • Revision ID: package-import@ubuntu.com-20140219014325-1m8shiye3hhgscum
Tags: 1.3.2.11-0ubuntu1
* Merge from unreleased debian git.
  - CVE fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
ldap/servers/plugins/acl/aclplugin.c
364
364
 
365
365
        if (attrs && *attrs) attr = attrs[0];
366
366
 
367
 
        if (ACLPLUGIN_ACCESS_READ_ON_ENTRY == flags)
 
367
        if (ACLPLUGIN_ACCESS_READ_ON_ENTRY == flags) {
368
368
                rc = acl_read_access_allowed_on_entry ( pb, e, attrs, access);
369
 
        else if ( ACLPLUGIN_ACCESS_READ_ON_ATTR == flags) {
 
369
        } else if ( ACLPLUGIN_ACCESS_READ_ON_ATTR == flags) {
370
370
                if (attr == NULL) {
371
 
                        slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "Missing attribute\n" );
 
371
                        slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "Missing attribute\n" );
372
372
                        rc = LDAP_OPERATIONS_ERROR;
373
373
                } else {
374
374
                        rc = acl_read_access_allowed_on_attr ( pb, e, attr, val, access);