--- tests/data/sql-read.out	2004/10/03 23:21:00	1.6
+++ tests/data/sql-read.out	2005/08/09 21:04:11	1.6.2.2
@@ -21,6 +21,8 @@ documentTitle: book2
 documentAuthor: cn=Mitya Kovalev,dc=example,dc=com
 documentIdentifier: document 2
 
+# refldap://localhost:9012/dc=example,dc=com??one
+
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Mitya Kovalev
@@ -39,7 +41,11 @@ seeAlso: documentTitle=book1,dc=example,
 givenName: Torvlobnor
 telephoneNumber: 545-4563
 
-# refldap://localhost/dc=example,dc=com??one
+dn: cn=Akakiy Zinberstein,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Akakiy Zinberstein
+sn: Zinberstein
+givenName: Akakiy
 
 # Testing subtree search...
 dn: documentTitle=book1,dc=example,dc=com
@@ -57,6 +63,8 @@ documentTitle: book2
 documentAuthor: cn=Mitya Kovalev,dc=example,dc=com
 documentIdentifier: document 2
 
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: dc=example,dc=com
 objectClass: organization
 objectClass: dcObject
@@ -81,10 +89,68 @@ seeAlso: documentTitle=book1,dc=example,
 givenName: Torvlobnor
 telephoneNumber: 545-4563
 
-# refldap://localhost/dc=example,dc=com??sub
+dn: cn=Akakiy Zinberstein,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Akakiy Zinberstein
+sn: Zinberstein
+givenName: Akakiy
+
+# Testing subtree search with manageDSAit...
+dn: documentTitle=book1,dc=example,dc=com
+objectClass: document
+description: abstract1
+documentTitle: book1
+documentAuthor: cn=Mitya Kovalev,dc=example,dc=com
+documentAuthor: cn=Torvlobnor Puzdoy,dc=example,dc=com
+documentIdentifier: document 1
+
+dn: documentTitle=book2,dc=example,dc=com
+objectClass: document
+description: abstract2
+documentTitle: book2
+documentAuthor: cn=Mitya Kovalev,dc=example,dc=com
+documentIdentifier: document 2
+
+dn: ou=Referral,dc=example,dc=com
+objectClass: referral
+objectClass: extensibleObject
+ou: Referral
+ref: ldap://localhost:9012/
+
+dn: dc=example,dc=com
+objectClass: organization
+objectClass: dcObject
+o: Example
+dc: example
+
+dn: cn=Mitya Kovalev,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Mitya Kovalev
+sn: Kovalev
+seeAlso: documentTitle=book1,dc=example,dc=com
+seeAlso: documentTitle=book2,dc=example,dc=com
+givenName: Mitya
+telephoneNumber: 222-3234
+telephoneNumber: 332-2334
+
+dn: cn=Torvlobnor Puzdoy,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Torvlobnor Puzdoy
+sn: Puzdoy
+seeAlso: documentTitle=book1,dc=example,dc=com
+givenName: Torvlobnor
+telephoneNumber: 545-4563
+
+dn: cn=Akakiy Zinberstein,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Akakiy Zinberstein
+sn: Zinberstein
+givenName: Akakiy
 
 # Testing invalid filter...
 # Testing exact search...
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Mitya Kovalev
@@ -96,6 +162,8 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing substrings initial search...
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Mitya Kovalev
@@ -107,6 +175,8 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing substrings any search...
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Mitya Kovalev
@@ -118,6 +188,8 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing substrings final search...
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Mitya Kovalev
@@ -129,6 +201,8 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing approx search...
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Mitya Kovalev
@@ -140,6 +214,8 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing extensible filter search...
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Mitya Kovalev
@@ -151,6 +227,8 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing search for telephoneNumber...
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Mitya Kovalev
@@ -162,6 +240,8 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing AND search...
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Mitya Kovalev
@@ -180,6 +260,8 @@ o: Example
 dc: example
 
 # Testing OR search...
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Mitya Kovalev
@@ -221,7 +303,11 @@ seeAlso: documentTitle=book1,dc=example,
 givenName: Torvlobnor
 telephoneNumber: 545-4563
 
-# refldap://localhost/dc=example,dc=com??sub
+dn: cn=Akakiy Zinberstein,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Akakiy Zinberstein
+sn: Zinberstein
+givenName: Akakiy
 
 # Testing NOT search on objectClass...
 dn: documentTitle=book1,dc=example,dc=com
@@ -239,6 +325,8 @@ documentTitle: book2
 documentAuthor: cn=Mitya Kovalev,dc=example,dc=com
 documentIdentifier: document 2
 
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: dc=example,dc=com
 objectClass: organization
 objectClass: dcObject
@@ -261,6 +349,8 @@ documentTitle: book2
 documentAuthor: cn=Mitya Kovalev,dc=example,dc=com
 documentIdentifier: document 2
 
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
 cn: Mitya Kovalev
@@ -279,7 +369,11 @@ seeAlso: documentTitle=book1,dc=example,
 givenName: Torvlobnor
 telephoneNumber: 545-4563
 
-# refldap://localhost/dc=example,dc=com??sub
+dn: cn=Akakiy Zinberstein,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Akakiy Zinberstein
+sn: Zinberstein
+givenName: Akakiy
 
 # Testing attribute inheritance in filter...
 dn: dc=example,dc=com
@@ -307,7 +401,11 @@ seeAlso: documentTitle=book1,dc=example,
 givenName: Torvlobnor
 telephoneNumber: 545-4563
 
-# refldap://localhost/dc=example,dc=com??sub
+dn: cn=Akakiy Zinberstein,dc=example,dc=com
+objectClass: inetOrgPerson
+cn: Akakiy Zinberstein
+sn: Zinberstein
+givenName: Akakiy
 
 # Testing "auxiliary" objectClass in filter...
 dn: dc=example,dc=com
@@ -317,14 +415,14 @@ o: Example
 dc: example
 
 # Testing hasSubordinates in filter...
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: dc=example,dc=com
 objectClass: organization
 objectClass: dcObject
 o: Example
 dc: example
 
-# refldap://localhost/dc=example,dc=com??sub
-
 # Testing entryUUID in filter...
 dn: cn=Mitya Kovalev,dc=example,dc=com
 objectClass: inetOrgPerson
@@ -337,6 +435,8 @@ telephoneNumber: 222-3234
 telephoneNumber: 332-2334
 
 # Testing attribute inheritance in requested attributes...
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: cn=Mitya Kovalev,dc=example,dc=com
 cn: Mitya Kovalev
 sn: Kovalev
@@ -349,6 +449,8 @@ objectClass: document
 dn: documentTitle=book2,dc=example,dc=com
 objectClass: document
 
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: dc=example,dc=com
 objectClass: organization
 objectClass: dcObject
@@ -359,7 +461,8 @@ objectClass: inetOrgPerson
 dn: cn=Torvlobnor Puzdoy,dc=example,dc=com
 objectClass: inetOrgPerson
 
-# refldap://localhost/dc=example,dc=com??sub
+dn: cn=Akakiy Zinberstein,dc=example,dc=com
+objectClass: inetOrgPerson
 
 # Testing operational attributes in request...
 dn: documentTitle=book1,dc=example,dc=com
@@ -376,6 +479,8 @@ subschemaSubentry: cn=Subschema
 hasSubordinates: FALSE
 entryUUID: 00000002-0000-0002-0000-000000000000
 
+# refldap://localhost:9012/dc=example,dc=com??sub
+
 dn: dc=example,dc=com
 structuralObjectClass: organization
 entryDN: dc=example,dc=com
@@ -397,5 +502,10 @@ subschemaSubentry: cn=Subschema
 hasSubordinates: FALSE
 entryUUID: 00000001-0000-0002-0000-000000000000
 
-# refldap://localhost/dc=example,dc=com??sub
+dn: cn=Akakiy Zinberstein,dc=example,dc=com
+structuralObjectClass: inetOrgPerson
+entryDN: cn=Akakiy Zinberstein,dc=example,dc=com
+subschemaSubentry: cn=Subschema
+hasSubordinates: FALSE
+entryUUID: 00000001-0000-0003-0000-000000000000