← Back to branch summary

~ttx/openldap/lucid-gssapi-495418

« back to all changes in this revision

Viewing changes to servers/slapd/back-meta/conn.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-meta/conn.c
1
 
/* $OpenLDAP: pkg/ldap/servers/slapd/back-meta/conn.c,v 1.86.2.15 2008/04/14 21:19:57 quanah Exp $ */
 
1
/* $OpenLDAP: pkg/ldap/servers/slapd/back-meta/conn.c,v 1.86.2.17 2009/01/22 00:01:07 kurt 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 2001-2003 Pierangelo Masarati.
6
6
 * Portions Copyright 1999-2003 Howard Chu.
7
7
 * All rights reserved.
289
289
         * don't return the connection */
290
290
        if ( mt->mt_isquarantined ) {
291
291
                slap_retry_info_t       *ri = &mt->mt_quarantine;
292
 
                int                     dont_retry = 1;
 
292
                int                     dont_retry = 0;
293
293
 
294
294
                if ( mt->mt_quarantine.ri_interval ) {
295
295
                        ldap_pvt_thread_mutex_lock( &mt->mt_quarantine_mutex );
296
 
                        if ( mt->mt_isquarantined == LDAP_BACK_FQ_YES ) {
 
296
                        dont_retry = ( mt->mt_isquarantined > LDAP_BACK_FQ_NO );
 
297
                        if ( dont_retry ) {
297
298
                                dont_retry = ( ri->ri_num[ ri->ri_idx ] == SLAP_RETRYNUM_TAIL
298
299
                                        || slap_get_time() < ri->ri_last + ri->ri_interval[ ri->ri_idx ] );
299
300
                                if ( !dont_retry ) {
307
308
                                                Debug( LDAP_DEBUG_ANY, "%s %s.\n",
308
309
                                                        op->o_log_prefix, buf, 0 );
309
310
                                        }
 
311
 
 
312
                                        mt->mt_isquarantined = LDAP_BACK_FQ_RETRYING;
310
313
                                }
311
314
 
312
 
                                mt->mt_isquarantined = LDAP_BACK_FQ_RETRYING;
313
315
                        }
314
316
                        ldap_pvt_thread_mutex_unlock( &mt->mt_quarantine_mutex );
315
317
                }