← Back to branch summary

~ttx/openldap/lucid-gssapi-495418

« back to all changes in this revision

Viewing changes to servers/slapd/back-bdb/config.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/back-bdb/config.c
1
1
/* config.c - bdb backend configuration file routine */
2
 
/* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/config.c,v 1.91.2.16 2009/01/22 00:01:05 kurt Exp $ */
 
2
/* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/config.c,v 1.91.2.18 2009/08/25 22:58:09 quanah Exp $ */
3
3
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
4
4
 *
5
5
 * Copyright 2000-2009 The OpenLDAP Foundation.
61
61
                        "DESC 'Directory for database content' "
62
62
                        "EQUALITY caseIgnoreMatch "
63
63
                        "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
64
 
        { "cachefree", "size", 2, 2, 0, ARG_UINT|ARG_OFFSET,
 
64
        { "cachefree", "size", 2, 2, 0, ARG_ULONG|ARG_OFFSET,
65
65
                (void *)offsetof(struct bdb_info, bi_cache.c_minfree),
66
66
                "( OLcfgDbAt:1.11 NAME 'olcDbCacheFree' "
67
67
                        "DESC 'Number of extra entries to free when max is reached' "
68
68
                        "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
69
 
        { "cachesize", "size", 2, 2, 0, ARG_UINT|ARG_OFFSET,
 
69
        { "cachesize", "size", 2, 2, 0, ARG_ULONG|ARG_OFFSET,
70
70
                (void *)offsetof(struct bdb_info, bi_cache.c_maxsize),
71
71
                "( OLcfgDbAt:1.1 NAME 'olcDbCacheSize' "
72
72
                        "DESC 'Entry cache size in entries' "
109
109
                "( OLcfgDbAt:1.5 NAME 'olcDbDirtyRead' "
110
110
                "DESC 'Allow reads of uncommitted data' "
111
111
                "SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
112
 
        { "dncachesize", "size", 2, 2, 0, ARG_UINT|ARG_OFFSET,
 
112
        { "dncachesize", "size", 2, 2, 0, ARG_ULONG|ARG_OFFSET,
113
113
                (void *)offsetof(struct bdb_info, bi_cache.c_eimax),
114
114
                "( OLcfgDbAt:1.12 NAME 'olcDbDNcacheSize' "
115
115
                        "DESC 'DN cache size' "
116
116
                        "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
117
 
        { "idlcachesize", "size", 2, 2, 0, ARG_UINT|ARG_OFFSET,
 
117
        { "idlcachesize", "size", 2, 2, 0, ARG_ULONG|ARG_OFFSET,
118
118
                (void *)offsetof(struct bdb_info, bi_idl_cache_max_size),
119
119
                "( OLcfgDbAt:1.6 NAME 'olcDbIDLcacheSize' "
120
120
                "DESC 'IDL cache size in IDLs' "
487
487
                        if ( bdb->bi_lock_detect != DB_LOCK_DEFAULT ) {
488
488
                                int i;
489
489
                                for (i=0; !BER_BVISNULL(&bdb_lockd[i].word); i++) {
490
 
                                        if ( bdb->bi_lock_detect == bdb_lockd[i].mask ) {
 
490
                                        if ( bdb->bi_lock_detect == (u_int32_t)bdb_lockd[i].mask ) {
491
491
                                                value_add_one( &c->rvalue_vals, &bdb_lockd[i].word );
492
492
                                                rc = 0;
493
493
                                                break;
890
890
                                c->log, c->argv[1] );
891
891
                        return 1;
892
892
                }
893
 
                bdb->bi_lock_detect = rc;
 
893
                bdb->bi_lock_detect = (u_int32_t)rc;
894
894
                break;
895
895
 
896
896
        case BDB_SSTACK: