~ubuntu-branches/ubuntu/hardy/openldap2.3/hardy-updates

« back to all changes in this revision

Viewing changes to servers/slapd/back-meta/delete.c

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2008-07-31 16:06:53 UTC
  • mfrom: (16.1.3 hardy-proposed)
  • Revision ID: james.westby@ubuntu.com-20080731160653-np1dr19qfutmqb0v
Tags: 2.4.9-0ubuntu0.8.04.1
* SECURITY UPDATE: denial of service via broken BER decoding.
* Added debian/patches/security-ber-decoding.patch: upstream fixes.
* References
  CVE-2008-2952

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/* $OpenLDAP: pkg/ldap/servers/slapd/back-meta/delete.c,v 1.37.2.5 2007/08/31 23:14:03 quanah Exp $ */
 
1
/* $OpenLDAP: pkg/ldap/servers/slapd/back-meta/delete.c,v 1.37.2.7 2008/02/12 00:25:47 quanah Exp $ */
2
2
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
3
3
 *
4
 
 * Copyright 1999-2007 The OpenLDAP Foundation.
 
4
 * Copyright 1999-2008 The OpenLDAP Foundation.
5
5
 * Portions Copyright 2001-2003 Pierangelo Masarati.
6
6
 * Portions Copyright 1999-2003 Howard Chu.
7
7
 * All rights reserved.
81
81
                do_retry = 0;
82
82
                if ( meta_back_retry( op, rs, &mc, candidate, LDAP_BACK_SENDERR ) ) {
83
83
                        /* if the identity changed, there might be need to re-authz */
84
 
                        (void)ldap_back_controls_free( op, rs, &ctrls );
 
84
                        (void)mi->mi_ldap_extra->controls_free( op, rs, &ctrls );
85
85
                        goto retry;
86
86
                }
87
87
        }
88
88
 
89
89
cleanup:;
90
 
        (void)ldap_back_controls_free( op, rs, &ctrls );
 
90
        (void)mi->mi_ldap_extra->controls_free( op, rs, &ctrls );
91
91
 
92
92
        if ( mdn.bv_val != op->o_req_dn.bv_val ) {
93
93
                free( mdn.bv_val );