--- servers/slapd/overlays/syncprov.c	2005/08/25 05:01:19	1.56.2.12
+++ servers/slapd/overlays/syncprov.c	2005/08/25 17:05:42	1.56.2.13
@@ -1,4 +1,4 @@
-/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.100 2005/08/23 02:12:57 hyc Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.101 2005/08/25 06:57:08 ando Exp $ */
 /* syncprov.c - syncrepl provider */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
@@ -142,7 +142,7 @@ typedef struct fbase_cookie {
 	int fscope;	/* if TRUE then fdn is within the psearch scope */
 } fbase_cookie;
 
-static AttributeName csn_anlist[2];
+static AttributeName csn_anlist[3];
 static AttributeName uuid_anlist[2];
 
 /* Build a LDAPsync intermediate state control */
@@ -178,6 +178,8 @@ syncprov_state_ctrl(
 		}
 	}
 
+	/* FIXME: what if entryuuid is NULL or empty ? */
+
 	if ( send_cookie && cookie ) {
 		ber_printf( ber, "{eOON}",
 			entry_sync_state, &entryuuid_bv, cookie );
@@ -2261,6 +2263,8 @@ syncprov_db_init(
 
 	csn_anlist[0].an_desc = slap_schema.si_ad_entryCSN;
 	csn_anlist[0].an_name = slap_schema.si_ad_entryCSN->ad_cname;
+	csn_anlist[1].an_desc = slap_schema.si_ad_entryUUID;
+	csn_anlist[1].an_name = slap_schema.si_ad_entryUUID->ad_cname;
 
 	uuid_anlist[0].an_desc = slap_schema.si_ad_entryUUID;
 	uuid_anlist[0].an_name = slap_schema.si_ad_entryUUID->ad_cname;