← Back to branch summary

~ttx/openldap/lucid-gssapi-495418

« back to all changes in this revision

Viewing changes to servers/slapd/backend.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug
  • Date: 2009-09-07 13:41:10 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20090907134110-rsnlhy8b0r21p9bg
Tags: 2.4.18-0ubuntu1
https://launchpad.net/bugs/419515
https://launchpad.net/bugs/417163
* New upstream release: (LP: #419515):
  + pcache overlay supports disconnected mode.
* Fix nss overlay load (LP: #417163).

Show diffs side-by-side

added added

removed removed

Lines of Context:
servers/slapd/backend.c
1
1
/* backend.c - routines for dealing with back-end databases */
2
 
/* $OpenLDAP: pkg/ldap/servers/slapd/backend.c,v 1.362.2.27 2009/05/18 17:51:55 quanah Exp $ */
 
2
/* $OpenLDAP: pkg/ldap/servers/slapd/backend.c,v 1.362.2.28 2009/08/25 23:10:31 quanah Exp $ */
3
3
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
4
4
 *
5
5
 * Copyright 1998-2009 The OpenLDAP Foundation.
226
226
                        (void)backend_set_controls( be );
227
227
 
228
228
                } else {
 
229
                        char *type = be->bd_info->bi_type;
 
230
                        char *suffix = "(null)";
 
231
 
 
232
                        if ( overlay_is_over( be ) ) {
 
233
                                slap_overinfo   *oi = (slap_overinfo *)be->bd_info->bi_private;
 
234
                                type = oi->oi_orig->bi_type;
 
235
                        }
 
236
 
 
237
                        if ( be->be_suffix != NULL && !BER_BVISNULL( &be->be_suffix[0] ) ) {
 
238
                                suffix = be->be_suffix[0].bv_val;
 
239
                        }
 
240
 
229
241
                        Debug( LDAP_DEBUG_ANY,
230
 
                                "backend_startup_one: bi_db_open failed! (%d)\n",
231
 
                                rc, 0, 0 );
 
242
                                "backend_startup_one (type=%s, suffix=\"%s\"): "
 
243
                                "bi_db_open failed! (%d)\n",
 
244
                                type, suffix, rc );
232
245
                }
233
246
        }
234
247