Add dummy reference to lutil_uuidstr() for dynamically loaded back-bdb

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 059cc66f5ca78ed75f99e0588d8340530dd6949b..d018a3e8365d4c4236b64690e270457922269379 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -215,6 +215,10 @@ typedef struct slap_ssf_set {
 #define SLAP_SYNTAX_ATTRIBUTETYPES_OID "1.3.6.1.4.1.1466.115.121.1.3"
 #define SLAP_SYNTAX_OBJECTCLASSES_OID  "1.3.6.1.4.1.1466.115.121.1.37"
 
+#ifdef LDAP_CLIENT_UPDATE
+#define LCUP_COOKIE_OID "1.3.6.1.4.1.4203.666.10.1"
+#endif /* LDAP_CLIENT_UPDATE */
+
 /*
  * represents schema information for a database
  */
@@ -443,7 +447,7 @@ typedef struct slap_matching_rule {
        /*
         * null terminated list of syntaxes compatible with this syntax
         * note: when MS_EXT is set, this MUST NOT contain the assertion
-     * syntax of the rule.  When MS_EXT is not set, it MAY.
+        * syntax of the rule.  When MS_EXT is not set, it MAY.
         */
        Syntax                                  **smr_compat_syntaxes;
 
@@ -1237,7 +1241,7 @@ struct slap_backend_db {
 #define SLAP_RESTRICT_OP_SEARCH                0x0080U
 
 #define SLAP_RESTRICT_OP_READS \
-       ( SLAP_RESTRICT_OP_COMPARE    \
+       ( SLAP_RESTRICT_OP_COMPARE      \
        | SLAP_RESTRICT_OP_SEARCH )
 #define SLAP_RESTRICT_OP_WRITES        \
        ( SLAP_RESTRICT_OP_ADD    \
@@ -1279,7 +1283,7 @@ struct slap_backend_db {
        struct berval be_rootdn;        /* the magic "root" name (DN) for this db */
        struct berval be_rootndn;       /* the magic "root" normalized name (DN) for this db */
        struct berval be_rootpw;        /* the magic "root" password for this db        */
-       unsigned int be_max_deref_depth;       /* limit for depth of an alias deref  */
+       unsigned int be_max_deref_depth; /* limit for depth of an alias deref  */
 #define be_sizelimit   be_def_limit.lms_s_soft
 #define be_timelimit   be_def_limit.lms_t_soft
        struct slap_limits_set be_def_limit; /* default limits */
@@ -1352,13 +1356,13 @@ typedef int (BI_op_abandon) LDAP_P((BackendDB *bd,
                ber_int_t msgid));
 
 typedef int (BI_op_extended) LDAP_P((
-    BackendDB          *be,
-    struct slap_conn   *conn,
-    struct slap_op             *op,
+       BackendDB               *be,
+       struct slap_conn        *conn,
+       struct slap_op          *op,
        const char              *reqoid,
-    struct berval * reqdata,
+       struct berval * reqdata,
        char            **rspoid,
-    struct berval ** rspdata,
+       struct berval ** rspdata,
        LDAPControl *** rspctrls,
        const char **   text,
        BerVarray *refs ));
@@ -1587,10 +1591,14 @@ typedef struct slap_op {
 
 #ifdef LDAP_CLIENT_UPDATE
        char o_clientupdate;
-       ber_int_t o_clientupdatetype;
-       ber_int_t o_clientupdateinterval;
-       struct berval* o_clientupdatestate;
-#endif
+       char o_clientupdate_type;
+#define SLAP_LCUP_NONE                         (0x0)
+#define SLAP_LCUP_SYNC                                 (0x1)
+#define SLAP_LCUP_PERSIST                      (0x2)
+#define SLAP_LCUP_SYNC_AND_PERSIST     (0x3)
+       ber_int_t o_clientupdate_interval;
+       struct berval o_clientupdate_state;
+#endif /* LDAP_CLIENT_UPDATE */
 
 #ifdef LDAP_CONNECTIONLESS
        Sockaddr        o_peeraddr;     /* UDP peer address               */
@@ -1698,7 +1706,7 @@ typedef struct slap_conn {
                        fprintf( stderr, (fmt), (connid), (opid), (arg1), (arg2), (arg3) );\
                if ( ldap_syslog & (level) ) \
                        syslog( ldap_syslog_level, (fmt), (connid), (opid), (arg1), \
-                               (arg2), (arg3) ); \
+                               (arg2), (arg3) ); \
        } while (0)
 #else
 #define Statslog( level, fmt, connid, opid, arg1, arg2, arg3 )
@@ -1746,6 +1754,16 @@ enum {
 #define SLAP_LDAPDN_PRETTY 0x1
 #define SLAP_LDAPDN_MAXLEN 8192
 
+/*
+ * Macros for LCUP
+ */
+#ifdef LDAP_CLIENT_UPDATE
+#define SLAP_LCUP_STATE_UPDATE_TRUE    1
+#define SLAP_LCUP_STATE_UPDATE_FALSE   0
+#define SLAP_LCUP_ENTRY_DELETED_TRUE   1
+#define SLAP_LCUP_ENTRY_DELETED_FALSE  0
+#endif /* LDAP_CLIENT_UPDATE */
+
 LDAP_END_DECL
 
 #include "proto-slap.h"