Commit of the Proxy Cache contribution (ITS#2062)

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

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 4b26475dfc5f3655f659b80c992a35a0c13dee93..9396fa5e678a83494194cdbca3b6a274c6c6eaac 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -88,6 +88,10 @@ LDAP_SLAPD_F (int) an_find LDAP_P(( AttributeName *a, struct berval *s ));
 LDAP_SLAPD_F (int) ad_define_option LDAP_P(( const char *name,
        const char *fname, int lineno ));
 
+LDAP_SLAPD_F (MatchingRule *) ad_mr(
+       AttributeDescription *ad,
+       unsigned usage );
+
 /*
  * add.c
  */
@@ -132,12 +136,28 @@ LDAP_SLAPD_F (int) at_next LDAP_P(( AttributeType **at ));
 LDAP_SLAPD_F (void) attr_free LDAP_P(( Attribute *a ));
 LDAP_SLAPD_F (Attribute *) attr_dup LDAP_P(( Attribute *a ));
 
+#ifdef SLAP_NVALUES
+#define attr_mergeit( e, d, v ) attr_merge( e, d, v, NULL /* FIXME */ )
+#define attr_mergeit_one( e, d, v ) attr_merge_one( e, d, v, NULL /* FIXME */ )
+
+LDAP_SLAPD_F (int) attr_merge LDAP_P(( Entry *e,
+       AttributeDescription *desc,
+       BerVarray vals,
+       BerVarray nvals ));
+LDAP_SLAPD_F (int) attr_merge_one LDAP_P(( Entry *e,
+       AttributeDescription *desc,
+       struct berval *val,
+       struct berval *nval ));
+#else
+#define attr_mergeit( e, d, v ) attr_merge( e, d, v )
+#define attr_mergeit_one( e, d, v ) attr_merge_one( e, d, v )
 LDAP_SLAPD_F (int) attr_merge LDAP_P(( Entry *e,
        AttributeDescription *desc,
        BerVarray vals ));
 LDAP_SLAPD_F (int) attr_merge_one LDAP_P(( Entry *e,
        AttributeDescription *desc,
        struct berval *val ));
+#endif
 LDAP_SLAPD_F (Attribute *) attrs_find LDAP_P((
        Attribute *a, AttributeDescription *desc ));
 LDAP_SLAPD_F (Attribute *) attr_find LDAP_P((
@@ -276,10 +296,15 @@ LDAP_SLAPD_F (int) get_ctrls LDAP_P((
        Connection *co,
        Operation *op,
        int senderrors ));
-
-LDAP_SLAPD_F (char *) get_supported_ctrl LDAP_P((int index));
-
-LDAP_SLAPD_F (slap_mask_t) get_supported_ctrl_mask LDAP_P((int index));
+LDAP_SLAPD_F (int) register_supported_control LDAP_P((
+       const char *controloid,
+       slap_mask_t controlmask,
+       char **controlexops,
+       SLAP_CTRL_PARSE_FN *controlparsefn ));
+LDAP_SLAPD_F (int) slap_controls_init LDAP_P ((void));
+LDAP_SLAPD_F (void) controls_destroy LDAP_P ((void));
+LDAP_SLAPD_F (int) controls_root_dse_info LDAP_P ((Entry *e));
+LDAP_SLAPD_F (int) get_supported_controls LDAP_P (( char ***ctrloidsp, slap_mask_t **ctrlmasks ));
 
 /*
  * config.c
@@ -368,15 +393,21 @@ LDAP_SLAPD_F (int) dnValidate LDAP_P((
        Syntax *syntax, 
        struct berval *val ));
 
+#ifdef SLAP_NVALUES
 LDAP_SLAPD_F (int) dnNormalize LDAP_P((
+       slap_mask_t use,
        Syntax *syntax, 
+       MatchingRule *mr,
        struct berval *val, 
-       struct berval **normalized ));
-
-LDAP_SLAPD_F (int) dnNormalize2 LDAP_P((
+       struct berval *normalized ));
+#define dnNormalize2(s,v,n)            dnNormalize(0,(s),NULL,(v),(n))
+#else
+LDAP_SLAPD_F (int) dnNormalize LDAP_P((
        Syntax *syntax, 
        struct berval *val, 
        struct berval *normalized ));
+#define dnNormalize2(s,v,n)            dnNormalize((s),(v),(n))
+#endif
 
 LDAP_SLAPD_F (int) dnPretty LDAP_P(( 
        Syntax *syntax, 
@@ -451,9 +482,16 @@ LDAP_SLAPD_F (int) entry_id_cmp LDAP_P(( const void *v_a, const void *v_b ));
 /*
  * extended.c
  */
+#ifdef LDAP_EXOP_X_CANCEL
+const struct berval slap_EXOP_CANCEL;
+#endif
+const struct berval slap_EXOP_WHOAMI;
+const struct berval slap_EXOP_MODIFY_PASSWD;
+const struct berval slap_EXOP_START_TLS;
+
 typedef int (SLAP_EXTOP_MAIN_FN) LDAP_P((
        Connection *conn, Operation *op,
-       const char * reqoid,
+       struct berval * reqoid,
        struct berval * reqdata,
        char ** rspoid,
        struct berval ** rspdata,
@@ -462,10 +500,10 @@ typedef int (SLAP_EXTOP_MAIN_FN) LDAP_P((
        BerVarray *refs ));
 
 typedef int (SLAP_EXTOP_GETOID_FN) LDAP_P((
-       int index, char *oid, int blen ));
+       int index, struct berval *oid, int blen ));
 
 LDAP_SLAPD_F (int) load_extop LDAP_P((
-       const char *ext_oid,
+       struct berval *ext_oid,
        SLAP_EXTOP_MAIN_FN *ext_main ));
 
 LDAP_SLAPD_F (int) extops_init LDAP_P(( void ));
@@ -499,6 +537,8 @@ LDAP_SLAPD_F (void) vrFilter_free LDAP_P(( ValuesReturnFilter *f ));
 LDAP_SLAPD_F (void) vrFilter2bv LDAP_P(( ValuesReturnFilter *f, struct berval *fstr ));
 
 LDAP_SLAPD_F (int) filter_has_subordinates LDAP_P(( Filter *filter ));
+LDAP_SLAPD_F (int) filter_escape_value LDAP_P(( struct berval *in, 
+       struct berval *out ));
 
 /*
  * filterentry.c
@@ -521,7 +561,7 @@ LDAP_SLAPD_F (int)  slap_startup LDAP_P(( Backend *be ));
 LDAP_SLAPD_F (int)     slap_shutdown LDAP_P(( Backend *be ));
 LDAP_SLAPD_F (int)     slap_destroy LDAP_P((void));
 
-LDAP_SLAPD_V (char *)  slap_known_controls[];
+LDAP_SLAPD_V (char **) slap_known_controls;
 
 /*
  * kerberos.c
@@ -891,7 +931,7 @@ LDAP_SLAPD_F (int) slap_sasl_bind LDAP_P((
 LDAP_SLAPD_F (int) slap_sasl_setpass(
        Connection      *conn,
        Operation       *op,
-       const char      *reqoid,
+       struct berval   *reqoid,
        struct berval   *reqdata,
        char            **rspoid,
        struct berval   **rspdata,
@@ -1016,11 +1056,6 @@ LDAP_SLAPD_F (SLAP_EXTOP_MAIN_FN) starttls_extop;
  */
 LDAP_SLAPD_F (Filter *) str2filter LDAP_P(( const char *str ));
 
-/*
- * suffixalias.c
- */
-LDAP_SLAPD_F (void) suffix_alias LDAP_P(( Backend *be, struct berval *ndn ));
-
 /* syntax.c */
 LDAP_SLAPD_F (Syntax *) syn_find LDAP_P((
        const char *synname ));
@@ -1047,6 +1082,15 @@ LDAP_SLAPD_F (void) slap_init_user LDAP_P(( char *username, char *groupname ));
 /*
  * value.c
  */
+#ifdef SLAP_NVALUES
+LDAP_SLAPD_F (int) asserted_value_validate_normalize LDAP_P((
+       AttributeDescription *ad,
+       MatchingRule *mr,
+       unsigned usage,
+       struct berval *in,
+       struct berval *out,
+       const char ** text ));
+#else
 LDAP_SLAPD_F (int) value_validate LDAP_P((
        MatchingRule *mr,
        struct berval *in,
@@ -1063,6 +1107,9 @@ LDAP_SLAPD_F (int) value_validate_normalize LDAP_P((
        struct berval *in,
        struct berval *out,
        const char ** text ));
+#define value_find(ad,values,value) (value_find_ex((ad),0,(values),(value)))
+#endif
+
 LDAP_SLAPD_F (int) value_match LDAP_P((
        int *match,
        AttributeDescription *ad,
@@ -1071,12 +1118,12 @@ LDAP_SLAPD_F (int) value_match LDAP_P((
        struct berval *v1,
        void *v2,
        const char ** text ));
-#define value_find(ad,values,value) (value_find_ex((ad),0,(values),(value)))
 LDAP_SLAPD_F (int) value_find_ex LDAP_P((
        AttributeDescription *ad,
        unsigned flags,
        BerVarray values,
        struct berval *value ));
+
 LDAP_SLAPD_F (int) value_add LDAP_P((
        BerVarray *vals,
        BerVarray addvals ));