More cleanup

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index be010c2212a8524521b15afff3c89ae4700f8229..3fb72f03701b3ea83e6f44954080558bc2f756e9 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -62,7 +62,6 @@ LDAP_BEGIN_DECL
 #define LDAP_COLLECTIVE_ATTRIBUTES
 #define LDAP_COMP_MATCH
 #define LDAP_SYNC_TIMESTAMP
-#define SLAP_CONTROL_X_SORTEDRESULTS
 #define SLAP_CONTROL_X_SESSION_TRACKING
 #define SLAP_CONTROL_X_WHATFAILED
 #define SLAP_CONFIG_DELETE
@@ -2371,6 +2370,7 @@ typedef struct PagedResultsState {
 
 struct slap_csn_entry {
        struct berval ce_csn;
+       int ce_sid;
        unsigned long ce_opid;
        unsigned long ce_connid;
 #define SLAP_CSN_PENDING       1
@@ -2809,6 +2809,7 @@ struct Connection {
 
        BerElement      *c_currentber;  /* ber we're attempting to read */
        int                     c_writers;              /* number of writers waiting */
+       char            c_writing;              /* someone is writing */
 
        char            c_sasl_bind_in_progress;        /* multi-op bind in progress */
        char            c_writewaiter;  /* true if blocked on write */