X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fproto-slap.h;h=bb574abeec1ebcb3c03a1183976102fa9498bfa9;hb=e178624b422dff28a8ffea846376e8049c7e4e04;hp=e54a8c933ff81227b7d3e4822d7f59467a7b9ce8;hpb=d937237987260842ccdbe872092a655ff8ba9bbd;p=openldap diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index e54a8c933f..bb574abeec 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -7,6 +7,7 @@ #define PROTO_SLAP_H #include +#include "ldap_pvt.h" LDAP_BEGIN_DECL @@ -16,7 +17,8 @@ LDAP_BEGIN_DECL LDAP_SLAPD_F (int) access_allowed LDAP_P(( Backend *be, Connection *conn, Operation *op, Entry *e, AttributeDescription *desc, struct berval *val, - slap_access_t access )); + slap_access_t access, + AccessControlState *state )); LDAP_SLAPD_F (int) acl_check_modlist LDAP_P(( Backend *be, Connection *conn, Operation *op, Entry *e, Modifications *ml )); @@ -52,9 +54,6 @@ LDAP_SLAPD_F (int) slap_bv2ad LDAP_P(( AttributeDescription **ad, const char **text )); -LDAP_SLAPD_F (AttributeDescription *) ad_dup LDAP_P(( - AttributeDescription *desc )); - LDAP_SLAPD_F (void) ad_destroy LDAP_P(( AttributeDescription * )); #define ad_cmp(l,r) (((l)->ad_cname.bv_len < (r)->ad_cname.bv_len) \ @@ -116,6 +115,9 @@ LDAP_SLAPD_F (int) is_at_syntax LDAP_P(( AttributeType *at, const char *oid )); +LDAP_SLAPD_F (int) at_start LDAP_P(( AttributeType **at )); +LDAP_SLAPD_F (int) at_next LDAP_P(( AttributeType **at )); + /* * attr.c */ @@ -125,6 +127,9 @@ LDAP_SLAPD_F (Attribute *) attr_dup LDAP_P(( Attribute *a )); 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 )); LDAP_SLAPD_F (Attribute *) attrs_find LDAP_P(( Attribute *a, AttributeDescription *desc )); LDAP_SLAPD_F (Attribute *) attr_find LDAP_P(( @@ -186,7 +191,7 @@ LDAP_SLAPD_F( int ) backend_check_restrictions LDAP_P(( BackendDB *be, Connection *conn, Operation *op, - const void *opdata, + struct berval *opdata, const char **text )); LDAP_SLAPD_F( int ) backend_check_referrals LDAP_P(( @@ -256,24 +261,6 @@ LDAP_SLAPD_F (void) ch_free LDAP_P(( void * )); #endif #endif -/* - * charray.c - */ -LDAP_SLAPD_F (void) charray_add LDAP_P(( char ***a, const char *s )); -LDAP_SLAPD_F (void) charray_add_n LDAP_P(( char ***a, const char *s, int l )); -LDAP_SLAPD_F (void) charray_merge LDAP_P(( char ***a, char **s )); -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 (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 (char *) slap_strcopy LDAP_P(( - char *dst, const char *src )); -LDAP_SLAPD_F (char *) slap_strncopy LDAP_P(( - char *dst, const char *src, size_t n )); - /* * controls.c */ @@ -287,7 +274,7 @@ LDAP_SLAPD_F (char *) get_supported_ctrl LDAP_P((int index)); /* * config.c */ -LDAP_SLAPD_F (int) read_config LDAP_P(( const char *fname )); +LDAP_SLAPD_F (int) read_config LDAP_P(( const char *fname, int depth )); LDAP_SLAPD_F (void) config_destroy LDAP_P ((void)); /* @@ -300,10 +287,9 @@ LDAP_SLAPD_F (int) connections_timeout_idle LDAP_P((time_t)); LDAP_SLAPD_F (long) connection_init LDAP_P(( ber_socket_t s, - const char* url, + Listener* url, const char* dnsname, const char* peername, - const char* sockname, int use_tls, slap_ssf_t ssf, const char *id )); @@ -325,6 +311,22 @@ LDAP_SLAPD_F (void) connection_done LDAP_P((Connection *)); LDAP_SLAPD_F (void) connection2anonymous LDAP_P((Connection *)); +/* + * cr.c + */ +LDAP_SLAPD_F (int) cr_schema_info( Entry *e ); + +LDAP_SLAPD_F (int) cr_add LDAP_P(( + LDAPContentRule *oc, + int user, + const char **err)); +LDAP_SLAPD_F (void) cr_destroy LDAP_P(( void )); + +LDAP_SLAPD_F (ContentRule *) cr_find LDAP_P(( + const char *crname)); +LDAP_SLAPD_F (ContentRule *) cr_bvfind LDAP_P(( + struct berval *crname)); + /* * daemon.c */ @@ -348,6 +350,7 @@ LDAP_SLAPD_F (void) slapd_clr_read LDAP_P((ber_socket_t s, int wake)); */ #define dn_match(dn1, dn2) ( ber_bvcmp((dn1), (dn2)) == 0 ) +#define bvmatch(bv1, bv2) ( ((bv1)->bv_len == (bv2)->bv_len) && (memcmp((bv1)->bv_val, (bv2)->bv_val, (bv1)->bv_len) == 0) ) LDAP_SLAPD_V( const struct berval ) slap_empty_bv; @@ -406,6 +409,17 @@ LDAP_SLAPD_F (void) build_new_dn LDAP_P(( LDAP_SLAPD_F (void) dnParent LDAP_P(( struct berval *dn, struct berval *pdn )); +LDAP_SLAPD_F (int) dnX509normalize LDAP_P(( void *x509_name, struct berval *out )); + +LDAP_SLAPD_F (int) dnX509peerNormalize LDAP_P(( void *ssl, struct berval *dn )); + +LDAP_SLAPD_F (int) dnPrettyNormalDN LDAP_P(( Syntax *syntax, struct berval *val, LDAPDN **dn, int flags )); +#define dnPrettyDN(syntax, val, dn) \ + dnPrettyNormalDN((syntax),(val),(dn), SLAP_LDAPDN_PRETTY) +#define dnNormalDN(syntax, val, dn) \ + dnPrettyNormalDN((syntax),(val),(dn), 0) + + /* * entry.c */ @@ -440,10 +454,6 @@ typedef int (SLAP_EXTOP_MAIN_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(( - const void *module, const char *file_name)); -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 )); @@ -452,7 +462,7 @@ LDAP_SLAPD_F (int) extops_init LDAP_P(( void )); LDAP_SLAPD_F (int) extops_kill LDAP_P(( void )); -LDAP_SLAPD_F (char *) get_supported_extop LDAP_P((int index)); +LDAP_SLAPD_F (struct berval *) get_supported_extop LDAP_P((int index)); /* * filter.c @@ -461,15 +471,24 @@ LDAP_SLAPD_F (int) get_filter LDAP_P(( Connection *conn, BerElement *ber, Filter **filt, - struct berval *fstr, const char **text )); LDAP_SLAPD_F (void) filter_free LDAP_P(( Filter *f )); -LDAP_SLAPD_F (void) filter_print LDAP_P(( Filter *f )); +LDAP_SLAPD_F (void) filter2bv LDAP_P(( Filter *f, struct berval *bv )); + +LDAP_SLAPD_F (int) get_vrFilter LDAP_P(( Connection *conn, BerElement *ber, + ValuesReturnFilter **f, + const char **text )); + +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 )); /* * filterentry.c */ + LDAP_SLAPD_F (int) test_filter LDAP_P(( Backend *be, Connection *conn, Operation *op, Entry *e, Filter *f )); @@ -477,7 +496,6 @@ LDAP_SLAPD_F (int) test_filter LDAP_P(( /* * index.c */ -LDAP_SLAPD_F (int) slap_index2prefix LDAP_P(( int indextype )); LDAP_SLAPD_F (int) slap_str2index LDAP_P(( const char *str, slap_mask_t *idx )); /* @@ -488,6 +506,8 @@ 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[]; + /* * kerberos.c */ @@ -515,6 +535,29 @@ LDAP_SLAPD_F (FILE *) lock_fopen LDAP_P(( const char *fname, const char *type, FILE **lfp )); LDAP_SLAPD_F (int) lock_fclose LDAP_P(( FILE *fp, FILE *lfp )); +/* + * matchedValues.c + */ +LDAP_SLAPD_F (int) filter_matched_values( + Backend *be, + Connection *conn, + Operation *op, + Attribute *a, + char ***e_flags ); + +/* + * modrdn.c + */ +LDAP_SLAPD_F (int) slap_modrdn2mods( + Backend *be, + Connection *conn, + Operation *op, + Entry *e, + LDAPRDN *oldrdn, + LDAPRDN *newrdn, + int deleteoldrdn, + Modifications **pmod ); + /* * modify.c */ @@ -525,6 +568,7 @@ LDAP_SLAPD_F( int ) slap_mods_check( char *textbuf, size_t textlen ); LDAP_SLAPD_F( int ) slap_mods_opattrs( + Backend *be, Operation *op, Modifications *mods, Modifications **modlist, @@ -534,6 +578,10 @@ LDAP_SLAPD_F( int ) slap_mods_opattrs( /* * mods.c */ +LDAP_SLAPD_F( int ) modify_check_duplicates( + AttributeDescription *ad, MatchingRule *mr, + BerVarray vals, BerVarray mods, + const char **text, char *textbuf, size_t textlen ); LDAP_SLAPD_F( int ) modify_add_values( Entry *e, Modification *mod, const char **text, char *textbuf, size_t textlen ); @@ -575,27 +623,22 @@ LDAP_SLAPD_F (void) *module_resolve LDAP_P(( 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, - slap_mr_convert_func *convert, - slap_mr_normalize_func *normalize, - slap_mr_match_func *match, - slap_mr_indexer_func *indexer, - slap_mr_filter_func *filter, + slap_mrule_defs_rec *def, MatchingRule * associated, const char **err )); LDAP_SLAPD_F (void) mr_destroy LDAP_P(( void )); LDAP_SLAPD_F (int) register_matching_rule LDAP_P(( - const char * desc, - unsigned usage, - slap_mr_convert_func *convert, - slap_mr_normalize_func *normalize, - slap_mr_match_func *match, - slap_mr_indexer_func *indexer, - slap_mr_filter_func *filter, - const char *associated )); + slap_mrule_defs_rec *def )); + +LDAP_SLAPD_F (void) mru_destroy LDAP_P(( void )); +LDAP_SLAPD_F (int) matching_rule_use_init LDAP_P(( void )); LDAP_SLAPD_F (int) mr_schema_info( Entry *e ); +LDAP_SLAPD_F (int) mru_schema_info( Entry *e ); + +LDAP_SLAPD_F (int) mr_usable_with_at( MatchingRule *mr, + AttributeType *at ); /* * mra.c @@ -611,6 +654,7 @@ LDAP_SLAPD_F (void) mra_free LDAP_P(( /* oc.c */ LDAP_SLAPD_F (int) oc_add LDAP_P(( LDAPObjectClass *oc, + int user, const char **err)); LDAP_SLAPD_F (void) oc_destroy LDAP_P(( void )); @@ -619,8 +663,8 @@ LDAP_SLAPD_F (ObjectClass *) oc_find LDAP_P(( LDAP_SLAPD_F (ObjectClass *) oc_bvfind LDAP_P(( struct berval *ocname)); LDAP_SLAPD_F (int) is_object_subclass LDAP_P(( - ObjectClass *sub, - ObjectClass *sup )); + ObjectClass *sup, + ObjectClass *sub )); LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P(( Entry *, ObjectClass *oc, int set_flags )); @@ -665,7 +709,7 @@ LDAP_SLAPD_F (Operation *) slap_op_pop LDAP_P(( Operation **olist )); /* * operational.c */ -LDAP_SLAPD_F (Attribute *) slap_operational_subschemaSubentry( void ); +LDAP_SLAPD_F (Attribute *) slap_operational_subschemaSubentry( Backend *be ); LDAP_SLAPD_F (Attribute *) slap_operational_hasSubordinate( int has ); /* @@ -721,6 +765,8 @@ LDAP_SLAPD_F (int) add_replica_info LDAP_P(( Backend *be, const char *host )); LDAP_SLAPD_F (int) add_replica_suffix LDAP_P(( Backend *be, int nr, const char *suffix )); +LDAP_SLAPD_F (int) add_replica_attrs LDAP_P(( Backend *be, + int nr, char *attrs, int exclude )); LDAP_SLAPD_F (void) replog LDAP_P(( Backend *be, Operation *op, struct berval *dn, struct berval *ndn, void *change )); @@ -812,17 +858,41 @@ LDAP_SLAPD_F (int) slap_sasl_bind LDAP_P(( struct berval *cred, struct berval *edn, slap_ssf_t *ssf )); +LDAP_SLAPD_F (int) slap_sasl_setpass( + Connection *conn, + Operation *op, + const char *reqoid, + struct berval *reqdata, + char **rspoid, + struct berval **rspdata, + LDAPControl *** rspctrls, + const char **text ); + +LDAP_SLAPD_F (int) slap_sasl_config( + int cargc, + char **cargv, + char *line, + const char *fname, + int lineno ); + + /* * saslauthz.c */ LDAP_SLAPD_F (void) slap_sasl2dn LDAP_P(( + Connection *conn, struct berval *saslname, struct berval *dn )); LDAP_SLAPD_F (int) slap_sasl_authorized LDAP_P(( + Connection *conn, struct berval *authcid, struct berval *authzid )); LDAP_SLAPD_F (int) slap_sasl_regexp_config LDAP_P(( const char *match, const char *replace )); +LDAP_SLAPD_F (int) slap_sasl_setpolicy LDAP_P(( const char * )); +LDAP_SLAPD_F (slap_response) slap_cb_null_response; +LDAP_SLAPD_F (slap_sresult) slap_cb_null_sresult; + /* * schema.c @@ -862,6 +932,24 @@ LDAP_SLAPD_V( int ) schema_init_done; LDAP_SLAPD_F (int) slap_schema_init LDAP_P((void)); LDAP_SLAPD_F (void) schema_destroy LDAP_P(( void )); +LDAP_SLAPD_F( int ) octetStringIndexer( + slap_mask_t use, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *prefix, + BerVarray values, + BerVarray *keysp ); + +LDAP_SLAPD_F( int ) octetStringFilter( + slap_mask_t use, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *prefix, + void * assertValue, + BerVarray *keysp ); + /* * schema_prep.c */ @@ -874,8 +962,8 @@ LDAP_SLAPD_F (int) slap_schema_check LDAP_P((void)); */ LDAP_SLAPD_F( int ) slap_valid_descr( const char * ); -LDAP_SLAPD_F (int) parse_oc_old LDAP_P(( - Backend *be, const char *fname, int lineno, int argc, char **argv )); +LDAP_SLAPD_F (int) parse_cr LDAP_P(( + const char *fname, int lineno, char *line, char **argv )); LDAP_SLAPD_F (int) parse_oc LDAP_P(( const char *fname, int lineno, char *line, char **argv )); LDAP_SLAPD_F (int) parse_at LDAP_P(( @@ -904,33 +992,14 @@ LDAP_SLAPD_F (Syntax *) syn_find LDAP_P(( const char *synname )); LDAP_SLAPD_F (Syntax *) syn_find_desc LDAP_P(( const char *syndesc, int *slen )); -#ifdef SLAPD_BINARY_CONVERSION LDAP_SLAPD_F (int) syn_add LDAP_P(( LDAPSyntax *syn, - unsigned flags, - slap_syntax_validate_func *validate, - slap_syntax_transform_func *normalize, - slap_syntax_transform_func *pretty, - slap_syntax_transform_func *ber2str, - slap_syntax_transform_func *str2ber, + slap_syntax_defs_rec *def, const char **err )); -#else -LDAP_SLAPD_F (int) syn_add LDAP_P(( - LDAPSyntax *syn, - unsigned flags, - slap_syntax_validate_func *validate, - slap_syntax_transform_func *normalize, - slap_syntax_transform_func *pretty, - const char **err )); -#endif LDAP_SLAPD_F (void) syn_destroy LDAP_P(( void )); LDAP_SLAPD_F (int) register_syntax LDAP_P(( - const char *desc, - unsigned flags, - slap_syntax_validate_func *validate, - slap_syntax_transform_func *normalize, - slap_syntax_transform_func *pretty )); + slap_syntax_defs_rec *def )); LDAP_SLAPD_F (int) syn_schema_info( Entry *e ); @@ -944,12 +1013,22 @@ LDAP_SLAPD_F (void) slap_init_user LDAP_P(( char *username, char *groupname )); /* * value.c */ +LDAP_SLAPD_F (int) value_validate LDAP_P(( + MatchingRule *mr, + struct berval *in, + const char ** text )); LDAP_SLAPD_F (int) value_normalize LDAP_P(( AttributeDescription *ad, unsigned usage, struct berval *in, struct berval *out, const char ** text )); +LDAP_SLAPD_F (int) value_validate_normalize LDAP_P(( + AttributeDescription *ad, + unsigned usage, + struct berval *in, + struct berval *out, + const char ** text )); LDAP_SLAPD_F (int) value_match LDAP_P(( int *match, AttributeDescription *ad, @@ -967,6 +1046,9 @@ LDAP_SLAPD_F (int) value_find_ex LDAP_P(( LDAP_SLAPD_F (int) value_add LDAP_P(( BerVarray *vals, BerVarray addvals )); +LDAP_SLAPD_F (int) value_add_one LDAP_P(( + BerVarray *vals, + struct berval *addval )); /* * Other... @@ -988,19 +1070,19 @@ LDAP_SLAPD_V (const char) Versionstr[]; LDAP_SLAPD_V (struct slap_limits_set) deflimit; LDAP_SLAPD_V (slap_access_t) global_default_access; +LDAP_SLAPD_V (int) global_gentlehup; LDAP_SLAPD_V (int) global_idletimeout; LDAP_SLAPD_V (int) global_schemacheck; LDAP_SLAPD_V (char *) global_host; LDAP_SLAPD_V (char *) global_realm; -LDAP_SLAPD_V (int) sasl_external_x509dn_convert; LDAP_SLAPD_V (char *) default_passwd_hash; LDAP_SLAPD_V (int) lber_debug; LDAP_SLAPD_V (int) ldap_syslog; LDAP_SLAPD_V (struct berval) default_search_base; LDAP_SLAPD_V (struct berval) default_search_nbase; -LDAP_SLAPD_V (int) nSaslRegexp; -LDAP_SLAPD_V (SaslRegexp_t*) SaslRegexp; +LDAP_SLAPD_V (struct berval) global_schemadn; +LDAP_SLAPD_V (struct berval) global_schemandn; LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) num_sent_mutex; LDAP_SLAPD_V (unsigned long) num_bytes_sent; @@ -1011,6 +1093,10 @@ LDAP_SLAPD_V (unsigned long) num_refs_sent; LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) num_ops_mutex; LDAP_SLAPD_V (unsigned long) num_ops_completed; LDAP_SLAPD_V (unsigned long) num_ops_initiated; +#ifdef SLAPD_MONITOR +LDAP_SLAPD_V (unsigned long) num_ops_completed_[SLAP_OP_LAST]; +LDAP_SLAPD_V (unsigned long) num_ops_initiated_[SLAP_OP_LAST]; +#endif /* SLAPD_MONITOR */ LDAP_SLAPD_V (char *) slapd_pid_file; LDAP_SLAPD_V (char *) slapd_args_file; @@ -1034,6 +1120,12 @@ LDAP_SLAPD_V (AccessControl *) global_acl; LDAP_SLAPD_V (ber_socket_t) dtblsize; +LDAP_SLAPD_V (int) use_reverse_lookup; + +LDAP_SLAPD_V (struct berval) AllUser; +LDAP_SLAPD_V (struct berval) AllOper; +LDAP_SLAPD_V (struct berval) NoAttrs; + /* * operations */