X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fdata%2Fslapd-sql.conf;h=cc2943ad2dc37f2a8f2e0c9095624f08d6a922d3;hb=dfe5c1e74247ee5e5ceab9597389c386209b1f7d;hp=35a474225c104c73cdf7ad967b73ac3e13ce1b65;hpb=73bf45060013be27881a529eb39f6543956f9e93;p=openldap

diff --git a/tests/data/slapd-sql.conf b/tests/data/slapd-sql.conf
index 35a474225c..cc2943ad2d 100644
--- a/tests/data/slapd-sql.conf
+++ b/tests/data/slapd-sql.conf
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,13 +14,13 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 #ucdata-path	./ucdata
-include ./schema/core.schema
-include ./schema/cosine.schema
-include ./schema/inetorgperson.schema
-include ./schema/openldap.schema
-include ./schema/nis.schema
-pidfile     ./testrun/slapd.1.pid
-argsfile    ./testrun/slapd.1.args
+include		@SCHEMADIR@/core.schema
+include		@SCHEMADIR@/cosine.schema
+include		@SCHEMADIR@/inetorgperson.schema
+include		@SCHEMADIR@/openldap.schema
+include		@SCHEMADIR@/nis.schema
+pidfile		@TESTDIR@/slapd.1.pid
+argsfile	@TESTDIR@/slapd.1.args
 
 #sqlmod#modulepath ../servers/slapd/back-sql/
 #sqlmod#moduleload back_sql.la
@@ -32,17 +32,13 @@ argsfile    ./testrun/slapd.1.args
 # cn=monitor, cn=schema, and cn=config
 #
 
-access to attr=userpassword
-	by self =wx
+access to attrs=userpassword
+	by self =w
 	by anonymous =x
 
 access to *
 	by * read
 
-# FIXME: this is required to work with referrals the old way;
-# the new way requires to map referrals in ldap_oc_mappings on their own
-schemacheck	off
-
 #######################################################################
 # sql database definitions
 #######################################################################
@@ -64,16 +60,16 @@ dbpasswd        secret
 #ibmdb2#concat_pattern  	"?||?"
 #ibmdb2#children_cond		"ucase(ldap_entries.dn)=ucase(cast(? as varchar(255)))"
 #ibmdb2#create_needs_select	"yes"
-#ibmdb2#insentry_query		"insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values ((select case when max(id) is null then 1 else max(id) + 1 end from ldap_entries),?,?,?,?)"
+#ibmdb2#insentry_stmt		"insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values ((select case when max(id) is null then 1 else max(id) + 1 end from ldap_entries),?,?,?,?)"
 #
 # PostgreSQL
-#postgres#insentry_query  "insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values ((select case when max(id) is null then 1 else max(id) + 1 end from ldap_entries),?,?,?,?)"
-#postgres#upper_func      "upper"
-#postgres#strcast_func    "text"
-#postgres#concat_pattern  "?||?"
+#pgsql#insentry_stmt		"insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values ((select case when max(id) is null then 1 else max(id) + 1 end from ldap_entries),?,?,?,?)"
+#pgsql#upper_func		"upper"
+#pgsql#strcast_func		"text"
+#pgsql#concat_pattern	"?||?"
 #
 # MySQL
-#mysql#concat_pattern  "concat(?,?)"
+#mysql#concat_pattern	"concat(?,?)"
 
 has_ldapinfo_dn_ru      no