Start of new operational attribute framework

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

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 547e5e92d55611cc3e62124f397e3215797abb6b..9f0c70eaede91c74bbb217fc55b40f5b8896e410 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 #ifndef _PROTO_SLAP
@@ -37,7 +37,7 @@ LDAP_SLAPD_F (int) is_ad_subtype LDAP_P((
 
 LDAP_SLAPD_F (int) ad_inlist LDAP_P((
        AttributeDescription *desc,
-       struct berval **attrs ));
+       AttributeName *attrs ));
 
 LDAP_SLAPD_F (int) slap_str2undef_ad LDAP_P((
        const char *,
@@ -53,6 +53,10 @@ LDAP_SLAPD_F (AttributeDescription *) ad_find_lang LDAP_P((
        AttributeType *type,
        struct berval *lang ));
 
+LDAP_SLAPD_F (AttributeName *) str2anlist LDAP_P(( AttributeName *an,
+       const char *str, const char *brkstr ));
+LDAP_SLAPD_F (int) an_find LDAP_P(( AttributeName *a, struct berval *s ));     
+
 /*
  * acl.c
  */
@@ -125,7 +129,7 @@ LDAP_SLAPD_F (Attribute *) attr_dup LDAP_P(( Attribute *a ));
 
 LDAP_SLAPD_F (int) attr_merge LDAP_P(( Entry *e,
        AttributeDescription *desc,
-       struct berval **vals ));
+       BVarray vals ));
 LDAP_SLAPD_F (Attribute *) attrs_find LDAP_P((
        Attribute *a, AttributeDescription *desc ));
 LDAP_SLAPD_F (Attribute *) attr_find LDAP_P((
@@ -217,7 +221,7 @@ LDAP_SLAPD_F (int) backend_attribute LDAP_P((BackendDB *be,
        Entry *target,
        struct berval *entry_ndn,
        AttributeDescription *entry_at,
-       struct berval ***vals
+       BVarray *vals
 ));
 
 LDAP_SLAPD_F (Attribute *) backend_operational(
@@ -225,7 +229,7 @@ LDAP_SLAPD_F (Attribute *) backend_operational(
        Connection *conn,
        Operation *op,
        Entry *e,
-       struct berval **attrs,
+       AttributeName *attrs,
        int opattrs );
 
 
@@ -271,16 +275,14 @@ LDAP_SLAPD_F (void) charray_free LDAP_P(( char **array ));
 LDAP_SLAPD_F (int) charray_inlist LDAP_P(( char **a, const char *s ));
 LDAP_SLAPD_F (char **) charray_dup LDAP_P(( char **a ));
 LDAP_SLAPD_F (char **) str2charray LDAP_P(( const char *str, const char *brkstr ));
-LDAP_SLAPD_F (struct berval **) str2bvec LDAP_P(( struct berval **vec,
-       const char *str, const char *brkstr ));
 LDAP_SLAPD_F (int) charray_strcmp LDAP_P(( const char **a1, const char **a2 ));
 LDAP_SLAPD_F (int) charray_strcasecmp LDAP_P(( const char **a1, const char **a2 ));
 
+LDAP_SLAPD_F (int) bvarray_add LDAP_P(( BVarray *a, struct berval *bv ));
+LDAP_SLAPD_F (void) bvarray_free LDAP_P(( struct berval *a ));
+
 LDAP_SLAPD_F (char *) slap_strcopy LDAP_P((
        char *dst, const char *src ));
-LDAP_SLAPD_F (int) bvec_inlist LDAP_P((
-    struct berval **a,
-    struct berval *s ));       
 
 /*
  * controls.c
@@ -290,7 +292,7 @@ LDAP_SLAPD_F (int) get_ctrls LDAP_P((
        Operation *op,
        int senderrors ));
 
-LDAP_SLAPD_F (int) get_manageDSAit LDAP_P(( Operation *op ));
+LDAP_SLAPD_F (char *) get_supported_ctrl LDAP_P((int index));
 
 /*
  * config.c
@@ -357,11 +359,27 @@ LDAP_SLAPD_F (int) dnNormalize LDAP_P((
        struct berval *val, 
        struct berval **normalized ));
 
+LDAP_SLAPD_F (int) dnNormalize2 LDAP_P((
+       Syntax *syntax, 
+       struct berval *val, 
+       struct berval *normalized ));
+
 LDAP_SLAPD_F (int) dnPretty LDAP_P(( 
        Syntax *syntax, 
        struct berval *val, 
        struct berval **pretty ));
 
+LDAP_SLAPD_F (int) dnPretty2 LDAP_P(( 
+       Syntax *syntax, 
+       struct berval *val, 
+       struct berval *pretty ));
+
+LDAP_SLAPD_F (int) dnPrettyNormal LDAP_P(( 
+       Syntax *syntax, 
+       struct berval *val, 
+       struct berval *pretty,
+       struct berval *normal ));
+
 LDAP_SLAPD_F (int) dnMatch LDAP_P(( 
        int *matchp, 
        slap_mask_t flags, 
@@ -373,24 +391,28 @@ LDAP_SLAPD_F (int) dnMatch LDAP_P((
 LDAP_SLAPD_F (int) dnIsSuffix LDAP_P((
        const struct berval *dn, const struct berval *suffix ));
 
+LDAP_SLAPD_F (int) dnExtractRdn LDAP_P((
+       struct berval *dn, struct berval *rdn ));
+
+LDAP_SLAPD_F (int) rdnValidate LDAP_P(( struct berval * rdn ));
+
 #define SLAP_DN_MIGRATION
 #ifdef SLAP_DN_MIGRATION
+       /* These routines are deprecated!!! */
 LDAP_SLAPD_F (char *) dn_validate LDAP_P(( char *dn ));
 LDAP_SLAPD_F (char *) dn_normalize LDAP_P(( char *dn ));
 LDAP_SLAPD_F (char *) dn_parent LDAP_P(( Backend *be, const char *dn ));
-LDAP_SLAPD_F (char **) dn_subtree LDAP_P(( Backend *be, const char *dn ));
-LDAP_SLAPD_F (char *) dn_rdn LDAP_P(( Backend *be, const char *dn ));
-LDAP_SLAPD_F (int) dn_rdnlen LDAP_P(( Backend *be, const char *dn ));
+LDAP_SLAPD_F (char *) dn_rdn LDAP_P(( Backend *be, struct berval *dn ));
+LDAP_SLAPD_F (int) dn_rdnlen LDAP_P(( Backend *be, struct berval *dn ));
 LDAP_SLAPD_F (int) dn_issuffix LDAP_P(( const char *dn, const char *suffix ));
-LDAP_SLAPD_F (int) rdn_validate LDAP_P(( const char* str ));
 LDAP_SLAPD_F (char *) rdn_attr_value LDAP_P(( const char * rdn ));
 LDAP_SLAPD_F (char *) rdn_attr_type LDAP_P(( const char * rdn ));
-LDAP_SLAPD_F (int) rdn_attrs LDAP_P(( const char * rdn, char ***ptypes, char ***pvals ));
+LDAP_SLAPD_F (int) rdn_attrs LDAP_P(( const char * rdn,
+       char ***ptypes, char ***pvals ));
 
-LDAP_SLAPD_F (void) build_new_dn LDAP_P(( char ** new_dn,
-       const char * entry_dn,
-       const char * parent_dn,
-       const char * newrdn ));
+LDAP_SLAPD_F (void) build_new_dn LDAP_P(( struct berval * new_dn,
+       struct berval * parent_dn,
+       struct berval * newrdn ));
 #endif
 
 /*
@@ -416,7 +438,7 @@ LDAP_SLAPD_F (int) entry_id_cmp LDAP_P(( Entry *a, Entry *b ));
  * extended.c
  */
 
-typedef int (*SLAP_EXTOP_MAIN_FN) LDAP_P((
+typedef int (SLAP_EXTOP_MAIN_FN) LDAP_P((
        Connection *conn, Operation *op,
        const char * reqoid,
        struct berval * reqdata,
@@ -424,9 +446,9 @@ typedef int (*SLAP_EXTOP_MAIN_FN) LDAP_P((
        struct berval ** rspdata,
        LDAPControl *** rspctrls,
        const char ** text,
-       struct berval *** refs ));
+       BVarray *refs ));
 
-typedef int (*SLAP_EXTOP_GETOID_FN) LDAP_P((
+typedef int (SLAP_EXTOP_GETOID_FN) LDAP_P((
        int index, char *oid, int blen ));
 
 LDAP_SLAPD_F (int) load_extension LDAP_P((
@@ -435,7 +457,7 @@ LDAP_SLAPD_F (char *) get_supported_extension LDAP_P((int index));
 
 LDAP_SLAPD_F (int) load_extop LDAP_P((
        const char *ext_oid,
-       SLAP_EXTOP_MAIN_FN ext_main ));
+       SLAP_EXTOP_MAIN_FN *ext_main ));
 
 LDAP_SLAPD_F (int) extops_init LDAP_P(( void ));
 
@@ -462,15 +484,18 @@ LDAP_SLAPD_F (void) filter_print LDAP_P(( Filter *f ));
  */
 
 LDAP_SLAPD_F (int) test_filter LDAP_P((
-       Backend *be, Connection *conn, Operation *op, Entry *e, Filter  *f ));
+       Backend *be, Connection *conn, Operation *op,
+       Entry *e, Filter *f ));
 
 /*
  * limits.c
  */
 LDAP_SLAPD_F (int) get_limits LDAP_P((
-       Backend *be, struct berval *ndn, struct slap_limits_set **limit ));
+       Backend *be, struct berval *ndn,
+       struct slap_limits_set **limit ));
 LDAP_SLAPD_F (int) parse_limits LDAP_P((
-       Backend *be, const char *fname, int lineno, int argc, char **argv ));
+       Backend *be, const char *fname, int lineno,
+       int argc, char **argv ));
 LDAP_SLAPD_F (int) parse_limit LDAP_P(( const char *arg, 
        struct slap_limits_set *limit ));
 
@@ -491,6 +516,12 @@ LDAP_SLAPD_F( void ) slap_mod_free( Modification *mod, int freeit );
 LDAP_SLAPD_F( void ) slap_mods_free( Modifications *mods );
 LDAP_SLAPD_F( void ) slap_modlist_free( LDAPModList *ml );
 
+LDAP_SLAPD_F( int ) slap_mods_check(
+       Modifications *ml,
+       int update,
+       const char **text,
+       char *textbuf, size_t textlen );
+
 LDAP_SLAPD_F( int ) slap_modlist2mods(
        LDAPModList *ml,
        int update,
@@ -529,11 +560,6 @@ LDAP_SLAPD_F (void) *module_resolve LDAP_P((
 
 #endif /* SLAPD_MODULES */
 
-/*
- * controls.c
- */
-LDAP_SLAPD_V (char *) supportedControls[];
-
 /*
  * mra.c
  */
@@ -580,14 +606,13 @@ LDAP_SLAPD_F (void) replog LDAP_P(( Backend *be, Operation *op,
 LDAP_SLAPD_F (int) validate_global_referral LDAP_P((
        const char *url ));
 
-LDAP_SLAPD_F (struct berval **) get_entry_referrals LDAP_P((
-       Backend *be, Connection *conn, Operation *op,
-       Entry *e, const char *target, int scope ));
+LDAP_SLAPD_F (BVarray) get_entry_referrals LDAP_P((
+       Backend *be, Connection *conn, Operation *op, Entry *e ));
 
-LDAP_SLAPD_F (struct berval **) referral_rewrite LDAP_P((
-       struct berval **refs,
-       const char *base,
-       const char *target,
+LDAP_SLAPD_F (BVarray) referral_rewrite LDAP_P((
+       BVarray refs,
+       struct berval *base,
+       struct berval *target,
        int scope ));
 
 /*
@@ -597,14 +622,14 @@ LDAP_SLAPD_F (struct berval **) referral_rewrite LDAP_P((
 LDAP_SLAPD_F (void) send_ldap_result LDAP_P((
        Connection *conn, Operation *op,
        ber_int_t err, const char *matched, const char *text,
-       struct berval **refs,
+       BVarray refs,
        LDAPControl **ctrls ));
 
 LDAP_SLAPD_F (void) send_ldap_sasl LDAP_P((
        Connection *conn, Operation *op,
        ber_int_t err, const char *matched,
        const char *text,
-       struct berval **refs,
+       BVarray refs,
        LDAPControl **ctrls,
        struct berval *cred ));
 
@@ -615,7 +640,7 @@ LDAP_SLAPD_F (void) send_ldap_disconnect LDAP_P((
 LDAP_SLAPD_F (void) send_ldap_extended LDAP_P((
        Connection *conn, Operation *op,
        ber_int_t err, const char *matched,
-       const char *text, struct berval **refs,
+       const char *text, BVarray refs,
        const char *rspoid, struct berval *rspdata,
        LDAPControl **ctrls ));
 
@@ -627,19 +652,19 @@ LDAP_SLAPD_F (void) send_ldap_partial LDAP_P((
 LDAP_SLAPD_F (void) send_search_result LDAP_P((
        Connection *conn, Operation *op,
        ber_int_t err, const char *matched, const char *text,
-       struct berval **refs,
+       BVarray refs,
        LDAPControl **ctrls,
        int nentries ));
 
 LDAP_SLAPD_F (int) send_search_reference LDAP_P((
        Backend *be, Connection *conn, Operation *op,
-       Entry *e, struct berval **refs,
+       Entry *e, BVarray refs,
        LDAPControl **ctrls,
-       struct berval ***v2refs ));
+       BVarray *v2refs ));
 
 LDAP_SLAPD_F (int) send_search_entry LDAP_P((
        Backend *be, Connection *conn, Operation *op,
-       Entry *e, struct berval **attrs, int attrsonly,
+       Entry *e, AttributeName *attrs, int attrsonly,
        LDAPControl **ctrls ));
 
 LDAP_SLAPD_F (int) str2result LDAP_P(( char *s,
@@ -665,7 +690,7 @@ LDAP_SLAPD_F (int) slap_sasl_close( Connection *c );
 
 LDAP_SLAPD_F (int) slap_sasl_bind LDAP_P((
        Connection *conn, Operation *op, 
-       const char *dn, const char *ndn,
+       struct berval *dn, struct berval *ndn,
        struct berval *cred,
        char **edn, slap_ssf_t *ssf ));
 
@@ -693,8 +718,9 @@ LDAP_SLAPD_F (int) syn_schema_info( Entry *e );
  */
 
 LDAP_SLAPD_F (void) oc_destroy LDAP_P(( void ));
+LDAP_SLAPD_F (void) oidm_destroy LDAP_P(( void ));
 LDAP_SLAPD_F (void) at_destroy LDAP_P(( void ));
-LDAP_SLAPD_F (void) ad_destroy LDAP_P(( void * ));
+LDAP_SLAPD_F (void) ad_destroy LDAP_P(( AttributeDescription * ));
 LDAP_SLAPD_F (void) mr_destroy LDAP_P(( void ));
 LDAP_SLAPD_F (void) syn_destroy LDAP_P(( void ));
 LDAP_SLAPD_F (void) schema_destroy LDAP_P(( void ));
@@ -737,6 +763,7 @@ LDAP_SLAPD_F (int) syn_add LDAP_P((
        const char **err ));
 #endif
 
+LDAP_SLAPD_F (MatchingRule *) mr_bvfind LDAP_P((struct berval *mrname));
 LDAP_SLAPD_F (MatchingRule *) mr_find LDAP_P((const char *mrname));
 LDAP_SLAPD_F (int) mr_add LDAP_P(( LDAPMatchingRule *mr,
        unsigned usage,
@@ -773,6 +800,8 @@ LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P((
        is_entry_objectclass((e), slap_schema.si_oc_alias)
 #define is_entry_referral(e)   \
        is_entry_objectclass((e), slap_schema.si_oc_referral)
+#define is_entry_subentry(e)   \
+       is_entry_objectclass((e), slap_schema.si_oc_subentry)
 
 
 /*
@@ -780,12 +809,13 @@ LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P((
  */
 LDAP_SLAPD_F( int ) oc_check_allowed(
        AttributeType *type,
-       struct berval **oclist,
+       BVarray oclist,
        ObjectClass *sc );
 
 LDAP_SLAPD_F( int ) structural_class(
-       struct berval **ocs,
+       BVarray ocs,
        struct berval *scbv,
+       ObjectClass **sc,
        const char **text,
        char *textbuf, size_t textlen );
 
@@ -803,8 +833,13 @@ LDAP_SLAPD_F( int ) mods_structural_class(
 /*
  * schema_init.c
  */
-LDAP_SLAPD_F (int) schema_init LDAP_P((void));
-LDAP_SLAPD_F (int) schema_prep LDAP_P((void));
+LDAP_SLAPD_F (int) slap_schema_init LDAP_P((void));
+
+/*
+ * schema_prep.c
+ */
+LDAP_SLAPD_F (int) slap_schema_load LDAP_P((void));
+LDAP_SLAPD_F (int) slap_schema_check LDAP_P((void));
 
 /*
  * schemaparse.c
@@ -826,16 +861,7 @@ LDAP_SLAPD_F (int) dscompare LDAP_P(( const char *s1, const char *s2del,
 /*
  * starttls.c
  */
-
-LDAP_SLAPD_F (int) starttls_extop LDAP_P((
-       Connection *conn, Operation *op,
-       const char * reqoid,
-       struct berval * reqdata,
-       char ** rspoid,
-       struct berval ** rspdata,
-       LDAPControl ***rspctrls,
-       const char ** text,
-       struct berval *** refs ));
+LDAP_SLAPD_F (SLAP_EXTOP_MAIN_FN) starttls_extop;
 
 
 /*
@@ -856,7 +882,7 @@ LDAP_SLAPD_F (int) value_normalize LDAP_P((
        AttributeDescription *ad,
        unsigned usage,
        struct berval *in,
-       struct berval **out,
+       struct berval *out,
        const char ** text ));
 LDAP_SLAPD_F (int) value_match LDAP_P((
        int *match,
@@ -870,11 +896,11 @@ LDAP_SLAPD_F (int) value_match LDAP_P((
 LDAP_SLAPD_F (int) value_find_ex LDAP_P((
        AttributeDescription *ad,
        unsigned flags,
-       struct berval **values,
+       BVarray values,
        struct berval *value ));
 LDAP_SLAPD_F (int) value_add LDAP_P((
-       struct berval ***vals,
-       struct berval **addvals ));
+       BVarray *vals,
+       BVarray addvals ));
 
 /*
  * user.c
@@ -886,34 +912,27 @@ LDAP_SLAPD_F (void) slap_init_user LDAP_P(( char *username, char *groupname ));
 /*
  * passwd.c
  */
-LDAP_SLAPD_F (int) passwd_extop LDAP_P((
-       Connection *conn, Operation *op,
-       const char * reqoid,
-       struct berval * reqdata,
-       char ** rspoid,
-       struct berval ** rspdata,
-       LDAPControl *** rspctrls,
-       const char ** text,
-       struct berval *** refs ));
+LDAP_SLAPD_F (SLAP_EXTOP_MAIN_FN) passwd_extop;
 
 LDAP_SLAPD_F (int) slap_passwd_check(
        Connection                      *conn,
        Attribute                       *attr,
        struct berval           *cred );
 
-LDAP_SLAPD_F (struct berval *) slap_passwd_generate( void );
+LDAP_SLAPD_F (void) slap_passwd_generate( struct berval * );
 
-LDAP_SLAPD_F (struct berval *) slap_passwd_hash(
-       struct berval           *cred );
+LDAP_SLAPD_F (void) slap_passwd_hash(
+       struct berval           *cred,
+       struct berval           *hash );
 
 LDAP_SLAPD_F (struct berval *) slap_passwd_return(
        struct berval           *cred );
 
 LDAP_SLAPD_F (int) slap_passwd_parse(
        struct berval *reqdata,
-       struct berval **id,
-       struct berval **oldpass,
-       struct berval **newpass,
+       struct berval *id,
+       struct berval *oldpass,
+       struct berval *newpass,
        const char **text );
 
 /*
@@ -936,7 +955,7 @@ LDAP_SLAPD_F (Attribute *) slap_operational_hasSubordinate( int has );
 #define SLAP_SB_MAX_INCOMING_DEFAULT ((1<<18) - 1)
 #define SLAP_SB_MAX_INCOMING_AUTH ((1<<24) - 1)
 
-LDAP_SLAPD_V(int) num_subs;
+LDAP_SLAPD_V(unsigned) num_subordinates;
 
 LDAP_SLAPD_V (ber_len_t) sockbuf_max_incoming;
 LDAP_SLAPD_V (ber_len_t) sockbuf_max_incoming_auth;
@@ -947,11 +966,11 @@ LDAP_SLAPD_V (slap_mask_t)        global_disallows;
 LDAP_SLAPD_V (slap_mask_t)     global_requires;
 LDAP_SLAPD_V (slap_ssf_set_t)  global_ssf_set;
 
-LDAP_SLAPD_V (struct berval **)        default_referral;
+LDAP_SLAPD_V (BVarray)         default_referral;
 LDAP_SLAPD_V (char *)          replogfile;
 LDAP_SLAPD_V (const char)      Versionstr[];
 LDAP_SLAPD_V (struct slap_limits_set)          deflimit;
-LDAP_SLAPD_V (int)             g_argc;
+
 LDAP_SLAPD_V (slap_access_t)   global_default_access;
 LDAP_SLAPD_V (int)             global_lastmod;
 LDAP_SLAPD_V (int)             global_idletimeout;
@@ -969,18 +988,17 @@ LDAP_SLAPD_V (int)                nSaslRegexp;
 LDAP_SLAPD_V (SaslRegexp_t*) SaslRegexp;
 
 LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) num_sent_mutex;
-LDAP_SLAPD_V (long)            num_bytes_sent;
-LDAP_SLAPD_V (long)            num_pdu_sent;
-LDAP_SLAPD_V (long)            num_entries_sent;
-LDAP_SLAPD_V (long)            num_refs_sent;
+LDAP_SLAPD_V (unsigned long)           num_bytes_sent;
+LDAP_SLAPD_V (unsigned long)           num_pdu_sent;
+LDAP_SLAPD_V (unsigned long)           num_entries_sent;
+LDAP_SLAPD_V (unsigned long)           num_refs_sent;
 
 LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) num_ops_mutex;
-LDAP_SLAPD_V (long)            num_ops_completed;
-LDAP_SLAPD_V (long)            num_ops_initiated;
+LDAP_SLAPD_V (unsigned long)           num_ops_completed;
+LDAP_SLAPD_V (unsigned long)           num_ops_initiated;
 
 LDAP_SLAPD_V (char *)          slapd_pid_file;
 LDAP_SLAPD_V (char *)          slapd_args_file;
-LDAP_SLAPD_V (char **)         g_argv;
 LDAP_SLAPD_V (time_t)          starttime;
 
 /* use time(3) -- no mutex */
@@ -1019,9 +1037,6 @@ LDAP_SLAPD_F (void) slapd_remove LDAP_P((ber_socket_t s, int wake));
 LDAP_SLAPD_F (RETSIGTYPE) slap_sig_shutdown LDAP_P((int sig));
 LDAP_SLAPD_F (RETSIGTYPE) slap_sig_wake LDAP_P((int sig));
 
-LDAP_SLAPD_F (int) config_info LDAP_P((
-       Entry **e, const char **text ));
-
 LDAP_SLAPD_F (int) root_dse_info LDAP_P((
        Connection *conn,
        Entry **e,