--- servers/slapd/slap.h	2004/08/30 18:52:43	1.452.2.25
+++ servers/slapd/slap.h	2005/02/17 15:24:56	1.452.2.33
@@ -1,8 +1,8 @@
 /* slap.h - stand alone ldap server include file */
-/* $OpenLDAP: pkg/ldap/servers/slapd/slap.h,v 1.452.2.24 2004/08/30 17:47:12 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/slap.h,v 1.452.2.32 2005/01/20 17:01:10 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1390,12 +1390,12 @@ typedef struct syncinfo_s {
         char				*si_authcId;
         char				*si_authzId;
 		int					si_schemachecking;
-        Filter				*si_filter;
         struct berval		si_filterstr;
         struct berval		si_base;
         int					si_scope;
         int					si_attrsonly;
         char				**si_attrs;
+        char				**si_exattrs;
         int					si_type;
         time_t				si_interval;
 		time_t				*si_retryinterval;
@@ -1405,11 +1405,13 @@ typedef struct syncinfo_s {
         int					si_manageDSAit;
         int					si_slimit;
 		int					si_tlimit;
-		struct berval		si_syncUUID_ndn;
+		int					si_refreshDelete;
+		int					si_refreshPresent;
         Avlnode				*si_presentlist;
 		LDAP				*si_ld;
 		LDAP_LIST_HEAD(np, nonpresent_entry) si_nonpresentlist;
 		LDAP_STAILQ_ENTRY( syncinfo_s ) si_next;
+		ldap_pvt_thread_mutex_t	si_mutex;
 } syncinfo_t;
 
 LDAP_TAILQ_HEAD( be_pcl, slap_csn_entry );
@@ -2138,6 +2140,7 @@ typedef struct slap_op {
 
 	void	*o_threadctx;		/* thread pool thread context */
 	void	*o_tmpmemctx;		/* slab malloc context */
+	void	*o_savmemctx;
 	BerMemoryFunctions *o_tmpmfuncs;
 #define	o_tmpalloc	o_tmpmfuncs->bmf_malloc
 #define o_tmpcalloc	o_tmpmfuncs->bmf_calloc