ITS#6045: Use copy of db when testing filter in matchops.

[openldap] / servers / slapd / proto-slap.h

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 00eecbb539a63b4812cfebff556e321b21df566c..24ee5a1207974a174fef8a67d8a3d9949af9e9d8 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -195,6 +195,11 @@ LDAP_SLAPD_V( struct berval * ) slap_bv_no_attrs;
 LDAP_SLAPD_V( struct berval * ) slap_bv_all_user_attrs;
 LDAP_SLAPD_V( struct berval * ) slap_bv_all_operational_attrs;
 
+/* deprecated; only defined for backward compatibility */
+#define NoAttrs                (*slap_bv_no_attrs)
+#define AllUser                (*slap_bv_all_user_attrs)
+#define AllOper                (*slap_bv_all_operational_attrs)
+
 /*
  * add.c
  */
@@ -806,13 +811,10 @@ LDAP_SLAPD_F (ContentRule *) cr_bvfind LDAP_P((
  */
 
 LDAP_SLAPD_V( int ) slap_serverID;
-LDAP_SLAPD_V( const struct berval ) slap_ldapsync_bv;
-LDAP_SLAPD_V( const struct berval ) slap_ldapsync_cn_bv;
 LDAP_SLAPD_F (void) slap_get_commit_csn LDAP_P((
        Operation *, struct berval *maxcsn, int *foundit ));
 LDAP_SLAPD_F (void) slap_rewind_commit_csn LDAP_P(( Operation * ));
 LDAP_SLAPD_F (void) slap_graduate_commit_csn LDAP_P(( Operation * ));
-LDAP_SLAPD_F (Entry *) slap_create_context_csn_entry LDAP_P(( Backend *, struct berval *));
 LDAP_SLAPD_F (int) slap_get_csn LDAP_P(( Operation *, struct berval *, int ));
 LDAP_SLAPD_F (void) slap_queue_csn LDAP_P(( Operation *, struct berval * ));
 
@@ -837,6 +839,8 @@ LDAP_SLAPD_F (void) slapd_set_write LDAP_P((ber_socket_t s, int wake));
 LDAP_SLAPD_F (void) slapd_clr_write LDAP_P((ber_socket_t s, int wake));
 LDAP_SLAPD_F (void) slapd_set_read LDAP_P((ber_socket_t s, int wake));
 LDAP_SLAPD_F (int) slapd_clr_read LDAP_P((ber_socket_t s, int wake));
+LDAP_SLAPD_F (void) slapd_clr_writetime LDAP_P((time_t old));
+LDAP_SLAPD_F (time_t) slapd_get_writetime LDAP_P((void));
 
 LDAP_SLAPD_V (volatile sig_atomic_t) slapd_abrupt_shutdown;
 LDAP_SLAPD_V (volatile sig_atomic_t) slapd_shutdown;
@@ -1925,6 +1929,7 @@ LDAP_SLAPD_V (const char)         Versionstr[];
 
 LDAP_SLAPD_V (int)             global_gentlehup;
 LDAP_SLAPD_V (int)             global_idletimeout;
+LDAP_SLAPD_V (int)             global_writetimeout;
 LDAP_SLAPD_V (char *)  global_host;
 LDAP_SLAPD_V (char *)  global_realm;
 LDAP_SLAPD_V (char *)  sasl_host;
@@ -1958,10 +1963,6 @@ LDAP_SLAPD_V (ber_socket_t)      dtblsize;
 
 LDAP_SLAPD_V (int)             use_reverse_lookup;
 
-LDAP_SLAPD_V (struct berval)   AllUser;
-LDAP_SLAPD_V (struct berval)   AllOper;
-LDAP_SLAPD_V (struct berval)   NoAttrs;
-
 /*
  * operations
  */