X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fproto-slap.h;h=cb7b7bf3df475b3f682f2fa22bbebd72ca434e22;hb=af866c3b44ba37577671f2bffd482499f4b8bc00;hp=b0343fa8f5011475a4f2ccc92830f429ee875194;hpb=cd9a9c628dd08435dff10b25eb9c6de5f7f4a604;p=openldap diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index b0343fa8f5..cb7b7bf3df 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,6 +46,12 @@ LDAP_SLAPD_F (int) acl_check_modlist LDAP_P(( LDAP_SLAPD_F (void) acl_append( AccessControl **l, AccessControl *a ); +#ifdef SLAP_DYNACL +LDAP_SLAPD_F (int) slap_dynacl_register LDAP_P(( slap_dynacl_t *da )); +LDAP_SLAPD_F (slap_dynacl_t *) slap_dynacl_get LDAP_P(( const char *name )); +#endif /* SLAP_DYNACL */ +LDAP_SLAPD_F (int) acl_init LDAP_P(( void )); + /* * aclparse.c */ @@ -57,11 +63,13 @@ LDAP_SLAPD_F (char *) access2str LDAP_P(( slap_access_t access )); LDAP_SLAPD_F (slap_access_t) str2access LDAP_P(( const char *str )); #define ACCESSMASK_MAXLEN sizeof("unknown (+wrscan)") -LDAP_SLAPD_F (char *) accessmask2str LDAP_P(( slap_mask_t mask, char* )); +LDAP_SLAPD_F (char *) accessmask2str LDAP_P(( slap_mask_t mask, char*, int debug )); LDAP_SLAPD_F (slap_mask_t) str2accessmask LDAP_P(( const char *str )); +LDAP_SLAPD_F (void) acl_unparse LDAP_P(( AccessControl*, struct berval* )); LDAP_SLAPD_F (void) acl_destroy LDAP_P(( AccessControl*, AccessControl* )); LDAP_SLAPD_F (void) acl_free LDAP_P(( AccessControl *a )); + /* * ad.c */ @@ -105,6 +113,12 @@ LDAP_SLAPD_F (AttributeDescription *) ad_find_tags LDAP_P(( LDAP_SLAPD_F (AttributeName *) str2anlist LDAP_P(( AttributeName *an, char *str, const char *brkstr )); +LDAP_SLAPD_F (char **) anlist2charray_x LDAP_P(( + AttributeName *an, int dup, void *ctx )); +LDAP_SLAPD_F (char **) anlist2charray LDAP_P(( AttributeName *an, int dup )); +LDAP_SLAPD_F (char **) anlist2attrs LDAP_P(( AttributeName *anlist )); +LDAP_SLAPD_F (AttributeName *) file2anlist LDAP_P(( + AttributeName *, const char *, const char * )); 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 )); @@ -131,6 +145,7 @@ LDAP_SLAPD_F (int) slap_entry2mods LDAP_P(( Entry *e, /* * at.c */ +LDAP_SLAPD_V(int) at_oc_cache; LDAP_SLAPD_F (void) at_config LDAP_P(( const char *fname, int lineno, int argc, char **argv )); @@ -146,7 +161,8 @@ LDAP_SLAPD_F (int) at_delete_from_list LDAP_P(( int pos, AttributeType ***listp )); LDAP_SLAPD_F (int) at_schema_info LDAP_P(( Entry *e )); LDAP_SLAPD_F (int) at_add LDAP_P(( - LDAPAttributeType *at, const char **err )); + LDAPAttributeType *at, int user, + AttributeType **sat, const char **err )); LDAP_SLAPD_F (void) at_destroy LDAP_P(( void )); LDAP_SLAPD_F (int) is_at_subtype LDAP_P(( @@ -160,6 +176,9 @@ LDAP_SLAPD_F (int) is_at_syntax LDAP_P(( LDAP_SLAPD_F (int) at_start LDAP_P(( AttributeType **at )); LDAP_SLAPD_F (int) at_next LDAP_P(( AttributeType **at )); +LDAP_SLAPD_F (void) at_unparse LDAP_P(( + BerVarray *bva, AttributeType *start, AttributeType *end, int system )); + /* * attr.c */ @@ -233,7 +252,6 @@ LDAP_SLAPD_F (int) be_issuffix LDAP_P(( Backend *be, LDAP_SLAPD_F (int) be_isroot LDAP_P(( Operation *op )); LDAP_SLAPD_F (int) be_isroot_dn LDAP_P(( Backend *be, struct berval *ndn )); LDAP_SLAPD_F (int) be_isroot_pw LDAP_P(( Operation *op )); -LDAP_SLAPD_F (int) be_sync_update LDAP_P(( Operation *op )); LDAP_SLAPD_F (int) be_slurp_update LDAP_P(( Operation *op )); #define be_isupdate( op ) be_slurp_update( (op) ) LDAP_SLAPD_F (int) be_shadow_update LDAP_P(( Operation *op )); @@ -251,6 +269,9 @@ LDAP_SLAPD_F (int) backend_unbind LDAP_P((Operation *op, SlapReply *rs)); LDAP_SLAPD_F (int) backend_connection_init LDAP_P((Connection *conn)); LDAP_SLAPD_F (int) backend_connection_destroy LDAP_P((Connection *conn)); +LDAP_SLAPD_F( int ) backend_check_controls LDAP_P(( + Operation *op, + SlapReply *rs )); LDAP_SLAPD_F( int ) backend_check_restrictions LDAP_P(( Operation *op, SlapReply *rs, @@ -274,14 +295,26 @@ LDAP_SLAPD_F (int) backend_attribute LDAP_P(( Entry *target, struct berval *entry_ndn, AttributeDescription *entry_at, - BerVarray *vals + BerVarray *vals, + slap_access_t access )); +LDAP_SLAPD_F (int) backend_access LDAP_P(( + Operation *op, + Entry *target, + struct berval *edn, + AttributeDescription *entry_at, + struct berval *nval, + slap_access_t access, + slap_mask_t *mask )); + LDAP_SLAPD_F (int) backend_operational LDAP_P(( Operation *op, SlapReply *rs )); +LDAP_SLAPD_V(BackendInfo) slap_binfo[]; + /* * backglue.c */ @@ -293,9 +326,15 @@ LDAP_SLAPD_F (int) glue_sub_init( void ); * backover.c */ -LDAP_SLAPD_F (int) overlay_register( slap_overinst *on ); -LDAP_SLAPD_F (int) overlay_config( BackendDB *be, const char *ov ); -LDAP_SLAPD_F (slap_overinst *) overlay_next( slap_overinst *on ); +LDAP_SLAPD_F (int) overlay_register LDAP_P(( slap_overinst *on )); +LDAP_SLAPD_F (int) overlay_config LDAP_P(( BackendDB *be, const char *ov )); +LDAP_SLAPD_F (slap_overinst *) overlay_next LDAP_P(( slap_overinst *on )); +LDAP_SLAPD_F (slap_overinst *) overlay_find LDAP_P(( const char *name )); +LDAP_SLAPD_F (int) overlay_is_over LDAP_P(( BackendDB *be )); +LDAP_SLAPD_F (int) overlay_is_inst LDAP_P(( BackendDB *be, const char *name )); +LDAP_SLAPD_F (int) overlay_register_control LDAP_P(( + BackendDB *be, + const char *oid )); /* * ch_malloc.c @@ -312,9 +351,72 @@ LDAP_SLAPD_F (void) ch_free LDAP_P(( void * )); #define free ch_free #endif +/* + * component.c + */ +#ifdef LDAP_COMP_MATCH +LDAP_SLAPD_F (int) test_comp_filter_entry LDAP_P(( + Operation* op, + Entry* e, + MatchingRuleAssertion* mr)); + +LDAP_SLAPD_F (int) get_comp_filter LDAP_P(( + Operation* op, + BerValue* bv, + ComponentFilter** filt, + const char **text )); + +LDAP_SLAPD_F (int) componentFilterMatch LDAP_P(( + int *matchp, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *value, + void *assertedValue )); + +LDAP_SLAPD_F (int) directoryComponentsMatch LDAP_P(( + int *matchp, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *value, + void *assertedValue )); + +LDAP_SLAPD_F (int) allComponentsMatch LDAP_P(( + int *matchp, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *value, + void *assertedValue )); + +LDAP_SLAPD_F (int) componentFilterValidate LDAP_P(( + Syntax *syntax, + struct berval* bv )); + +LDAP_SLAPD_F (int) allComponentsValidate LDAP_P(( + Syntax *syntax, + struct berval* bv )); + +LDAP_SLAPD_V (test_membership_func*) is_aliased_attribute; + +LDAP_SLAPD_V (free_component_func*) component_destructor; + +LDAP_SLAPD_V (get_component_info_func*) get_component_description; + +LDAP_SLAPD_V (component_encoder_func*) component_encoder; + +LDAP_SLAPD_V (convert_attr_to_comp_func*) attr_converter; + +LDAP_SLAPD_V (alloc_nibble_func*) nibble_mem_allocator; + +LDAP_SLAPD_V (free_nibble_func*) nibble_mem_free; +#endif + /* * controls.c */ +LDAP_SLAPD_V( struct slap_control_ids ) slap_cids; LDAP_SLAPD_F (void) slap_free_ctrls LDAP_P(( Operation *op, LDAPControl **ctrls )); @@ -326,18 +428,39 @@ LDAP_SLAPD_F (int) register_supported_control LDAP_P(( const char *controloid, slap_mask_t controlmask, char **controlexops, - SLAP_CTRL_PARSE_FN *controlparsefn )); + SLAP_CTRL_PARSE_FN *controlparsefn, + int *controlcid )); 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 )); +LDAP_SLAPD_F (int) get_supported_controls LDAP_P (( + char ***ctrloidsp, slap_mask_t **ctrlmasks )); +LDAP_SLAPD_F (int) slap_find_control_id LDAP_P (( + const char *oid, int *cid )); +LDAP_SLAPD_F (int) slap_global_control LDAP_P (( + Operation *op, const char *oid, int *cid )); /* * config.c */ -LDAP_SLAPD_F (int) read_config LDAP_P(( const char *fname, int depth )); +LDAP_SLAPD_F (int) read_config LDAP_P(( const char *fname, const char *dir )); LDAP_SLAPD_F (void) config_destroy LDAP_P ((void)); -LDAP_SLAPD_F (char **) str2clist LDAP_P(( char ***, char *, const char * )); +LDAP_SLAPD_F (char **) slap_str2clist LDAP_P(( + char ***, char *, const char * )); +LDAP_SLAPD_F (int) verb_to_mask LDAP_P(( + const char *word, slap_verbmasks *v )); +LDAP_SLAPD_F (int) verbs_to_mask LDAP_P(( + int argc, char *argv[], slap_verbmasks *v, slap_mask_t *m )); +LDAP_SLAPD_F (int) mask_to_verbs LDAP_P(( + slap_verbmasks *v, slap_mask_t m, BerVarray *bva )); +LDAP_SLAPD_F (int) bindconf_parse LDAP_P(( + const char *word, slap_bindconf *bc )); +LDAP_SLAPD_F (int) bindconf_unparse LDAP_P(( + slap_bindconf *bc, struct berval *bv )); +LDAP_SLAPD_F (void) bindconf_free LDAP_P(( slap_bindconf *bc )); +LDAP_SLAPD_F (int) config_generic_wrapper LDAP_P(( Backend *be, + const char *fname, int lineno, int argc, char **argv )); + #ifdef LDAP_SLAPI LDAP_SLAPD_V (int) slapi_plugins_used; #endif @@ -387,16 +510,21 @@ LDAP_SLAPD_F (void) connection_fake_init LDAP_P(( Connection *conn, Operation *op, void *threadctx )); +LDAP_SLAPD_F (void) connection_assign_nextid LDAP_P((Connection *)); /* * cr.c */ LDAP_SLAPD_F (int) cr_schema_info( Entry *e ); +LDAP_SLAPD_F (void) cr_unparse LDAP_P(( + BerVarray *bva, ContentRule *start, ContentRule *end, int system )); LDAP_SLAPD_F (int) cr_add LDAP_P(( LDAPContentRule *oc, int user, + ContentRule **scr, const char **err)); + LDAP_SLAPD_F (void) cr_destroy LDAP_P(( void )); LDAP_SLAPD_F (ContentRule *) cr_find LDAP_P(( @@ -410,11 +538,13 @@ LDAP_SLAPD_F (ContentRule *) cr_bvfind LDAP_P(( LDAP_SLAPD_V( const struct berval ) slap_ldapsync_bv; LDAP_SLAPD_V( const struct berval ) slap_ldapsync_cn_bv; -LDAP_SLAPD_F (void) slap_get_commit_csn LDAP_P(( Operation *, struct berval * )); +LDAP_SLAPD_F (void) slap_get_commit_csn LDAP_P(( + Operation *, struct berval *maxcsn, struct berval *curcsn )); LDAP_SLAPD_F (void) slap_rewind_commit_csn LDAP_P(( Operation * )); LDAP_SLAPD_F (void) slap_graduate_commit_csn LDAP_P(( Operation * )); LDAP_SLAPD_F (Entry *) slap_create_context_csn_entry LDAP_P(( Backend *, struct berval *)); LDAP_SLAPD_F (int) slap_get_csn LDAP_P(( Operation *, char *, int, struct berval *, int )); +LDAP_SLAPD_F (void) slap_queue_csn LDAP_P(( Operation *, struct berval * )); /* * daemon.c @@ -438,6 +568,8 @@ LDAP_SLAPD_F (void) slapd_clr_read LDAP_P((ber_socket_t s, int wake)); LDAP_SLAPD_V (volatile sig_atomic_t) slapd_abrupt_shutdown; LDAP_SLAPD_V (volatile sig_atomic_t) slapd_shutdown; LDAP_SLAPD_V (int) slapd_register_slp; +LDAP_SLAPD_V (slap_ssf_t) local_ssf; +LDAP_SLAPD_V (struct runqueue_s) slapd_rq; /* * dn.c @@ -476,6 +608,14 @@ LDAP_SLAPD_F (int) dnMatch LDAP_P(( struct berval *value, void *assertedValue )); +LDAP_SLAPD_F (int) dnRelativeMatch LDAP_P(( + int *matchp, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *value, + void *assertedValue )); + LDAP_SLAPD_F (int) rdnMatch LDAP_P(( int *matchp, slap_mask_t flags, @@ -484,9 +624,12 @@ LDAP_SLAPD_F (int) rdnMatch LDAP_P(( struct berval *value, void *assertedValue )); + LDAP_SLAPD_F (int) dnIsSuffix LDAP_P(( const struct berval *dn, const struct berval *suffix )); +LDAP_SLAPD_F (int) dnIsOneLevelRDN LDAP_P(( struct berval *rdn )); + LDAP_SLAPD_F (int) dnExtractRdn LDAP_P(( struct berval *dn, struct berval *rdn, void *ctx )); @@ -501,6 +644,7 @@ LDAP_SLAPD_F (void) build_new_dn LDAP_P(( void *memctx )); LDAP_SLAPD_F (void) dnParent LDAP_P(( struct berval *dn, struct berval *pdn )); +LDAP_SLAPD_F (void) dnRdn LDAP_P(( struct berval *dn, struct berval *rdn )); LDAP_SLAPD_F (int) dnX509normalize LDAP_P(( void *x509_name, struct berval *out )); @@ -512,6 +656,8 @@ LDAP_SLAPD_F (int) dnPrettyNormalDN LDAP_P(( Syntax *syntax, struct berval *val, #define dnNormalDN(syntax, val, dn, ctx) \ dnPrettyNormalDN((syntax),(val),(dn), 0, ctx) +typedef int (SLAP_CERT_MAP_FN) LDAP_P(( void *ssl, struct berval *dn )); +LDAP_SLAPD_F (int) register_certificate_map_function LDAP_P(( SLAP_CERT_MAP_FN *fn )); /* * entry.c @@ -521,13 +667,21 @@ LDAP_SLAPD_V (const Entry) slap_entry_root; LDAP_SLAPD_F (int) entry_destroy LDAP_P((void)); LDAP_SLAPD_F (Entry *) str2entry LDAP_P(( char *s )); +LDAP_SLAPD_F (Entry *) str2entry2 LDAP_P(( char *s, int checkvals )); LDAP_SLAPD_F (char *) entry2str LDAP_P(( Entry *e, int *len )); LDAP_SLAPD_F (void) entry_flatsize LDAP_P(( Entry *e, ber_len_t *siz, ber_len_t *len, int norm )); -LDAP_SLAPD_F (int) entry_decode LDAP_P(( struct berval *bv, Entry **e )); +#ifdef SLAP_ZONE_ALLOC +LDAP_SLAPD_F (int) entry_decode LDAP_P(( + struct berval *bv, Entry **e, void *ctx )); +#else +LDAP_SLAPD_F (int) entry_decode LDAP_P(( + struct berval *bv, Entry **e )); +#endif LDAP_SLAPD_F (int) entry_encode LDAP_P(( Entry *e, struct berval *bv )); +LDAP_SLAPD_F (void) entry_clean LDAP_P(( Entry *e )); LDAP_SLAPD_F (void) entry_free LDAP_P(( Entry *e )); LDAP_SLAPD_F (int) entry_cmp LDAP_P(( Entry *a, Entry *b )); LDAP_SLAPD_F (int) entry_dn_cmp LDAP_P(( const void *v_a, const void *v_b )); @@ -539,6 +693,8 @@ LDAP_SLAPD_F (Entry *) entry_dup LDAP_P(( Entry *e )); */ LDAP_SLAPD_F (int) exop_root_dse_info LDAP_P ((Entry *e)); +#define exop_is_write( op ) ((op->ore_flags & SLAP_EXOP_WRITES) != 0) + LDAP_SLAPD_V( const struct berval ) slap_EXOP_CANCEL; LDAP_SLAPD_V( const struct berval ) slap_EXOP_WHOAMI; LDAP_SLAPD_V( const struct berval ) slap_EXOP_MODIFY_PASSWD; @@ -596,6 +752,11 @@ LDAP_SLAPD_F (int) filter_escape_value LDAP_P(( struct berval *in, LDAP_SLAPD_F (int) test_filter LDAP_P(( Operation *op, Entry *e, Filter *f )); +/* + * frontend.c + */ +LDAP_SLAPD_F (int) frontend_init LDAP_P(( void )); + /* * globals.c */ @@ -611,6 +772,8 @@ LDAP_SLAPD_V( void * ) slap_tls_ctx; * index.c */ LDAP_SLAPD_F (int) slap_str2index LDAP_P(( const char *str, slap_mask_t *idx )); +LDAP_SLAPD_F (void) slap_index2bvlen LDAP_P(( slap_mask_t idx, struct berval *bv )); +LDAP_SLAPD_F (void) slap_index2bv LDAP_P(( slap_mask_t idx, struct berval *bv )); /* * init.c @@ -620,7 +783,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 @@ -633,20 +796,8 @@ LDAP_SLAPD_V (int) krbv4_ldap_auth(); /* * ldapsync.c */ -LDAP_SLAPD_F (int) slap_build_sync_state_ctrl LDAP_P(( - Operation *, SlapReply *, Entry *, int, LDAPControl **, - int, int, struct berval * )); -LDAP_SLAPD_F (int) slap_build_sync_done_ctrl LDAP_P(( - Operation *, SlapReply *, LDAPControl **, - int, int, struct berval *, int )); -LDAP_SLAPD_F (int) slap_build_sync_state_ctrl_from_slog LDAP_P(( - Operation *, SlapReply *, struct slog_entry *, int, - LDAPControl **, int, int, struct berval * )); -LDAP_SLAPD_F (int) slap_send_syncinfo LDAP_P(( - Operation *, SlapReply *, int, - struct berval *, int, BerVarray, int )); LDAP_SLAPD_F (void) slap_compose_sync_cookie LDAP_P(( - Operation *, struct berval *, struct berval *, int, int )); + Operation *, struct berval *, struct berval *, int )); LDAP_SLAPD_F (void) slap_sync_cookie_free LDAP_P(( struct sync_cookie *, int free_cookie )); LDAP_SLAPD_F (int) slap_parse_sync_cookie LDAP_P(( @@ -671,6 +822,10 @@ LDAP_SLAPD_F (int) limits_parse_one LDAP_P(( const char *arg, struct slap_limits_set *limit )); LDAP_SLAPD_F (int) limits_check LDAP_P(( Operation *op, SlapReply *rs )); +LDAP_SLAPD_F (void) limits_unparse_one LDAP_P(( + struct slap_limits_set *limit, int which, struct berval *bv )); +LDAP_SLAPD_F (void) limits_unparse LDAP_P(( + struct slap_limits *limit, struct berval *bv )); /* * lock.c @@ -701,9 +856,13 @@ LDAP_SLAPD_F (int) slap_modrdn2mods( /* * modify.c */ +LDAP_SLAPD_F( int ) slap_mods_no_update_check( + Modifications *ml, + const char **text, + char *textbuf, size_t textlen ); + LDAP_SLAPD_F( int ) slap_mods_check( Modifications *ml, - int update, const char **text, char *textbuf, size_t textlen, void *ctx ); @@ -712,7 +871,8 @@ LDAP_SLAPD_F( int ) slap_mods_opattrs( Modifications *mods, Modifications **modlist, const char **text, - char *textbuf, size_t textlen ); + char *textbuf, size_t textlen, + int manage_ctxcsn ); /* * mods.c @@ -799,6 +959,7 @@ LDAP_SLAPD_F (void) mra_free LDAP_P(( LDAP_SLAPD_F (int) oc_add LDAP_P(( LDAPObjectClass *oc, int user, + ObjectClass **soc, const char **err)); LDAP_SLAPD_F (void) oc_destroy LDAP_P(( void )); @@ -806,6 +967,8 @@ LDAP_SLAPD_F (ObjectClass *) oc_find LDAP_P(( const char *ocname)); LDAP_SLAPD_F (ObjectClass *) oc_bvfind LDAP_P(( struct berval *ocname)); +LDAP_SLAPD_F (ObjectClass *) oc_bvfind_undef LDAP_P(( + struct berval *ocname)); LDAP_SLAPD_F (int) is_object_subclass LDAP_P(( ObjectClass *sup, ObjectClass *sub )); @@ -846,14 +1009,19 @@ LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P(( : is_entry_objectclass((e), slap_schema.si_oc_syncConsumerSubentry, 1)) LDAP_SLAPD_F (int) oc_schema_info( Entry *e ); +LDAP_SLAPD_F (void) oc_unparse LDAP_P(( + BerVarray *bva, ObjectClass *start, ObjectClass *end, int system )); /* * oidm.c */ LDAP_SLAPD_F(char *) oidm_find(char *oid); LDAP_SLAPD_F (void) oidm_destroy LDAP_P(( void )); +LDAP_SLAPD_F (void) oidm_unparse LDAP_P(( + BerVarray *bva, OidMacro *start, OidMacro *end, int system )); LDAP_SLAPD_F (int) parse_oidm LDAP_P(( - const char *fname, int lineno, int argc, char **argv )); + const char *fname, int lineno, int argc, char **argv, int user, + OidMacro **om )); /* * operation.c @@ -873,6 +1041,7 @@ LDAP_SLAPD_F (Operation *) slap_op_pop LDAP_P(( Operation **olist )); * operational.c */ LDAP_SLAPD_F (Attribute *) slap_operational_subschemaSubentry( Backend *be ); +LDAP_SLAPD_F (Attribute *) slap_operational_entryDN( Entry *e ); LDAP_SLAPD_F (Attribute *) slap_operational_hasSubordinate( int has ); /* @@ -886,10 +1055,11 @@ LDAP_SLAPD_F (int) overlay_init( void ); LDAP_SLAPD_F (SLAP_EXTOP_MAIN_FN) passwd_extop; LDAP_SLAPD_F (int) slap_passwd_check( - Connection *conn, - Attribute *attr, + Operation *op, + Entry *e, + Attribute *a, struct berval *cred, - const char **text ); + const char **text ); LDAP_SLAPD_F (void) slap_passwd_generate( struct berval * ); @@ -901,18 +1071,20 @@ LDAP_SLAPD_F (void) slap_passwd_hash( LDAP_SLAPD_F (void) slap_passwd_hash_type( struct berval *cred, struct berval *hash, - char *htype, + char *htype, const char **text ); 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, - const char **text ); + struct berval *reqdata, + struct berval *id, + struct berval *oldpass, + struct berval *newpass, + const char **text ); + +LDAP_SLAPD_F (void) slap_passwd_init (void); /* * phonetic.c @@ -944,7 +1116,7 @@ LDAP_SLAPD_F (int) get_alias_dn LDAP_P(( * repl.c */ LDAP_SLAPD_F (int) add_replica_info LDAP_P(( Backend *be, - const char *host )); + const char *uri, 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, @@ -974,6 +1146,7 @@ LDAP_SLAPD_F (int) slap_read_controls LDAP_P(( Operation *op, SlapReply *rs, LDAP_SLAPD_F (int) str2result LDAP_P(( char *s, int *code, char **matched, char **info )); LDAP_SLAPD_F (int) slap_map_api2result LDAP_P(( SlapReply *rs )); +LDAP_SLAPD_F (slap_mask_t) slap_attr_flags LDAP_P(( AttributeName *an )); LDAP_SLAPD_V( const struct berval ) slap_dummy_bv; @@ -993,6 +1166,7 @@ LDAP_SLAPD_F (int) read_root_dse_file LDAP_P(( */ LDAP_SLAPD_F (int) slap_sasl_init(void); LDAP_SLAPD_F (char *) slap_sasl_secprops( const char * ); +LDAP_SLAPD_F (void) slap_sasl_secprops_unparse( struct berval * ); LDAP_SLAPD_F (int) slap_sasl_destroy(void); LDAP_SLAPD_F (int) slap_sasl_open( Connection *c, int reopen ); @@ -1011,13 +1185,6 @@ LDAP_SLAPD_F (int) slap_sasl_setpass( Operation *op, SlapReply *rs ); -LDAP_SLAPD_F (int) slap_sasl_config( - int cargc, - char **cargv, - char *line, - const char *fname, - int lineno ); - LDAP_SLAPD_F (int) slap_sasl_getdn( Connection *conn, Operation *op, struct berval *id, char *user_realm, struct berval *dn, int flags ); @@ -1041,7 +1208,9 @@ LDAP_SLAPD_F (int) slap_sasl_authorized LDAP_P(( struct berval *authzid )); LDAP_SLAPD_F (int) slap_sasl_regexp_config LDAP_P(( const char *match, const char *replace )); +LDAP_SLAPD_F (void) slap_sasl_regexp_unparse LDAP_P(( BerVarray *bva )); LDAP_SLAPD_F (int) slap_sasl_setpolicy LDAP_P(( const char * )); +LDAP_SLAPD_F (const char *) slap_sasl_getpolicy LDAP_P(( void )); #ifdef SLAP_AUTH_REWRITE LDAP_SLAPD_F (int) slap_sasl_rewrite_config LDAP_P(( const char *fname, @@ -1105,11 +1274,14 @@ LDAP_SLAPD_F (int) slap_schema_check LDAP_P((void)); LDAP_SLAPD_F( int ) slap_valid_descr( const char * ); LDAP_SLAPD_F (int) parse_cr LDAP_P(( - const char *fname, int lineno, char *line, char **argv )); + const char *fname, int lineno, char *line, char **argv, + ContentRule **scr )); LDAP_SLAPD_F (int) parse_oc LDAP_P(( - const char *fname, int lineno, char *line, char **argv )); + const char *fname, int lineno, char *line, char **argv, + ObjectClass **soc )); LDAP_SLAPD_F (int) parse_at LDAP_P(( - const char *fname, int lineno, char *line, char **argv )); + const char *fname, int lineno, char *line, char **argv, + AttributeType **sat )); LDAP_SLAPD_F (char *) scherr2str LDAP_P((int code)) LDAP_GCCATTR((const)); LDAP_SLAPD_F (int) dscompare LDAP_P(( const char *s1, const char *s2del, char delim )); @@ -1137,7 +1309,8 @@ LDAP_SLAPD_F (void) slap_sl_free LDAP_P(( LDAP_SLAPD_V (BerMemoryFunctions) slap_sl_mfuncs; LDAP_SLAPD_F (void) slap_sl_mem_init LDAP_P(( void )); -LDAP_SLAPD_F (void *) slap_sl_mem_create LDAP_P(( ber_len_t size, void *ctx )); +LDAP_SLAPD_F (void *) slap_sl_mem_create LDAP_P(( + ber_len_t size, int stack, void *ctx )); LDAP_SLAPD_F (void) slap_sl_mem_detach LDAP_P(( void *ctx, void *memctx )); LDAP_SLAPD_F (void) slap_sl_mem_destroy LDAP_P(( void *key, void *data )); LDAP_SLAPD_F (void *) slap_sl_context LDAP_P(( void *ptr )); @@ -1157,8 +1330,6 @@ LDAP_SLAPD_F (Filter *) str2filter_x LDAP_P(( Operation *op, const char *str )); * syncrepl.c */ -LDAP_SLAPD_V (struct runqueue_s) syncrepl_rq; - LDAP_SLAPD_F (void) init_syncrepl LDAP_P((syncinfo_t *)); LDAP_SLAPD_F (void*) do_syncrepl LDAP_P((void *, void *)); LDAP_SLAPD_F (int) syncrepl_message_to_entry LDAP_P(( @@ -1166,8 +1337,9 @@ LDAP_SLAPD_F (int) syncrepl_message_to_entry LDAP_P(( Modifications **, Entry **, int )); LDAP_SLAPD_F (int) syncrepl_entry LDAP_P(( syncinfo_t *, Operation*, Entry*, - Modifications*,int, struct berval*, - struct sync_cookie * )); + Modifications**,int, struct berval*, + struct sync_cookie *, + struct berval * )); LDAP_SLAPD_F (void) syncrepl_updateCookie LDAP_P(( syncinfo_t *, Operation *, struct berval *, struct sync_cookie * )); @@ -1178,8 +1350,7 @@ LDAP_SLAPD_F (Entry*) slap_create_syncrepl_entry LDAP_P(( struct berval *, struct berval * )); LDAP_SLAPD_F (struct berval *) slap_uuidstr_from_normalized LDAP_P(( struct berval *, struct berval *, void * )); -LDAP_SLAPD_F (int) syncrepl_isupdate LDAP_P(( Operation * )); -LDAP_SLAPD_F (int) syncrepl_isupdate_dn LDAP_P(( Backend *, struct berval * )); +LDAP_SLAPD_F (void) syncinfo_free LDAP_P(( syncinfo_t * )); /* syntax.c */ LDAP_SLAPD_F (Syntax *) syn_find LDAP_P(( @@ -1241,10 +1412,37 @@ LDAP_SLAPD_F (int) value_add_one LDAP_P(( /* assumes (x) > (y) returns 1 if true, 0 otherwise */ #define SLAP_PTRCMP(x, y) ((x) < (y) ? -1 : (x) > (y)) +#ifdef SLAP_ZONE_ALLOC +/* + * zn_malloc.c + */ +LDAP_SLAPD_F (void *) slap_zn_malloc LDAP_P((ber_len_t, void *)); +LDAP_SLAPD_F (void *) slap_zn_realloc LDAP_P((void *, ber_len_t, void *)); +LDAP_SLAPD_F (void *) slap_zn_calloc LDAP_P((ber_len_t, ber_len_t, void *)); +LDAP_SLAPD_F (void) slap_zn_free LDAP_P((void *, void *)); + +LDAP_SLAPD_F (void *) slap_zn_mem_create LDAP_P(( + ber_len_t, ber_len_t, ber_len_t, ber_len_t)); +LDAP_SLAPD_F (void) slap_zn_mem_destroy LDAP_P((void *)); +LDAP_SLAPD_F (int) slap_zn_validate LDAP_P((void *, void *, int)); +LDAP_SLAPD_F (int) slap_zn_invalidate LDAP_P((void *, void *)); +LDAP_SLAPD_F (int) slap_zh_rlock LDAP_P((void*)); +LDAP_SLAPD_F (int) slap_zh_runlock LDAP_P((void*)); +LDAP_SLAPD_F (int) slap_zh_wlock LDAP_P((void*)); +LDAP_SLAPD_F (int) slap_zh_wunlock LDAP_P((void*)); +LDAP_SLAPD_F (int) slap_zn_rlock LDAP_P((void*, void*)); +LDAP_SLAPD_F (int) slap_zn_runlock LDAP_P((void*, void*)); +LDAP_SLAPD_F (int) slap_zn_wlock LDAP_P((void*, void*)); +LDAP_SLAPD_F (int) slap_zn_wunlock LDAP_P((void*, void*)); +#endif + /* * Other... */ -LDAP_SLAPD_V(unsigned) num_subordinates; +LDAP_SLAPD_V (unsigned int) index_substr_if_minlen; +LDAP_SLAPD_V (unsigned int) index_substr_if_maxlen; +LDAP_SLAPD_V (unsigned int) index_substr_any_len; +LDAP_SLAPD_V (unsigned int) index_substr_any_step; LDAP_SLAPD_V (ber_len_t) sockbuf_max_incoming; LDAP_SLAPD_V (ber_len_t) sockbuf_max_incoming_auth; @@ -1255,7 +1453,6 @@ LDAP_SLAPD_V (slap_mask_t) global_allows; LDAP_SLAPD_V (slap_mask_t) global_disallows; LDAP_SLAPD_V (BerVarray) default_referral; -LDAP_SLAPD_V (char *) replogfile; LDAP_SLAPD_V (const char) Versionstr[]; LDAP_SLAPD_V (int) global_gentlehup; @@ -1269,19 +1466,7 @@ 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 (ldap_pvt_thread_mutex_t) num_sent_mutex; -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 (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 (slap_counters_t) slap_counters; LDAP_SLAPD_V (char *) slapd_pid_file; LDAP_SLAPD_V (char *) slapd_args_file; @@ -1296,9 +1481,6 @@ LDAP_SLAPD_V (int) connection_pool_max; LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) entry2str_mutex; LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) replog_mutex; -#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD ) -LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) passwd_mutex; -#endif #ifndef HAVE_GMTIME_R LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) gmtime_mutex; #endif @@ -1328,9 +1510,7 @@ LDAP_SLAPD_F (int) do_extended LDAP_P((Operation *op, SlapReply *rs)); /* * frontend operations */ -#if 0 LDAP_SLAPD_F (int) fe_op_abandon LDAP_P((Operation *op, SlapReply *rs)); -#endif LDAP_SLAPD_F (int) fe_op_add LDAP_P((Operation *op, SlapReply *rs)); LDAP_SLAPD_F (int) fe_op_bind LDAP_P((Operation *op, SlapReply *rs)); LDAP_SLAPD_F (int) fe_op_compare LDAP_P((Operation *op, SlapReply *rs));