Merge remote branch 'origin/mdb.master'

[openldap] / tests / data / slapd-proxycache.conf

diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf
index 195e774c4fc472f139077e768487d766fb446b20..771c10f2aac020ad908c35f9d3de62102d3d9247 100644 (file)
--- a/tests/data/slapd-proxycache.conf
+++ b/tests/data/slapd-proxycache.conf
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2008 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -44,22 +44,22 @@ uri         "@URI1@"
 limits         dn="cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com" size=1
 
 overlay                pcache
-proxycache     @BACKEND@ 100 2 @ENTRY_LIMIT@ @CACHETTL@
-proxyattrset 0         sn cn title uid
-proxyattrset 1         mail postaladdress telephonenumber cn uid
-proxytemplate          (|(cn=)(sn=)) 0 @CACHETTL@ @NCACHETTL@ @SCACHETTL@
-proxytemplate          (sn=) 0 @CACHETTL@ @NCACHETTL@ @SCACHETTL@
-proxytemplate          (uid=) 1 @CACHETTL@ @NCACHETTL@ @SCACHETTL@
-proxytemplate          (mail=) 0 @CACHETTL@ @NCACHETTL@ @SCACHETTL@
+pcache @BACKEND@ 100 2 @ENTRY_LIMIT@ @CCPERIOD@
+pcacheattrset 0        sn cn title uid
+pcacheattrset 1        mail postaladdress telephonenumber cn uid
+pcachetemplate         (|(cn=)(sn=)) 0 @TTL@ @NTTL@ @STTL@
+pcachetemplate         (sn=) 0 @TTL@ @NTTL@ @STTL@
+pcachetemplate         (uid=) 1 @TTL@ @NTTL@ @STTL@
+pcachetemplate         (mail=) 0 @TTL@ @NTTL@ @STTL@
+pcachetemplate         (&(objectclass=)(uid=)) 1 @TTL@ @NTTL@ @STTL@ @TTR@
+pcachebind             (&(objectclass=person)(uid=)) 1 @BTTR@ sub "ou=Alumni Association,ou=people,dc=example,dc=com"
 
 #bdb#cachesize 20
 #hdb#cachesize 20
 
-directory      @TESTDIR@/db.2.a
-#bdb#index             objectClass     eq
-#bdb#index             cn,sn,uid,mail  pres,eq,sub
-#hdb#index             objectClass     eq
-#hdb#index             cn,sn,uid,mail  pres,eq,sub
+#~null~#directory      @TESTDIR@/db.2.a
+#indexdb#index         objectClass     eq
+#indexdb#index         cn,sn,uid,mail  pres,eq,sub
 #ndb#dbname db_2
 #ndb#include @DATADIR@/ndb.conf