use RFC4523 objectClasses

diff --git a/servers/slapd/back-sql/rdbms_depend/mysql/testdb_metadata.sql b/servers/slapd/back-sql/rdbms_depend/mysql/testdb_metadata.sql
index eddeb3ff982aa84714681160743dd6bf17ddde2c..d7e88e40faece696ee3a7ee484d273fb8f7bb955 100644 (file)
--- a/servers/slapd/back-sql/rdbms_depend/mysql/testdb_metadata.sql
+++ b/servers/slapd/back-sql/rdbms_depend/mysql/testdb_metadata.sql
@@ -118,7 +118,7 @@ insert into ldap_entry_objclasses (entry_id,oc_name)
 values (1,'dcObject');
 
 insert into ldap_entry_objclasses (entry_id,oc_name)
-values (4,'strongAuthenticationUser');
+values (4,'pkiUser');
 
 insert into ldap_entry_objclasses (entry_id,oc_name)
 values (7,'extensibleObject');

diff --git a/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql b/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql
index 32a97278b01e6590f854d5be5bef7f89f4b9b572..d645cf298e781bf9b14929ad7b6a30203309c0a6 100644 (file)
--- a/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql
+++ b/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql
@@ -82,7 +82,7 @@ insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values (7,'ou=Referral,
 --     oc_name         the name of the objectClass; it MUST match the name of an objectClass that is loaded in slapd's schema
 insert into ldap_entry_objclasses (entry_id,oc_name) values (1,'dcObject');
 
-insert into ldap_entry_objclasses (entry_id,oc_name) values (4,'strongAuthenticationUser');
+insert into ldap_entry_objclasses (entry_id,oc_name) values (4,'pkiUser');
 
 insert into ldap_entry_objclasses (entry_id,oc_name) values (7,'extensibleObject');
 

diff --git a/tests/data/sql-read.out b/tests/data/sql-read.out
index 3d5edfb682c07a24715e71e4e0ee2690deb4873f..6c9749eae92ca9563b5f5c8bc474b324476c4149 100644 (file)
--- a/tests/data/sql-read.out
+++ b/tests/data/sql-read.out
@@ -8,7 +8,7 @@ dc: example
 # Testing onelevel search...
 dn: cn=Akakiy Zinberstein,dc=example,dc=com
 objectClass: inetOrgPerson
-objectClass: strongAuthenticationUser
+objectClass: pkiUser
 cn: Akakiy Zinberstein
 sn: Zinberstein
 givenName: Akakiy
@@ -67,7 +67,7 @@ telephoneNumber: 545-4563
 # Testing subtree search...
 dn: cn=Akakiy Zinberstein,dc=example,dc=com
 objectClass: inetOrgPerson
-objectClass: strongAuthenticationUser
+objectClass: pkiUser
 cn: Akakiy Zinberstein
 sn: Zinberstein
 givenName: Akakiy
@@ -132,7 +132,7 @@ telephoneNumber: 545-4563
 # Testing subtree search with manageDSAit...
 dn: cn=Akakiy Zinberstein,dc=example,dc=com
 objectClass: inetOrgPerson
-objectClass: strongAuthenticationUser
+objectClass: pkiUser
 cn: Akakiy Zinberstein
 sn: Zinberstein
 givenName: Akakiy
@@ -348,7 +348,7 @@ dc: example
 # Testing NOT search...
 dn: cn=Akakiy Zinberstein,dc=example,dc=com
 objectClass: inetOrgPerson
-objectClass: strongAuthenticationUser
+objectClass: pkiUser
 cn: Akakiy Zinberstein
 sn: Zinberstein
 givenName: Akakiy
@@ -404,7 +404,7 @@ dc: example
 # Testing NOT search on "auxiliary" objectClass...
 dn: cn=Akakiy Zinberstein,dc=example,dc=com
 objectClass: inetOrgPerson
-objectClass: strongAuthenticationUser
+objectClass: pkiUser
 cn: Akakiy Zinberstein
 sn: Zinberstein
 givenName: Akakiy
@@ -479,7 +479,7 @@ dc: example
 # Testing objectClass inheritance in filter...
 dn: cn=Akakiy Zinberstein,dc=example,dc=com
 objectClass: inetOrgPerson
-objectClass: strongAuthenticationUser
+objectClass: pkiUser
 cn: Akakiy Zinberstein
 sn: Zinberstein
 givenName: Akakiy
@@ -556,7 +556,7 @@ givenName: Mitya
 # Testing objectClass in requested attributes...
 dn: cn=Akakiy Zinberstein,dc=example,dc=com
 objectClass: inetOrgPerson
-objectClass: strongAuthenticationUser
+objectClass: pkiUser
 
 dn: documentTitle=book1,dc=example,dc=com
 objectClass: document