← Back to branch summary

~ubuntu-branches/ubuntu/raring/openldap/raring

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Steve Langasek, Peter Marschall, Steve Langasek
  • Date: 2012-06-27 03:27:34 UTC
  • mfrom: (1.3.5)
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: package-import@ubuntu.com-20120627032734-4ewhadc8g79rs6yp
Tags: 2.4.31-1
http://bugs.debian.org/663644
http://bugs.debian.org/666230
http://bugs.debian.org/677158
http://bugs.debian.org/654824
http://bugs.debian.org/662940
http://bugs.debian.org/664930
http://bugs.debian.org/663724
* New upstream release.
  - Fixes a denial of service attack, CVE-2012-1164, when using the rwm
    overlay.  Closes: #663644.
  - Fixes a bug with ldap_result always returning -1 when called from
    sssd.  Closes: #666230.
  - Fix a build failure on armel due to unaligned memory access.
    Closes: #677158.
* Incorporate NMU (thanks, Julien Cristau, Mattias Ellert):
  - Disable the mdb backend on non-Linux, it looks like it doesn't work
    with linuxthreads (closes: #654824).
  - Backport fix for shell backend configuration.  Closes: #662940.

[ Peter Marschall ]
* debian/slapd.scripts-common: avoid grep warnings
* debian/patches/heimdal-fix: fix arguments of
  hdb_generate_key_set_password().  Closes: #664930

[ Steve Langasek ]
* debian/patches/contrib-modules-use-dpkg-buildflags: pass CFLAGS to
  contrib builds.  Thanks to Simon Ruderich <simon@ruderich.org>.
  Closes: #663724.

Show diffs side-by-side

added added

removed removed

Lines of Context:
servers/slapd/back-mdb/add.c
2
2
/* $OpenLDAP$ */
3
3
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
4
4
 *
5
 
 * Copyright 2000-2011 The OpenLDAP Foundation.
 
5
 * Copyright 2000-2012 The OpenLDAP Foundation.
6
6
 * All rights reserved.
7
7
 *
8
8
 * Redistribution and use in source and binary forms, with or without
408
408
                        goto return_results;
409
409
                }
410
410
 
411
 
                if (( rs->sr_err = mdb_txn_commit( txn )) != 0 ) {
 
411
                rs->sr_err = mdb_txn_commit( txn );
 
412
                txn = NULL;
 
413
                if ( rs->sr_err != 0 ) {
412
414
                        rs->sr_text = "txn_commit failed";
413
415
                        Debug( LDAP_DEBUG_TRACE,
414
416
                                LDAP_XSTRING(mdb_add) ": %s : %s (%d)\n",
416
418
                        rs->sr_err = LDAP_OTHER;
417
419
                        goto return_results;
418
420
                }
419
 
                txn = NULL;
420
421
        }
421
422
 
422
423
        Debug(LDAP_DEBUG_TRACE,