← Back to branch summary

~ttx/openldap/lucid-gssapi-495418

« back to all changes in this revision

Viewing changes to servers/slapd/mods.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug
  • Date: 2009-03-06 17:34:21 UTC
  • mto: (0.3.1 squeeze)
  • mto: This revision was merged to the branch mainline in revision 12.
  • Revision ID: james.westby@ubuntu.com-20090306173421-n2o3ca73v9tmrdiy
Tags: upstream-2.4.15
Import upstream version 2.4.15

Show diffs side-by-side

added added

removed removed

Lines of Context:
servers/slapd/mods.c
1
 
/* $OpenLDAP: pkg/ldap/servers/slapd/mods.c,v 1.59.2.8 2009/02/11 00:57:40 quanah Exp $ */
 
1
/* $OpenLDAP: pkg/ldap/servers/slapd/mods.c,v 1.59.2.9 2009/02/22 22:45:32 quanah Exp $ */
2
2
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
3
3
 *
4
4
 * Copyright 1998-2009 The OpenLDAP Foundation.
263
263
                goto return_result;
264
264
        }
265
265
 
 
266
        if ( a->a_desc == slap_schema.si_ad_objectClass ) {
 
267
                /* Needed by ITS#5517,ITS#5963 */
 
268
                flags = SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX;
 
269
 
 
270
        } else {
 
271
                flags = SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX;
 
272
        }
266
273
        if ( mod->sm_nvalues ) {
267
 
                flags = SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX
268
 
                        | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
 
274
                flags |= SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
269
275
                        | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH;
270
276
                cvals = mod->sm_nvalues;
271
277
        } else {
272
 
                flags = SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX;
273
278
                cvals = mod->sm_values;
274
279
        }
275
280