X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fproto-slap.h;h=2640ca5fa8793c3dbe771f81e0c0531377a159f1;hb=03dbc30deb6c0d68f37f68a22fb46442d687b654;hp=1902de4d4c229619803f6f7fd4f5069c2dc39906;hpb=e549e4463ad465481a9fac4ba1f9c86f004b61b9;p=openldap diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 1902de4d4c..2640ca5fa8 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-2005 The OpenLDAP Foundation. + * Copyright 1998-2006 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,6 +31,17 @@ LDAP_BEGIN_DECL +struct config_args_s; /* config.h */ + +/* + * aci.c + */ +#ifdef SLAP_DYNACL +#ifdef SLAPD_ACI_ENABLED +LDAP_SLAPD_F (int) dynacl_aci_init LDAP_P(( void )); +#endif /* SLAPD_ACI_ENABLED */ +#endif /* SLAP_DYNACL */ + /* * acl.c */ @@ -41,7 +52,6 @@ LDAP_SLAPD_F (int) access_allowed_mask LDAP_P(( AccessControlState *state, slap_mask_t *mask )); #define access_allowed(op,e,desc,val,access,state) access_allowed_mask(op,e,desc,val,access,state,NULL) -#ifdef SLAP_OVERLAY_ACCESS LDAP_SLAPD_F (int) slap_access_allowed LDAP_P(( Operation *op, Entry *e, @@ -58,7 +68,6 @@ LDAP_SLAPD_F (int) slap_access_always_allowed LDAP_P(( slap_access_t access, AccessControlState *state, slap_mask_t *maskp )); -#endif /* SLAP_OVERLAY_ACCESS */ LDAP_SLAPD_F (int) acl_check_modlist LDAP_P(( Operation *op, Entry *e, Modifications *ml )); @@ -71,12 +80,26 @@ 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 )); +LDAP_SLAPD_F (int) acl_get_part LDAP_P(( + struct berval *list, + int ix, + char sep, + struct berval *bv )); +LDAP_SLAPD_F (int) acl_match_set LDAP_P(( + struct berval *subj, + Operation *op, + Entry *e, + struct berval *default_set_attribute )); +LDAP_SLAPD_F (int) acl_string_expand LDAP_P(( + struct berval *newbuf, struct berval *pattern, + char *match, int nmatch, regmatch_t *matches )); + /* * aclparse.c */ LDAP_SLAPD_V (char *) style_strings[]; -LDAP_SLAPD_F (void) parse_acl LDAP_P(( Backend *be, +LDAP_SLAPD_F (int) parse_acl LDAP_P(( Backend *be, const char *fname, int lineno, int argc, char **argv, int pos )); @@ -121,12 +144,22 @@ LDAP_SLAPD_F (int) ad_inlist LDAP_P(( LDAP_SLAPD_F (int) slap_str2undef_ad LDAP_P(( const char *, AttributeDescription **ad, - const char **text )); + const char **text, + unsigned proxied )); LDAP_SLAPD_F (int) slap_bv2undef_ad LDAP_P(( struct berval *bv, AttributeDescription **ad, - const char **text )); + const char **text, + unsigned proxied )); + +LDAP_SLAPD_F (AttributeDescription *) slap_bv2tmp_ad LDAP_P(( + struct berval *bv, + void *memctx )); + +LDAP_SLAPD_F (int) slap_ad_undef_promote LDAP_P(( + char *name, + AttributeType *nat )); LDAP_SLAPD_F (AttributeDescription *) ad_find_tags LDAP_P(( AttributeType *type, @@ -143,6 +176,7 @@ LDAP_SLAPD_F (AttributeName *) file2anlist LDAP_P(( 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 (void) ad_unparse_options LDAP_P(( BerVarray *res )); LDAP_SLAPD_F (MatchingRule *) ad_mr( AttributeDescription *ad, @@ -162,6 +196,12 @@ LDAP_SLAPD_F (int) slap_mods2entry LDAP_P(( Modifications *mods, Entry **e, LDAP_SLAPD_F (int) slap_entry2mods LDAP_P(( Entry *e, Modifications **mods, const char **text, char *textbuf, size_t textlen )); +LDAP_SLAPD_F( int ) slap_add_opattrs( + Operation *op, + const char **text, + char *textbuf, size_t textlen, + int manage_ctxcsn ); + /* * at.c @@ -183,7 +223,7 @@ LDAP_SLAPD_F (int) at_delete_from_list LDAP_P(( LDAP_SLAPD_F (int) at_schema_info LDAP_P(( Entry *e )); LDAP_SLAPD_F (int) at_add LDAP_P(( LDAPAttributeType *at, int user, - AttributeType **sat, const char **err )); + AttributeType **sat, AttributeType *prev, const char **err )); LDAP_SLAPD_F (void) at_destroy LDAP_P(( void )); LDAP_SLAPD_F (int) is_at_subtype LDAP_P(( @@ -196,10 +236,16 @@ 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_delete LDAP_P(( AttributeType *at )); LDAP_SLAPD_F (void) at_unparse LDAP_P(( BerVarray *bva, AttributeType *start, AttributeType *end, int system )); +LDAP_SLAPD_F (int) register_at LDAP_P(( + char *at, + AttributeDescription **ad, + int dupok )); + /* * attr.c */ @@ -214,6 +260,8 @@ LDAP_SLAPD_F (void) comp_tree_free LDAP_P(( Attribute *a )); #define attr_mergeit_one( e, d, v ) attr_merge_one( e, d, v, NULL /* FIXME */ ) LDAP_SLAPD_F (Attribute *) attr_alloc LDAP_P(( AttributeDescription *ad )); +LDAP_SLAPD_F (Attribute *) attrs_alloc LDAP_P(( int num )); +LDAP_SLAPD_F (int) attr_prealloc LDAP_P(( int num )); LDAP_SLAPD_F (int) attr_merge LDAP_P(( Entry *e, AttributeDescription *desc, BerVarray vals, @@ -222,6 +270,10 @@ LDAP_SLAPD_F (int) attr_merge_one LDAP_P(( Entry *e, AttributeDescription *desc, struct berval *val, struct berval *nval )); +LDAP_SLAPD_F (int) attr_normalize LDAP_P(( AttributeDescription *desc, + BerVarray vals, BerVarray *nvalsp, void *memctx )); +LDAP_SLAPD_F (int) attr_normalize_one LDAP_P(( AttributeDescription *desc, + struct berval *val, struct berval *nval, void *memctx )); LDAP_SLAPD_F (int) attr_merge_normalize LDAP_P(( Entry *e, AttributeDescription *desc, BerVarray vals, void *memctx )); @@ -237,6 +289,8 @@ LDAP_SLAPD_F (int) attr_delete LDAP_P(( LDAP_SLAPD_F (void) attrs_free LDAP_P(( Attribute *a )); LDAP_SLAPD_F (Attribute *) attrs_dup LDAP_P(( Attribute *a )); +LDAP_SLAPD_F (int) attr_init LDAP_P(( void )); +LDAP_SLAPD_F (int) attr_destroy LDAP_P(( void )); /* @@ -245,7 +299,7 @@ LDAP_SLAPD_F (Attribute *) attrs_dup LDAP_P(( Attribute *a )); LDAP_SLAPD_F (int) get_ava LDAP_P(( Operation *op, BerElement *ber, - AttributeAssertion **ava, + Filter *f, unsigned usage, const char **text )); LDAP_SLAPD_F (void) ava_free LDAP_P(( @@ -256,6 +310,10 @@ LDAP_SLAPD_F (void) ava_free LDAP_P(( /* * backend.c */ + +#define be_match( be1, be2 ) ( (be1) == (be2) || \ + ( (be1) && (be2) && (be1)->be_nsuffix == (be2)->be_nsuffix ) ) + LDAP_SLAPD_F (int) backend_init LDAP_P((void)); LDAP_SLAPD_F (int) backend_add LDAP_P((BackendInfo *aBackendInfo)); LDAP_SLAPD_F (int) backend_num LDAP_P((Backend *be)); @@ -264,10 +322,14 @@ LDAP_SLAPD_F (int) backend_startup_one LDAP_P((Backend *be)); LDAP_SLAPD_F (int) backend_sync LDAP_P((Backend *be)); LDAP_SLAPD_F (int) backend_shutdown LDAP_P((Backend *be)); LDAP_SLAPD_F (int) backend_destroy LDAP_P((void)); +LDAP_SLAPD_F (void) backend_stopdown_one LDAP_P((BackendDB *bd )); LDAP_SLAPD_F (void) backend_destroy_one LDAP_P((BackendDB *bd, int dynamic)); LDAP_SLAPD_F (BackendInfo *) backend_info LDAP_P(( const char *type )); -LDAP_SLAPD_F (BackendDB *) backend_db_init LDAP_P(( const char *type )); +LDAP_SLAPD_F (BackendDB *) backend_db_init LDAP_P(( const char *type, + BackendDB *be, int idx )); +LDAP_SLAPD_F (void) backend_db_insert LDAP_P((BackendDB *bd, int idx)); +LDAP_SLAPD_F (void) backend_db_move LDAP_P((BackendDB *bd, int idx)); LDAP_SLAPD_F (BackendDB *) select_backend LDAP_P(( struct berval * dn, @@ -342,11 +404,21 @@ LDAP_SLAPD_F (int) backend_operational LDAP_P(( LDAP_SLAPD_V(BackendInfo) slap_binfo[]; +/* + * backglue.c + */ + +LDAP_SLAPD_F (int) glue_sub_init( void ); +LDAP_SLAPD_F (int) glue_sub_attach( void ); +LDAP_SLAPD_F (int) glue_sub_add( BackendDB *be, int advert, int online ); +LDAP_SLAPD_F (int) glue_sub_del( BackendDB *be ); + /* * backover.c */ 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 (int) overlay_config LDAP_P(( BackendDB *be, const char *ov, + int idx, BackendInfo **res )); LDAP_SLAPD_F (void) overlay_destroy_one LDAP_P(( BackendDB *be, slap_overinst *on )); @@ -363,11 +435,23 @@ LDAP_SLAPD_F (int) overlay_op_walk LDAP_P(( slap_operation_t which, slap_overinfo *oi, slap_overinst *on )); +LDAP_SLAPD_F (void) overlay_insert LDAP_P(( + BackendDB *be, slap_overinst *on, slap_overinst ***prev, int idx )); +LDAP_SLAPD_F (void) overlay_move LDAP_P(( + BackendDB *be, slap_overinst *on, int idx )); /* * bconfig.c */ LDAP_SLAPD_F (int) slap_loglevel_register LDAP_P (( slap_mask_t m, struct berval *s )); +LDAP_SLAPD_F (int) slap_loglevel_get LDAP_P(( struct berval *s, int *l )); +LDAP_SLAPD_F (int) str2loglevel LDAP_P(( const char *s, int *l )); +LDAP_SLAPD_F (int) loglevel2bvarray LDAP_P(( int l, BerVarray *bva )); +LDAP_SLAPD_F (const char *) loglevel2str LDAP_P(( int l )); +LDAP_SLAPD_F (int) loglevel2bv LDAP_P(( int l, struct berval *bv )); +LDAP_SLAPD_F (int) loglevel_print LDAP_P(( FILE *out )); +LDAP_SLAPD_F (int) slap_cf_aux_table_parse LDAP_P(( const char *word, void *bc, slap_cf_aux_table *tab0, LDAP_CONST char *tabmsg )); +LDAP_SLAPD_F (int) slap_cf_aux_table_unparse LDAP_P(( void *bc, struct berval *bv, slap_cf_aux_table *tab0 )); /* * ch_malloc.c @@ -503,12 +587,15 @@ LDAP_SLAPD_F (int) get_ctrls LDAP_P(( Operation *op, SlapReply *rs, int senderrors )); -LDAP_SLAPD_F (int) register_supported_control LDAP_P(( +LDAP_SLAPD_F (int) register_supported_control2 LDAP_P(( const char *controloid, slap_mask_t controlmask, char **controlexops, SLAP_CTRL_PARSE_FN *controlparsefn, + unsigned flags, int *controlcid )); +#define register_supported_control(oid, mask, exops, fn, cid) \ + register_supported_control2((oid), (mask), (exops), (fn), 0, (cid)) 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)); @@ -518,6 +605,11 @@ 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 )); +LDAP_SLAPD_F (int) slap_remove_control LDAP_P(( + Operation *op, + SlapReply *rs, + int ctrl, + BI_chk_controls fnc )); /* * config.c @@ -526,6 +618,8 @@ 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 **) slap_str2clist LDAP_P(( char ***, char *, const char * )); +LDAP_SLAPD_F (int) bverb_to_mask LDAP_P(( + struct berval *bword, slap_verbmasks *v )); LDAP_SLAPD_F (int) verb_to_mask LDAP_P(( const char *word, slap_verbmasks *v )); LDAP_SLAPD_F (int) verbs_to_mask LDAP_P(( @@ -542,10 +636,13 @@ 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 (int) bindconf_tls_set LDAP_P(( + slap_bindconf *bc, LDAP *ld )); LDAP_SLAPD_F (void) bindconf_free LDAP_P(( slap_bindconf *bc )); +LDAP_SLAPD_F (int) slap_client_connect LDAP_P(( LDAP **ldp, slap_bindconf *sb )); LDAP_SLAPD_F (int) config_generic_wrapper LDAP_P(( Backend *be, const char *fname, int lineno, int argc, char **argv )); -LDAP_SLAPD_F (char *) anlist_unparse LDAP_P(( AttributeName *, char * )); +LDAP_SLAPD_F (char *) anlist_unparse LDAP_P(( AttributeName *, char *, ber_len_t buflen )); #ifdef LDAP_SLAPI LDAP_SLAPD_V (int) slapi_plugins_used; @@ -576,13 +673,18 @@ LDAP_SLAPD_F (long) connection_init LDAP_P(( slap_ssf_t ssf, struct berval *id )); -LDAP_SLAPD_F (void) connection_closing LDAP_P(( Connection *c )); +LDAP_SLAPD_F (void) connection_closing LDAP_P(( + Connection *c, const char *why )); LDAP_SLAPD_F (int) connection_state_closing LDAP_P(( Connection *c )); LDAP_SLAPD_F (const char *) connection_state2str LDAP_P(( int state )) LDAP_GCCATTR((const)); -LDAP_SLAPD_F (int) connection_write LDAP_P((ber_socket_t s)); +#ifdef SLAP_LIGHTWEIGHT_DISPATCHER +LDAP_SLAPD_F (int) connection_read_activate LDAP_P((ber_socket_t s)); +#else LDAP_SLAPD_F (int) connection_read LDAP_P((ber_socket_t s)); +#endif +LDAP_SLAPD_F (int) connection_write LDAP_P((ber_socket_t s)); LDAP_SLAPD_F (unsigned long) connections_nextid(void); @@ -625,11 +727,11 @@ 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 *maxcsn, struct berval *curcsn )); + Operation *, struct berval *maxcsn )); 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 (int) slap_get_csn LDAP_P(( Operation *, struct berval *, int )); LDAP_SLAPD_F (void) slap_queue_csn LDAP_P(( Operation *, struct berval * )); /* @@ -640,7 +742,10 @@ LDAP_SLAPD_F (int) slapd_daemon_init( const char *urls ); LDAP_SLAPD_F (int) slapd_daemon_destroy(void); LDAP_SLAPD_F (int) slapd_daemon(void); LDAP_SLAPD_F (Listener **) slapd_get_listeners LDAP_P((void)); -LDAP_SLAPD_F (void) slapd_remove LDAP_P((ber_socket_t s, int wasactive, int wake)); +LDAP_SLAPD_F (void) slapd_remove LDAP_P((ber_socket_t s, Sockbuf *sb, + int wasactive, int wake, int locked )); +LDAP_SLAPD_F (void) slapd_sd_lock(); +LDAP_SLAPD_F (void) slapd_sd_unlock(); LDAP_SLAPD_F (RETSIGTYPE) slap_sig_shutdown LDAP_P((int sig)); LDAP_SLAPD_F (RETSIGTYPE) slap_sig_wake LDAP_P((int sig)); @@ -649,11 +754,12 @@ LDAP_SLAPD_F (void) slap_wake_listener LDAP_P((void)); LDAP_SLAPD_F (void) slapd_set_write LDAP_P((ber_socket_t s, int wake)); LDAP_SLAPD_F (void) slapd_clr_write LDAP_P((ber_socket_t s, int wake)); LDAP_SLAPD_F (void) slapd_set_read LDAP_P((ber_socket_t s, int wake)); -LDAP_SLAPD_F (void) slapd_clr_read LDAP_P((ber_socket_t s, int wake)); +LDAP_SLAPD_F (int) 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 (const char *) slapd_slp_attrs; LDAP_SLAPD_V (slap_ssf_t) local_ssf; LDAP_SLAPD_V (struct runqueue_s) slapd_rq; @@ -721,7 +827,7 @@ LDAP_SLAPD_F (int) dnExtractRdn LDAP_P(( LDAP_SLAPD_F (int) rdn_validate LDAP_P(( struct berval * rdn )); -LDAP_SLAPD_F (int) dn_rdnlen LDAP_P(( Backend *be, struct berval *dn )); +LDAP_SLAPD_F (ber_len_t) dn_rdnlen LDAP_P(( Backend *be, struct berval *dn )); LDAP_SLAPD_F (void) build_new_dn LDAP_P(( struct berval * new_dn, @@ -750,6 +856,7 @@ LDAP_SLAPD_F (int) register_certificate_map_function LDAP_P(( SLAP_CERT_MAP_FN * */ LDAP_SLAPD_V (const Entry) slap_entry_root; +LDAP_SLAPD_F (int) entry_init LDAP_P((void)); LDAP_SLAPD_F (int) entry_destroy LDAP_P((void)); LDAP_SLAPD_F (Entry *) str2entry LDAP_P(( char *s )); @@ -760,12 +867,13 @@ LDAP_SLAPD_F (ber_len_t) entry_flatsize LDAP_P(( Entry *e, int norm )); LDAP_SLAPD_F (void) entry_partsize LDAP_P(( Entry *e, ber_len_t *len, int *nattrs, int *nvals, int norm )); +LDAP_SLAPD_F (int) entry_header LDAP_P(( EntryHeader *eh )); #ifdef SLAP_ZONE_ALLOC LDAP_SLAPD_F (int) entry_decode LDAP_P(( - struct berval *bv, Entry **e, void *ctx )); + EntryHeader *eh, Entry **e, void *ctx )); #else LDAP_SLAPD_F (int) entry_decode LDAP_P(( - struct berval *bv, Entry **e )); + EntryHeader *eh, Entry **e )); #endif LDAP_SLAPD_F (int) entry_encode LDAP_P(( Entry *e, struct berval *bv )); @@ -775,6 +883,9 @@ 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 )); LDAP_SLAPD_F (int) entry_id_cmp LDAP_P(( const void *v_a, const void *v_b )); LDAP_SLAPD_F (Entry *) entry_dup LDAP_P(( Entry *e )); +LDAP_SLAPD_F (Entry *) entry_dup_bv LDAP_P(( Entry *e )); +LDAP_SLAPD_F (Entry *) entry_alloc LDAP_P((void)); +LDAP_SLAPD_F (int) entry_prealloc LDAP_P((int num)); /* * extended.c @@ -787,16 +898,23 @@ 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; LDAP_SLAPD_V( const struct berval ) slap_EXOP_START_TLS; +#ifdef LDAP_X_TXN +LDAP_SLAPD_V( const struct berval ) slap_EXOP_TXN_START; +LDAP_SLAPD_V( const struct berval ) slap_EXOP_TXN_END; +#endif typedef int (SLAP_EXTOP_MAIN_FN) LDAP_P(( Operation *op, SlapReply *rs )); typedef int (SLAP_EXTOP_GETOID_FN) LDAP_P(( int index, struct berval *oid, int blen )); -LDAP_SLAPD_F (int) load_extop LDAP_P(( - struct berval *ext_oid, +LDAP_SLAPD_F (int) load_extop2 LDAP_P(( + const struct berval *ext_oid, slap_mask_t flags, - SLAP_EXTOP_MAIN_FN *ext_main )); + SLAP_EXTOP_MAIN_FN *ext_main, + unsigned tmpflags )); +#define load_extop(ext_oid, flags, ext_main) \ + load_extop2((ext_oid), (flags), (ext_main), 0) LDAP_SLAPD_F (int) extops_init LDAP_P(( void )); @@ -804,6 +922,15 @@ LDAP_SLAPD_F (int) extops_kill LDAP_P(( void )); LDAP_SLAPD_F (struct berval *) get_supported_extop LDAP_P((int index)); +/* + * txn.c + */ +#ifdef LDAP_X_TXN +LDAP_SLAPD_F ( SLAP_CTRL_PARSE_FN ) txn_spec_ctrl; +LDAP_SLAPD_F ( SLAP_EXTOP_MAIN_FN ) txn_start_extop; +LDAP_SLAPD_F ( SLAP_EXTOP_MAIN_FN ) txn_end_extop; +#endif + /* * cancel.c */ @@ -822,6 +949,7 @@ LDAP_SLAPD_F (void) filter_free LDAP_P(( Filter *f )); LDAP_SLAPD_F (void) filter_free_x LDAP_P(( Operation *op, Filter *f )); LDAP_SLAPD_F (void) filter2bv LDAP_P(( Filter *f, struct berval *bv )); LDAP_SLAPD_F (void) filter2bv_x LDAP_P(( Operation *op, Filter *f, struct berval *bv )); +LDAP_SLAPD_F (Filter *) filter_dup LDAP_P(( Filter *f, void *memctx )); LDAP_SLAPD_F (int) get_vrFilter LDAP_P(( Operation *op, BerElement *ber, ValuesReturnFilter **f, @@ -831,8 +959,8 @@ LDAP_SLAPD_F (void) vrFilter_free LDAP_P(( Operation *op, ValuesReturnFilter *f LDAP_SLAPD_F (void) vrFilter2bv LDAP_P(( Operation *op, 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 )); +#define filter_escape_value( in, out ) ldap_bv2escaped_filter_value_x( (in), (out), 0, NULL ) +#define filter_escape_value_x( in, out, ctx ) ldap_bv2escaped_filter_value_x( (in), (out), 0, ctx ) /* * filterentry.c @@ -855,6 +983,7 @@ LDAP_SLAPD_V( const struct berval ) slap_true_bv; LDAP_SLAPD_V( const struct berval ) slap_false_bv; LDAP_SLAPD_V( struct slap_sync_cookie_s ) slap_sync_cookie; LDAP_SLAPD_V( void * ) slap_tls_ctx; +LDAP_SLAPD_V( LDAP * ) slap_tls_ld; /* * index.c @@ -889,7 +1018,7 @@ LDAP_SLAPD_F (void) slap_compose_sync_cookie LDAP_P(( 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(( - struct sync_cookie * )); + struct sync_cookie *, void *memctx )); LDAP_SLAPD_F (int) slap_init_sync_cookie_ctxcsn LDAP_P(( struct sync_cookie * )); LDAP_SLAPD_F (struct sync_cookie *) slap_dup_sync_cookie LDAP_P(( @@ -910,10 +1039,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 )); +LDAP_SLAPD_F (int) limits_unparse_one LDAP_P(( + struct slap_limits_set *limit, int which, struct berval *bv, ber_len_t buflen )); +LDAP_SLAPD_F (int) limits_unparse LDAP_P(( + struct slap_limits *limit, struct berval *bv, ber_len_t buflen )); LDAP_SLAPD_F (void) limits_destroy LDAP_P(( struct slap_limits **lm )); /* @@ -923,6 +1052,18 @@ 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 )); +/* + * main.c + */ +LDAP_SLAPD_F (int) +parse_debug_level LDAP_P(( const char *arg, int *levelp, char ***unknowns )); +LDAP_SLAPD_F (int) +parse_syslog_level LDAP_P(( const char *arg, int *levelp )); +LDAP_SLAPD_F (int) +parse_syslog_user LDAP_P(( const char *arg, int *syslogUser )); +LDAP_SLAPD_F (int) +parse_debug_unknowns LDAP_P(( char **unknowns, int *levelp )); + /* * matchedValues.c */ @@ -934,13 +1075,9 @@ LDAP_SLAPD_F (int) filter_matched_values( /* * modrdn.c */ -LDAP_SLAPD_F (int) slap_modrdn2mods( +LDAP_SLAPD_F (int) slap_modrdn2mods LDAP_P(( Operation *op, - SlapReply *rs, - Entry *e, - LDAPRDN oldrdn, - LDAPRDN newrdn, - Modifications **pmod ); + SlapReply *rs )); /* * modify.c @@ -965,6 +1102,7 @@ LDAP_SLAPD_F ( int ) slap_mods_no_repl_user_mod_check( size_t textlen ); LDAP_SLAPD_F( int ) slap_mods_check( + Operation *op, Modifications *ml, const char **text, char *textbuf, size_t textlen, void *ctx ); @@ -973,12 +1111,9 @@ LDAP_SLAPD_F( void ) slap_timestamp( time_t *tm, struct berval *bv ); -LDAP_SLAPD_F( int ) slap_mods_opattrs( +LDAP_SLAPD_F( void ) slap_mods_opattrs( Operation *op, - Modifications *mods, - Modifications **modlist, - const char **text, - char *textbuf, size_t textlen, + Modifications **modsp, int manage_ctxcsn ); /* @@ -1059,7 +1194,7 @@ LDAP_SLAPD_F (int) mr_usable_with_at( MatchingRule *mr, LDAP_SLAPD_F (int) get_mra LDAP_P(( Operation *op, BerElement *ber, - MatchingRuleAssertion **mra, + Filter *f, const char **text )); LDAP_SLAPD_F (void) mra_free LDAP_P(( Operation *op, @@ -1071,6 +1206,7 @@ LDAP_SLAPD_F (int) oc_add LDAP_P(( LDAPObjectClass *oc, int user, ObjectClass **soc, + ObjectClass *prev, const char **err)); LDAP_SLAPD_F (void) oc_destroy LDAP_P(( void )); @@ -1085,44 +1221,56 @@ LDAP_SLAPD_F (int) is_object_subclass LDAP_P(( ObjectClass *sub )); LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P(( - Entry *, ObjectClass *oc, int set_flags )); + Entry *, ObjectClass *oc, unsigned flags )); +#define is_entry_objectclass_or_sub(e,oc) \ + (is_entry_objectclass((e),(oc),SLAP_OCF_CHECK_SUP)) #define is_entry_alias(e) \ (((e)->e_ocflags & SLAP_OC__END) \ ? (((e)->e_ocflags & SLAP_OC_ALIAS) != 0) \ - : is_entry_objectclass((e), slap_schema.si_oc_alias, 1)) + : is_entry_objectclass((e), slap_schema.si_oc_alias, SLAP_OCF_SET_FLAGS)) #define is_entry_referral(e) \ (((e)->e_ocflags & SLAP_OC__END) \ ? (((e)->e_ocflags & SLAP_OC_REFERRAL) != 0) \ - : is_entry_objectclass((e), slap_schema.si_oc_referral, 1)) + : is_entry_objectclass((e), slap_schema.si_oc_referral, SLAP_OCF_SET_FLAGS)) #define is_entry_subentry(e) \ (((e)->e_ocflags & SLAP_OC__END) \ ? (((e)->e_ocflags & SLAP_OC_SUBENTRY) != 0) \ - : is_entry_objectclass((e), slap_schema.si_oc_subentry, 1)) + : is_entry_objectclass((e), slap_schema.si_oc_subentry, SLAP_OCF_SET_FLAGS)) #define is_entry_collectiveAttributeSubentry(e) \ (((e)->e_ocflags & SLAP_OC__END) \ ? (((e)->e_ocflags & SLAP_OC_COLLECTIVEATTRIBUTESUBENTRY) != 0) \ - : is_entry_objectclass((e), slap_schema.si_oc_collectiveAttributeSubentry, 1)) + : is_entry_objectclass((e), slap_schema.si_oc_collectiveAttributeSubentry, SLAP_OCF_SET_FLAGS)) #define is_entry_dynamicObject(e) \ (((e)->e_ocflags & SLAP_OC__END) \ ? (((e)->e_ocflags & SLAP_OC_DYNAMICOBJECT) != 0) \ - : is_entry_objectclass((e), slap_schema.si_oc_dynamicObject, 1)) + : is_entry_objectclass((e), slap_schema.si_oc_dynamicObject, SLAP_OCF_SET_FLAGS)) #define is_entry_glue(e) \ (((e)->e_ocflags & SLAP_OC__END) \ ? (((e)->e_ocflags & SLAP_OC_GLUE) != 0) \ - : is_entry_objectclass((e), slap_schema.si_oc_glue, 1)) + : is_entry_objectclass((e), slap_schema.si_oc_glue, SLAP_OCF_SET_FLAGS)) #define is_entry_syncProviderSubentry(e) \ (((e)->e_ocflags & SLAP_OC__END) \ ? (((e)->e_ocflags & SLAP_OC_SYNCPROVIDERSUBENTRY) != 0) \ - : is_entry_objectclass((e), slap_schema.si_oc_syncProviderSubentry, 1)) + : is_entry_objectclass((e), slap_schema.si_oc_syncProviderSubentry, SLAP_OCF_SET_FLAGS)) #define is_entry_syncConsumerSubentry(e) \ (((e)->e_ocflags & SLAP_OC__END) \ ? (((e)->e_ocflags & SLAP_OC_SYNCCONSUMERSUBENTRY) != 0) \ - : is_entry_objectclass((e), slap_schema.si_oc_syncConsumerSubentry, 1)) + : is_entry_objectclass((e), slap_schema.si_oc_syncConsumerSubentry, SLAP_OCF_SET_FLAGS)) LDAP_SLAPD_F (int) oc_schema_info( Entry *e ); + +LDAP_SLAPD_F (int) oc_start LDAP_P(( ObjectClass **oc )); +LDAP_SLAPD_F (int) oc_next LDAP_P(( ObjectClass **oc )); +LDAP_SLAPD_F (void) oc_delete LDAP_P(( ObjectClass *oc )); + LDAP_SLAPD_F (void) oc_unparse LDAP_P(( BerVarray *bva, ObjectClass *start, ObjectClass *end, int system )); +LDAP_SLAPD_F (int) register_oc LDAP_P(( + char *desc, + ObjectClass **oc, + int dupok )); + /* * oidm.c */ @@ -1131,15 +1279,16 @@ 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, int user, - OidMacro **om )); + struct config_args_s *ca, int user, OidMacro **om )); /* * operation.c */ LDAP_SLAPD_F (void) slap_op_init LDAP_P(( void )); LDAP_SLAPD_F (void) slap_op_destroy LDAP_P(( void )); +LDAP_SLAPD_F (void) slap_op_groups_free LDAP_P(( Operation *op )); LDAP_SLAPD_F (void) slap_op_free LDAP_P(( Operation *op )); +LDAP_SLAPD_F (void) slap_op_time LDAP_P(( time_t *t, int *n )); LDAP_SLAPD_F (Operation *) slap_op_alloc LDAP_P(( BerElement *ber, ber_int_t msgid, ber_tag_t tag, ber_int_t id )); @@ -1147,6 +1296,7 @@ LDAP_SLAPD_F (Operation *) slap_op_alloc LDAP_P(( LDAP_SLAPD_F (int) slap_op_add LDAP_P(( Operation **olist, Operation *op )); LDAP_SLAPD_F (int) slap_op_remove LDAP_P(( Operation **olist, Operation *op )); LDAP_SLAPD_F (Operation *) slap_op_pop LDAP_P(( Operation **olist )); +LDAP_SLAPD_F (slap_op_t) slap_req2op LDAP_P(( ber_tag_t tag )); /* * operational.c @@ -1259,26 +1409,36 @@ 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_F (ber_tag_t) slap_req2res LDAP_P(( ber_tag_t tag )); LDAP_SLAPD_V( const struct berval ) slap_dummy_bv; /* * root_dse.c */ +LDAP_SLAPD_F (int) root_dse_init LDAP_P(( void )); +LDAP_SLAPD_F (int) root_dse_destroy LDAP_P(( void )); + LDAP_SLAPD_F (int) root_dse_info LDAP_P(( Connection *conn, Entry **e, const char **text )); -LDAP_SLAPD_F (int) read_root_dse_file LDAP_P(( +LDAP_SLAPD_F (int) root_dse_read_file LDAP_P(( const char *file)); LDAP_SLAPD_F (int) slap_discover_feature LDAP_P(( - const char *uri, - int version, + slap_bindconf *sb, const char *attr, const char *val )); +LDAP_SLAPD_F (int) supported_feature_load LDAP_P(( struct berval *f )); +LDAP_SLAPD_F (int) supported_feature_destroy LDAP_P(( void )); + +LDAP_SLAPD_F (int) entry_info_register LDAP_P(( SLAP_ENTRY_INFO_FN func, void *arg )); +LDAP_SLAPD_F (int) entry_info_unregister LDAP_P(( SLAP_ENTRY_INFO_FN func, void *arg )); +LDAP_SLAPD_F (void) entry_info_destroy LDAP_P(( void )); + /* * sasl.c */ @@ -1335,7 +1495,31 @@ LDAP_SLAPD_F (int) slap_sasl_rewrite_config LDAP_P(( int lineno, int argc, char **argv )); +LDAP_SLAPD_F (void) slap_sasl_regexp_destroy LDAP_P(( void )); #endif /* SLAP_AUTH_REWRITE */ +LDAP_SLAPD_F (int) authzValidate LDAP_P(( + Syntax *syn, struct berval *in )); +#if 0 +LDAP_SLAPD_F (int) authzMatch LDAP_P(( + int *matchp, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *value, + void *assertedValue )); +#endif +LDAP_SLAPD_F (int) authzPretty LDAP_P(( + Syntax *syntax, + struct berval *val, + struct berval *out, + void *ctx )); +LDAP_SLAPD_F (int) authzNormalize LDAP_P(( + slap_mask_t usage, + Syntax *syntax, + MatchingRule *mr, + struct berval *val, + struct berval *normalized, + void *ctx )); /* * schema.c @@ -1347,21 +1531,22 @@ LDAP_SLAPD_F (int) schema_info LDAP_P(( Entry **entry, const char **text )); */ LDAP_SLAPD_F( int ) oc_check_allowed( AttributeType *type, - BerVarray oclist, + ObjectClass **socs, ObjectClass *sc ); LDAP_SLAPD_F( int ) structural_class( BerVarray ocs, - struct berval *scbv, ObjectClass **sc, + ObjectClass ***socs, const char **text, - char *textbuf, size_t textlen ); + char *textbuf, size_t textlen, void *ctx ); LDAP_SLAPD_F( int ) entry_schema_check( Operation *op, Entry *e, Attribute *attrs, int manage, + int add_soc, const char** text, char *textbuf, size_t textlen ); @@ -1369,7 +1554,7 @@ LDAP_SLAPD_F( int ) mods_structural_class( Modifications *mods, struct berval *oc, const char** text, - char *textbuf, size_t textlen ); + char *textbuf, size_t textlen, void *ctx ); /* * schema_init.c @@ -1381,6 +1566,16 @@ LDAP_SLAPD_F (void) schema_destroy LDAP_P(( void )); LDAP_SLAPD_F( slap_mr_indexer_func ) octetStringIndexer; LDAP_SLAPD_F( slap_mr_filter_func ) octetStringFilter; +LDAP_SLAPD_F( int ) numericoidValidate LDAP_P(( + struct slap_syntax *syntax, + struct berval *in )); +LDAP_SLAPD_F( int ) octetStringMatch LDAP_P(( + int *matchp, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *value, + void *assertedValue )); /* * schema_prep.c @@ -1395,14 +1590,11 @@ 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, - ContentRule **scr )); + struct config_args_s *ca, ContentRule **scr )); LDAP_SLAPD_F (int) parse_oc LDAP_P(( - const char *fname, int lineno, char *line, char **argv, - ObjectClass **soc )); + struct config_args_s *ca, ObjectClass **soc, ObjectClass *prev )); LDAP_SLAPD_F (int) parse_at LDAP_P(( - const char *fname, int lineno, char *line, char **argv, - AttributeType **sat )); + struct config_args_s *ca, AttributeType **sat, AttributeType *prev )); 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 )); @@ -1451,7 +1643,7 @@ LDAP_SLAPD_F (Filter *) str2filter_x LDAP_P(( Operation *op, const char *str )); * syncrepl.c */ -LDAP_SLAPD_F (void) syncrepl_add_glue LDAP_P(( +LDAP_SLAPD_F (int) syncrepl_add_glue LDAP_P(( Operation*, Entry* )); LDAP_SLAPD_F (void) syncinfo_free LDAP_P(( struct syncinfo_s * )); @@ -1512,6 +1704,25 @@ LDAP_SLAPD_F (int) ordered_value_add LDAP_P(( BerVarray vals, BerVarray nvals )); +LDAP_SLAPD_F (int) ordered_value_validate LDAP_P(( + AttributeDescription *ad, + struct berval *in, + int mop )); + +LDAP_SLAPD_F (int) ordered_value_pretty LDAP_P(( + AttributeDescription *ad, + struct berval *val, + struct berval *out, + void *ctx )); + +LDAP_SLAPD_F (int) ordered_value_normalize LDAP_P(( + slap_mask_t usage, + AttributeDescription *ad, + MatchingRule *mr, + struct berval *val, + struct berval *normalized, + void *ctx )); + LDAP_SLAPD_F (int) ordered_value_match LDAP_P(( int *match, AttributeDescription *ad, @@ -1603,6 +1814,7 @@ LDAP_SLAPD_V (time_t) starttime; LDAP_SLAPD_V (ldap_pvt_thread_pool_t) connection_pool; LDAP_SLAPD_V (int) connection_pool_max; +LDAP_SLAPD_V (int) slap_tool_thread_max; LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) entry2str_mutex; LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) replog_mutex; @@ -1611,6 +1823,9 @@ LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) replog_mutex; LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) gmtime_mutex; #endif +LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) ad_undef_mutex; +LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) oc_undef_mutex; + LDAP_SLAPD_V (ber_socket_t) dtblsize; LDAP_SLAPD_V (int) use_reverse_lookup; @@ -1639,6 +1854,7 @@ LDAP_SLAPD_F (int) do_extended LDAP_P((Operation *op, SlapReply *rs)); LDAP_SLAPD_F (int) fe_op_abandon LDAP_P((Operation *op, SlapReply *rs)); 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_bind_success LDAP_P(( Operation *op, SlapReply *rs )); LDAP_SLAPD_F (int) fe_op_compare LDAP_P((Operation *op, SlapReply *rs)); LDAP_SLAPD_F (int) fe_op_delete LDAP_P((Operation *op, SlapReply *rs)); LDAP_SLAPD_F (int) fe_op_modify LDAP_P((Operation *op, SlapReply *rs)); @@ -1674,8 +1890,8 @@ LDAP_SLAPD_F (int) fe_access_allowed LDAP_P(( /* NOTE: this macro assumes that bv has been allocated * by ber_* malloc functions or is { 0L, NULL } */ -#if defined(HAVE_BIGNUM) -#define UI2BVX(bv,ui,ctx) \ +#ifdef USE_MP_BIGNUM +# define UI2BVX(bv,ui,ctx) \ do { \ char *val; \ ber_len_t len; \ @@ -1693,12 +1909,13 @@ LDAP_SLAPD_F (int) fe_access_allowed LDAP_P(( BER_BVZERO( (bv) ); \ } \ } while ( 0 ) -#elif defined(HAVE_GMP) + +#elif defined( USE_MP_GMP ) /* NOTE: according to the documentation, the result * of mpz_sizeinbase() can exceed the length of the * string representation of the number by 1 */ -#define UI2BVX(bv,ui,ctx) \ +# define UI2BVX(bv,ui,ctx) \ do { \ ber_len_t len = mpz_sizeinbase( (ui), 10 ); \ if ( len > (bv)->bv_len ) { \ @@ -1710,13 +1927,19 @@ LDAP_SLAPD_F (int) fe_access_allowed LDAP_P(( } \ (bv)->bv_len = len; \ } while ( 0 ) -#else /* ! HAVE_BIGNUM && ! HAVE_GMP */ -#ifdef HAVE_LONG_LONG -#define UI2BV_FORMAT "%llu" -#else /* ! HAVE_LONG_LONG */ -#define UI2BV_FORMAT "%lu" -#endif /* ! HAVE_LONG_LONG */ -#define UI2BVX(bv,ui,ctx) \ + +#else +# if USE_MP_LONG_LONG +# define UI2BV_FORMAT "%llu" +# elif USE_MP_LONG +# define UI2BV_FORMAT "%lu" +# elif HAVE_LONG_LONG +# define UI2BV_FORMAT "%llu" +# else +# define UI2BV_FORMAT "%lu" +# endif + +# define UI2BVX(bv,ui,ctx) \ do { \ char buf[] = "+9223372036854775807L"; \ ber_len_t len; \ @@ -1727,7 +1950,7 @@ LDAP_SLAPD_F (int) fe_access_allowed LDAP_P(( (bv)->bv_len = len; \ AC_MEMCPY( (bv)->bv_val, buf, len + 1 ); \ } while ( 0 ) -#endif /* ! HAVE_GMP */ +#endif #define UI2BV(bv,ui) UI2BVX(bv,ui,NULL)