← Back to branch summary

~ttx/openldap/lucid-gssapi-495418

« back to all changes in this revision

Viewing changes to servers/slapd/back-sql/add.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek, Updated debconf translations
  • Date: 2009-07-28 10:17:15 UTC
  • mfrom: (1.1.4 upstream) (0.2.2 sid)
  • mto: (0.2.4 sid)
  • mto: This revision was merged to the branch mainline in revision 16.
  • Revision ID: james.westby@ubuntu.com-20090728101715-epwmqmsk0d3h22k3
http://bugs.debian.org/524770
http://bugs.debian.org/505191
http://bugs.debian.org/496749
http://bugs.debian.org/498116
http://bugs.debian.org/522965
http://bugs.debian.org/521804
* New upstream version.
  - Fixes FTBFS on ia64 with -fPIE. Closes: #524770.
  - Fixes some TLS issues with GnuTLS.  Closes: #505191.
* Update priority of libldap-2.4-2 to match the archive override.
* Add the missing ldapexop and ldapurl tools to ldap-utils, as well as the
  ldapurl(1) manpage.  Thanks to Peter Marschall for the patch.
  Closes: #496749.
* Bump build-dependency on debhelper to 6 instead of 5, since that's
  what we're using.  Closes: #498116.
* Set the default SLAPD_SERVICES to ldap:/// ldapi:///, instead of using
  the built-in default of ldap:/// only.
* Build-depend on libltdl-dev | libltdl3-dev (>= 1.4.3), for the package
  name change.  Closes: #522965.

[ Updated debconf translations ]
* Spanish, thanks to Francisco Javier Cuadrado <fcocuadrado@gmail.com>.
  Closes: #521804.

Show diffs side-by-side

added added

removed removed

Lines of Context:
servers/slapd/back-sql/add.c
1
 
/* $OpenLDAP: pkg/ldap/servers/slapd/back-sql/add.c,v 1.50.2.6 2008/02/11 23:26:48 kurt Exp $ */
 
1
/* $OpenLDAP: pkg/ldap/servers/slapd/back-sql/add.c,v 1.50.2.9 2009/02/05 19:35:54 quanah Exp $ */
2
2
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
3
3
 *
4
 
 * Copyright 1999-2008 The OpenLDAP Foundation.
 
4
 * Copyright 1999-2009 The OpenLDAP Foundation.
5
5
 * Portions Copyright 1999 Dmitry Kovalev.
6
6
 * Portions Copyright 2002 Pierangelo Masarati.
7
7
 * Portions Copyright 2004 Mark Adamson.
962
962
        if ( BACKSQL_CHECK_SCHEMA( bi ) ) {
963
963
                char            textbuf[ SLAP_TEXT_BUFLEN ] = { '\0' };
964
964
 
965
 
                rs->sr_err = entry_schema_check( op, op->ora_e, NULL, 0, 1,
 
965
                rs->sr_err = entry_schema_check( op, op->ora_e, NULL, 0, 1, NULL,
966
966
                        &rs->sr_text, textbuf, sizeof( textbuf ) );
967
967
                if ( rs->sr_err != LDAP_SUCCESS ) {
968
968
                        Debug( LDAP_DEBUG_TRACE, "   backsql_add(\"%s\"): "
975
975
 
976
976
        slap_add_opattrs( op, &rs->sr_text, textbuf, textlen, 1 );
977
977
 
 
978
        if ( get_assert( op ) &&
 
979
                ( test_filter( op, op->ora_e, get_assertion( op )) != LDAP_COMPARE_TRUE ))
 
980
        {
 
981
                Debug( LDAP_DEBUG_TRACE, "   backsql_add(\"%s\"): "
 
982
                        "assertion control failed -- aborting\n",
 
983
                        op->ora_e->e_name.bv_val, 0, 0 );
 
984
                e = NULL;
 
985
                rs->sr_err = LDAP_ASSERTION_FAILED;
 
986
                goto done;
 
987
        }
 
988
 
978
989
        /* search structuralObjectClass */
979
990
        for ( at = op->ora_e->e_attrs; at != NULL; at = at->a_next ) {
980
991
                if ( at->a_desc == slap_schema.si_ad_structuralObjectClass ) {