Latest SANDPIT - MERGE from CVS (MERGE-GIT)

doc/demo-reset.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 for i in $(grep directory phpldapadmin-demo.conf|awk '{print $2}'); do
-	rm -f $i/*dbb $i/alock $i/log.*
+	rm -f $i/*.dbb $i/*.bdb $i/__db.??? $i/alock $i/log.*
 done
 
 slapadd -b "dc=example.com" -l ldif-example.com

doc/phpldapadmin-demo.conf

@@ -1,19 +1,27 @@
+include         /etc/openldap/schema/uidpool.schema
+
 TLSCACertificateFile	/etc/openldap/pla/ca-bundle.crt
 TLSCertificateFile	/etc/openldap/pla/slapd.crt
 TLSCertificateKeyFile	/etc/openldap/pla/slapd.key
 
+access to dn.regex="o=Simpsons$" attrs=userpassword
+	by anonymous auth
+	by self write
+	by * none
+
+access to dn.base="" by * read
 access to dn.regex="dc=example.com$"
 	by * write
 access to dn.regex="dc=example,dc=com$"
 	by * write
 access to dn.regex="o=Simpsons$"
 	by self write
-	by dn.regex="cn=.*,ou=People,o=Simpsons" write
+	by dn.regex="cn=.*,ou=Pets,o=Simpsons" write
 	by * read
 access to *
 	by * read
 
-database	ldbm
+database	bdb
 suffix		"dc=example.com"
 rootdn		"cn=Manager,dc=example.com"
 rootpw		NotAllowed
@@ -28,7 +36,7 @@ index uidNumber,gidNumber,loginShell	eq,pres
 index uid,memberUid			eq,pres,sub
 index nisMapName,nisMapEntry		eq,pres,sub
 
-database	ldbm
+database	bdb
 suffix		"dc=example,dc=com"
 rootdn		"cn=Manager,dc=example,dc=com"
 rootpw		NotAllowed
@@ -43,7 +51,7 @@ index uidNumber,gidNumber,loginShell	eq,pres
 index uid,memberUid			eq,pres,sub
 index nisMapName,nisMapEntry		eq,pres,sub
 
-database	ldbm
+database	bdb
 suffix		"o=Simpsons"
 rootdn		"cn=Manager,o=Simpsons"
 rootpw		NotAllowed
@@ -57,3 +65,11 @@ index ou,cn,mail,surname,givenname	eq,pres,sub
 index uidNumber,gidNumber,loginShell	eq,pres
 index uid,memberUid			eq,pres,sub
 index nisMapName,nisMapEntry		eq,pres,sub
+
+database                   monitor
+access to * by * read
+
+database                   config
+access to * by * read
+rootdn cn=admin,cn=config
+rootpw password

doc/pla-test-i18n.ldif

@@ -1,4 +1,4 @@
-# $Header: /cvsroot/phpldapadmin/phpldapadmin/doc/pla-test-i18n.ldif,v 1.4 2004/03/19 20:22:54 i18phpldapadmin Exp $
+# $Header$
 # This is a Test-File for characters / encoding
 # 1. Change the
 #      ,dc=example,dc=com