X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslap.h;h=06decced857bd7a70f6174bbb57542bb35393f80;hb=3d9377f76404965d483c210a95e4e55386ff98a3;hp=68f86064198d26a776c4312ac5a0cc1d23f50b09;hpb=ac1332cdb868b6a30f545796aca8e0bbf13fe939;p=openldap

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 68f8606419..06decced85 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -69,14 +69,13 @@ LDAP_BEGIN_DECL
  */
 #define SLAP_MOD_SOFTADD	0x1000
 
-#define ON	(1)
-#define OFF	(-1)
-#define UNDEFINED (0)
-
 #define MAXREMATCHES (10)
 
 #define SLAP_MAX_WORKER_THREADS		(32)
 
+#define SLAP_SB_MAX_INCOMING_DEFAULT ((1<<18) - 1)
+#define SLAP_SB_MAX_INCOMING_AUTH ((1<<24) - 1)
+
 #define SLAP_TEXT_BUFLEN (256)
 
 /* psuedo error code indicating abandoned operation */
@@ -196,7 +195,6 @@ typedef struct slap_ssf_set {
 #define SLAP_INDEX_FLAGS         0xF000UL
 #define SLAP_INDEX_NOSUBTYPES    0x1000UL /* don't use index w/ subtypes */
 #define SLAP_INDEX_NOLANG        0x2000UL /* don't use index w/ lang */
-#define SLAP_INDEX_AUTO_SUBTYPES 0x4000UL /* use mask with lang subtypes */
 
 /*
  * there is a single index for each attribute.  these prefixes ensure
@@ -344,7 +342,7 @@ typedef int slap_mr_filter_func LDAP_P((
 
 typedef struct slap_matching_rule {
 	LDAPMatchingRule		smr_mrule;
-	ber_len_t			smr_oidlen;
+	ber_len_t				smr_oidlen;
 	slap_mask_t				smr_usage;
 
 #define SLAP_MR_HIDE			0x8000U
@@ -434,11 +432,11 @@ typedef struct slap_attribute_type {
 
 	struct slap_attribute_type	*sat_next;
 
-#define sat_oid			sat_atype.at_oid
-#define sat_names		sat_atype.at_names
-#define sat_desc		sat_atype.at_desc
+#define sat_oid				sat_atype.at_oid
+#define sat_names			sat_atype.at_names
+#define sat_desc			sat_atype.at_desc
 #define sat_obsolete		sat_atype.at_obsolete
-#define sat_sup_oid		sat_atype.at_sup_oid
+#define sat_sup_oid			sat_atype.at_sup_oid
 #define sat_equality_oid	sat_atype.at_equality_oid
 #define sat_ordering_oid	sat_atype.at_ordering_oid
 #define sat_substr_oid		sat_atype.at_substr_oid
@@ -446,7 +444,7 @@ typedef struct slap_attribute_type {
 #define sat_single_value	sat_atype.at_single_value
 #define sat_collective		sat_atype.at_collective
 #define sat_no_user_mod		sat_atype.at_no_user_mod
-#define sat_usage		sat_atype.at_usage
+#define sat_usage			sat_atype.at_usage
 #define sat_extensions		sat_atype.at_extensions
 
 	struct slap_attr_desc		*sat_ad;
@@ -1358,9 +1356,6 @@ struct slap_backend_info {
 #define o_tls_ssf		o_authz.sai_tls_ssf
 #define o_sasl_ssf		o_authz.sai_sasl_ssf
 
-struct slap_op;
-struct slap_conn;
-
 typedef void (slap_response)( struct slap_conn *, struct slap_op *,
 	ber_tag_t, ber_int_t, ber_int_t, const char *, const char *,
 	BerVarray, const char *, struct berval *,
@@ -1525,11 +1520,6 @@ typedef struct sasl_regexp {
   int offset[SASLREGEX_REPLACE+2];        /* offsets of $1,$2... in *replace */
 } SaslRegexp_t;
 
-/* Flags for telling slap_sasl_getdn() what type of identity is being passed */
-#define FLAG_GETDN_FINAL   1
-#define FLAG_GETDN_AUTHCID 2
-#define FLAG_GETDN_AUTHZID 4
-
 /*
  * listener; need to access it from monitor backend
  */