9fee5d1 Merge branch 'master' into RHEL-6

Merged and Committed by rmeggins 12 years ago
79 files changed. 5228 lines added. 1114 lines removed.
Makefile.am
file modified
+18 -4
Makefile.in
file modified
+57 -9
VERSION.sh
file modified
+2 -2
config.h.in
file modified
+1 -2
configure
file modified
+1579 -191
configure.ac
file modified
+11 -2
ldap/admin/src/scripts/50automemberplugin.ldif
file added
+15
ldap/admin/src/scripts/50managedentriesplugin.ldif
file added
+16
ldap/admin/src/scripts/50refintprecedence.ldif
file added
+4
ldap/admin/src/scripts/DSUtil.pm.in
file modified
+6 -2
ldap/admin/src/scripts/Inf.pm
file modified
+12 -6
ldap/admin/src/scripts/SetupDialogs.pm.in
file modified
+1 -17
ldap/admin/src/scripts/setup-ds.res.in
file modified
+0 -5
ldap/ldif/template-dse.ldif.in
file modified
+12 -0
ldap/schema/01core389.ldif
file modified
+2 -1
ldap/schema/10automember-plugin.ldif
file added
+123
ldap/servers/plugins/acl/acl.c
file modified
+10 -0
ldap/servers/plugins/acl/acleffectiverights.c
file modified
+1 -2
ldap/servers/plugins/acl/acllas.c
file modified
+3 -1
ldap/servers/plugins/automember/automember.c
file added
+1881
ldap/servers/plugins/automember/automember.h
file added
+134
ldap/servers/plugins/chainingdb/cb_instance.c
file modified
+6 -2
ldap/servers/plugins/collation/collate.c
file modified
+1 -1
ldap/servers/plugins/dna/dna.c
file modified
+44 -0
ldap/servers/plugins/linkedattrs/linked_attrs.c
file modified
+56 -14
ldap/servers/plugins/memberof/memberof.c
file modified
+88 -3
ldap/servers/plugins/memberof/memberof.h
file modified
+1 -0
ldap/servers/plugins/memberof/memberof_config.c
file modified
+1 -0
ldap/servers/plugins/mep/mep.c
file modified
+162 -31
ldap/servers/plugins/replication/cl5_api.c
file modified
+43 -30
ldap/servers/plugins/replication/cl5_config.c
file modified
+5 -2
ldap/servers/plugins/replication/csnpl.c
file modified
+1 -1
ldap/servers/plugins/replication/repl5.h
file modified
+2 -1
ldap/servers/plugins/replication/repl5_agmt.c
file modified
+30 -8
ldap/servers/plugins/replication/repl5_agmtlist.c
file modified
+14 -27
ldap/servers/plugins/replication/repl5_connection.c
file modified
+8 -8
ldap/servers/plugins/replication/repl5_inc_protocol.c
file modified
+1 -1
ldap/servers/plugins/replication/repl5_protocol_util.c
file modified
+4 -3
ldap/servers/plugins/replication/repl5_replica.c
file modified
+3 -1
ldap/servers/plugins/replication/repl5_replica_config.c
file modified
+20 -8
ldap/servers/plugins/replication/repl5_tot_protocol.c
file modified
+1 -1
ldap/servers/plugins/replication/replutil.c
file modified
+38 -21
ldap/servers/plugins/replication/windows_connection.c
file modified
+13 -3
ldap/servers/plugins/replication/windows_protocol_util.c
file modified
+64 -21
ldap/servers/plugins/replication/windowsrepl.h
file modified
+1 -1
ldap/servers/slapd/back-ldbm/cache.c
file modified
+16 -3
ldap/servers/slapd/back-ldbm/dblayer.c
file modified
+29 -18
ldap/servers/slapd/back-ldbm/index.c
file modified
+1 -1
ldap/servers/slapd/back-ldbm/init.c
file modified
+14 -8
ldap/servers/slapd/back-ldbm/instance.c
file modified
+3 -2
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
file modified
+5 -4
ldap/servers/slapd/back-ldbm/ldif2ldbm.c
file modified
+7 -7
ldap/servers/slapd/back-ldbm/sort.c
file modified
+14 -5
ldap/servers/slapd/bind.c
file modified
+1 -0
ldap/servers/slapd/conntable.c
file modified
+2 -1
ldap/servers/slapd/entry.c
file modified
+12 -10
ldap/servers/slapd/entrywsi.c
file modified
+5 -4
ldap/servers/slapd/log.c
file modified
+14 -13
ldap/servers/slapd/mapping_tree.c
file modified
+4 -1
ldap/servers/slapd/modify.c
file modified
+3 -1
ldap/servers/slapd/operation.c
file modified
+1 -0
ldap/servers/slapd/pblock.c
file modified
+6 -0
ldap/servers/slapd/plugin.c
file modified
+12 -0
ldap/servers/slapd/plugin_internal_op.c
file modified
+1 -1
ldap/servers/slapd/resourcelimit.c
file modified
+3 -37
ldap/servers/slapd/result.c
file modified
+29 -6
ldap/servers/slapd/schema.c
file modified
+1 -1
ldap/servers/slapd/slap.h
file modified
+2 -0
ldap/servers/slapd/slapi-plugin.h
file modified
+2 -0
ldap/servers/slapd/snmp_collator.c
file modified
+13 -1
ldap/servers/slapd/task.c
file modified
+2 -0
ldap/servers/slapd/test-plugins/testbind.c
file modified
+1 -0
ldap/servers/slapd/tools/ldclt/ldapfct.c
file modified
+497 -423
ldap/servers/slapd/tools/ldclt/ldclt.h
file modified
+1 -0
ldap/servers/slapd/tools/ldclt/scalab01.c
file modified
+11 -122
ldap/servers/slapd/tools/rsearch/sdattable.c
file modified
+2 -2
ldap/servers/slapd/uuid.c
file modified
+7 -6
ldap/servers/slapd/vattr.c
file modified
+5 -5
m4/openldap.m4
file modified
+7 -0
    Merge branch 'master' into RHEL-6
    
        
file modified
+18 -4
file modified
+57 -9
file modified
+2 -2
file modified
+1 -2
file modified
+1579 -191
file modified
+11 -2
file modified
+12 -6
file modified
+2 -1
file modified
+162 -31
file modified
+1 -0
file modified
+12 -10
file modified
+14 -13
file modified
+3 -1
file modified
+6 -0
file modified
+12 -0
file modified
+29 -6
file modified
+1 -1
file modified
+2 -0
file modified
+2 -0
file modified
+7 -6
file modified
+5 -5
file modified
+7 -0