Experiment with busy loop protection...

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index a012fb9cfb7693328fdb6780768fa506e405e936..a8c770a03facc9990f57a7561155c88663eae33c 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -32,7 +32,6 @@
 #include <ldap_schema.h>
 
 #include "ldap_pvt_thread.h"
-#include "ldif.h"
 
 LDAP_BEGIN_DECL
 
@@ -87,7 +86,8 @@ LDAP_BEGIN_DECL
        || (c) == '(' || (c) == ')' || !ASCII_PRINTABLE(c) )
 
 #define DN_SEPARATOR(c)        ((c) == ',' || (c) == ';')
-#define RDN_SEPARATOR(c)       ((c) == ',' || (c) == ';' || (c) == '+')
+#define RDN_ATTRTYPEANDVALUE_SEPARATOR(c) ((c) == '+') /* RFC 2253 */
+#define RDN_SEPARATOR(c) (DN_SEPARATOR(c) || RDN_ATTRTYPEANDVALUE_SEPARATOR(c))
 #define RDN_NEEDSESCAPE(c)     ((c) == '\\' || (c) == '"')
 
 #define DESC_LEADCHAR(c)       ( ASCII_ALPHA(c) )
@@ -216,6 +216,18 @@ typedef struct slap_ssf_set {
 #define SLAP_SCHERR_SYN_NOT_FOUND      13
 #define SLAP_SCHERR_MR_INCOMPLETE      14
 #define SLAP_SCHERR_NOT_SUPPORTED      15
+#define SLAP_SCHERR_BAD_DESCR  16
+
+typedef union slap_sockaddr {
+       struct sockaddr sa_addr;
+       struct sockaddr_in sa_in_addr;
+#ifdef LDAP_PF_INET6
+       struct sockaddr_in6 sa_in6_addr;
+#endif
+#ifdef LDAP_PF_LOCAL
+       struct sockaddr_un sa_un_addr;
+#endif
+} Sockaddr;
 
 typedef struct slap_oid_macro {
        struct berval som_oid;
@@ -448,6 +460,7 @@ struct slap_internal_schema {
        AttributeDescription *si_ad_supportedExtension;
        AttributeDescription *si_ad_supportedLDAPVersion;
        AttributeDescription *si_ad_supportedSASLMechanisms;
+       AttributeDescription *si_ad_supportedFeatures;
 
        /* subschema subentry attribute descriptions */
        AttributeDescription *si_ad_objectClasses;
@@ -476,6 +489,14 @@ struct slap_internal_schema {
 
        /* Undefined Attribute Type */
        AttributeType   *si_at_undefined;
+
+       /* Matching Rules */
+       MatchingRule    *si_mr_distinguishedNameMatch;
+       MatchingRule    *si_mr_integerMatch;
+
+       /* Syntaxes */
+       Syntax          *si_syn_distinguishedName;
+       Syntax          *si_syn_integer;
 };
 
 typedef struct slap_attr_assertion {
@@ -807,6 +828,32 @@ LDAP_SLAPD_F (int) slapMode;
 
 #define SLAP_TRUNCATE_MODE     0x0100
 
+struct slap_replica_info {
+       char   *ri_host;        /* supersedes be_replica */
+       char  **ri_nsuffix;     /* array of suffixes this replica accepts */
+};
+
+struct slap_limits_set {
+       /* time limits */
+       int     lms_t_soft;
+       int     lms_t_hard;
+
+       /* size limits */
+       int     lms_s_soft;
+       int     lms_s_hard;
+       int     lms_s_unchecked;
+};
+
+struct slap_limits {
+       int     lm_type;        /* type of pattern */
+#define SLAP_LIMITS_UNDEFINED  0x0000
+#define SLAP_LIMITS_EXACT      0x0001
+#define SLAP_LIMITS_REGEX      0x0002
+       regex_t lm_dn_regex;    /* regex-based size and time limits */
+       char   *lm_dn_pat;      /* ndn for EXACT; pattern for REGEX */
+       struct slap_limits_set  lm_limits;
+};
+
 /* temporary aliases */
 typedef BackendDB Backend;
 #define nbackends nBackendDB
@@ -902,11 +949,13 @@ struct slap_backend_db {
        char    *be_root_ndn;   /* the magic "root" normalized dn for this db   */
        struct berval be_root_pw;       /* the magic "root" password for this db        */
        unsigned int be_max_deref_depth;       /* limit for depth of an alias deref  */
-       int     be_sizelimit;   /* size limit for this backend             */
-       int     be_timelimit;   /* time limit for this backend             */
+#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 */
+       struct slap_limits **be_limits; /* regex-based size and time limits */
        AccessControl *be_acl;  /* access control list for this backend    */
        slap_access_t   be_dfltaccess;  /* access given if no acl matches          */
-       char    **be_replica;   /* replicas of this backend (in master)    */
+       struct slap_replica_info **be_replica;  /* replicas of this backend (in master) */
        char    *be_replogfile; /* replication log file (in master)        */
        char    *be_update_ndn; /* allowed to make changes (in replicas) */
        struct berval **be_update_refs; /* where to refer modifying clients to */
@@ -1097,6 +1146,9 @@ struct slap_backend_info {
 typedef struct slap_op {
        ber_int_t       o_opid;         /* id of this operation           */
        ber_int_t       o_msgid;        /* msgid of the request           */
+#ifdef LDAP_CONNECTIONLESS
+       Sockaddr        o_peeraddr;     /* UDP peer address               */
+#endif
 
        ldap_pvt_thread_t       o_tid;  /* thread handling this op        */
 
@@ -1164,6 +1216,9 @@ typedef struct slap_conn {
        BerElement      *c_currentber;  /* ber we're attempting to read */
        int             c_writewaiter;  /* true if writer is waiting */
 
+#ifdef LDAP_CONNECTIONLESS
+       int     c_is_udp;               /* true if this is (C)LDAP over UDP */
+#endif
 #ifdef HAVE_TLS
        int     c_is_tls;               /* true if this LDAP over raw TLS */
        int     c_needs_tls_accept;     /* true if SSL_accept should be called */