← Back to branch summary

~ttx/openldap/lucid-gssapi-495418

« back to all changes in this revision

Viewing changes to servers/slapd/overlays/dynlist.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/overlays/dynlist.c
1
1
/* dynlist.c - dynamic list overlay */
2
 
/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/dynlist.c,v 1.20.2.27 2009/03/05 23:00:00 quanah Exp $ */
 
2
/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/dynlist.c,v 1.20.2.28 2009/08/25 23:13:42 quanah Exp $ */
3
3
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
4
4
 *
5
5
 * Copyright 2003-2009 The OpenLDAP Foundation.
957
957
                ObjectClass             *oc;
958
958
                AttributeDescription    *ad = NULL,
959
959
                                        *member_ad = NULL;
960
 
                dynlist_map_t           *dlm = NULL;
 
960
                dynlist_map_t           *dlm = NULL, *dlml = NULL;
961
961
                const char              *text;
962
962
 
963
963
                if ( argc < 3 ) {
997
997
                        AttributeDescription *member_ad = NULL;
998
998
                        AttributeDescription *mapped_ad = NULL;
999
999
                        dynlist_map_t *dlmp;
1000
 
                        dynlist_map_t *dlml;
1001
1000
 
1002
1001
 
1003
1002
                        /*
1032
1031
                        dlmp = (dynlist_map_t *)ch_calloc( 1, sizeof( dynlist_map_t ) );
1033
1032
                        if ( dlm == NULL ) {
1034
1033
                                dlm = dlmp;
1035
 
                                dlml = NULL;
1036
1034
                        }
1037
1035
                        dlmp->dlm_member_ad = member_ad;
1038
1036
                        dlmp->dlm_mapped_ad = mapped_ad;
1406
1404
                struct berval           nbase = BER_BVNULL;
1407
1405
                Filter                  *filter = NULL;
1408
1406
                struct berval           uri = BER_BVNULL;
1409
 
                dynlist_map_t           *dlm = NULL;
 
1407
                dynlist_map_t           *dlm = NULL, *dlml = NULL;
1410
1408
                const char              *text;
1411
1409
 
1412
1410
                oc = oc_find( c->argv[ 1 ] );
1534
1532
                        AttributeDescription *member_ad = NULL;
1535
1533
                        AttributeDescription *mapped_ad = NULL;
1536
1534
                        dynlist_map_t *dlmp;
1537
 
                        dynlist_map_t *dlml;
1538
1535
 
1539
1536
 
1540
1537
                        /*
1572
1569
                        dlmp = (dynlist_map_t *)ch_calloc( 1, sizeof( dynlist_map_t ) );
1573
1570
                        if ( dlm == NULL ) {
1574
1571
                                dlm = dlmp;
1575
 
                                dlml = NULL;
1576
1572
                        }
1577
1573
                        dlmp->dlm_member_ad = member_ad;
1578
1574
                        dlmp->dlm_mapped_ad = mapped_ad;