X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fproto-slap.h;h=f5cc8eb1649b5cb96bf64394153d645c1ddb7b4c;hb=c6df30118faef4b7b0461d161a2cc10b494b9eed;hp=6727669d9996d57f1d8b6a6fe29ec7b89f7eef61;hpb=f86543c7709c74e2311ab4b302a595155a9f90b3;p=openldap diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 6727669d99..f5cc8eb164 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-2007 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,27 +31,16 @@ LDAP_BEGIN_DECL +struct config_args_s; /* config.h */ + /* * aci.c */ -#ifdef SLAPD_ACI_ENABLED -LDAP_SLAPD_F (int) aci_mask LDAP_P(( - Operation *op, Entry *e, - AttributeDescription *desc, - struct berval *val, - struct berval *aci, - int nmatch, - regmatch_t *matches, - slap_access_t *grant, - slap_access_t *deny, - slap_aci_scope_t scope)); #ifdef SLAP_DYNACL +#ifdef SLAPD_ACI_ENABLED LDAP_SLAPD_F (int) dynacl_aci_init LDAP_P(( void )); -#else /* !SLAP_DYNACL */ -LDAP_SLAPD_F (int) aci_init LDAP_P(( void )); -LDAP_SLAPD_V (AttributeDescription *) slap_ad_aci; -#endif /* !SLAP_DYNACL */ #endif /* SLAPD_ACI_ENABLED */ +#endif /* SLAP_DYNACL */ /* * acl.c @@ -63,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, @@ -80,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 )); @@ -166,6 +153,10 @@ LDAP_SLAPD_F (int) slap_bv2undef_ad LDAP_P(( 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 )); @@ -185,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, @@ -231,23 +223,31 @@ 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(( AttributeType *sub, AttributeType *super )); +LDAP_SLAPD_F (const char *) at_syntax LDAP_P(( + AttributeType *at )); 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 )); +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 */ @@ -262,6 +262,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, @@ -270,6 +272,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 )); @@ -285,6 +291,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 )); /* @@ -293,7 +301,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(( @@ -316,11 +324,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, - BackendDB *be )); + 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, @@ -337,7 +348,7 @@ LDAP_SLAPD_F (int) be_slurp_update LDAP_P(( Operation *op )); LDAP_SLAPD_F (int) be_shadow_update LDAP_P(( Operation *op )); LDAP_SLAPD_F (int) be_isupdate_dn LDAP_P(( Backend *be, struct berval *ndn )); LDAP_SLAPD_F (struct berval *) be_root_dn LDAP_P(( Backend *be )); -LDAP_SLAPD_F (int) be_entry_get_rw LDAP_P(( struct slap_op *o, +LDAP_SLAPD_F (int) be_entry_get_rw LDAP_P(( Operation *o, struct berval *ndn, ObjectClass *oc, AttributeDescription *at, int rw, Entry **e )); LDAP_SLAPD_F (int) be_entry_release_rw LDAP_P(( @@ -408,7 +419,8 @@ 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 )); @@ -425,15 +437,34 @@ LDAP_SLAPD_F (int) overlay_op_walk LDAP_P(( slap_operation_t which, slap_overinfo *oi, slap_overinst *on )); +LDAP_SLAPD_F (int) overlay_entry_get_ov LDAP_P(( + Operation *op, + struct berval *dn, + ObjectClass *oc, + AttributeDescription *ad, + int rw, + Entry **e, + slap_overinst *ov )); +LDAP_SLAPD_F (int) overlay_entry_release_ov LDAP_P(( + Operation *op, + Entry *e, + int rw, + slap_overinst *ov )); +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 )); @@ -571,12 +602,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)); @@ -599,6 +633,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(( @@ -611,14 +647,24 @@ LDAP_SLAPD_F (int) slap_verbmasks_init LDAP_P(( slap_verbmasks **vp, slap_verbma LDAP_SLAPD_F (int) slap_verbmasks_destroy LDAP_P(( slap_verbmasks *v )); LDAP_SLAPD_F (int) slap_verbmasks_append LDAP_P(( slap_verbmasks **vp, slap_mask_t m, struct berval *v, slap_mask_t *ignore )); +LDAP_SLAPD_F (int) slap_tls_get_config LDAP_P(( + LDAP *ld, int opt, char **val )); +LDAP_SLAPD_F (void) bindconf_tls_defaults LDAP_P(( slap_bindconf *bc )); +LDAP_SLAPD_F (int) bindconf_tls_parse LDAP_P(( + const char *word, slap_bindconf *bc )); +LDAP_SLAPD_F (int) bindconf_tls_unparse LDAP_P(( + slap_bindconf *bc, struct berval *bv )); 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; @@ -640,14 +686,18 @@ LDAP_SLAPD_F (void) connection_client_enable LDAP_P(( ber_socket_t s )); LDAP_SLAPD_F (void) connection_client_stop LDAP_P(( ber_socket_t s )); -LDAP_SLAPD_F (long) connection_init LDAP_P(( +LDAP_SLAPD_F (Connection *) connection_init LDAP_P(( ber_socket_t s, Listener* url, const char* dnsname, const char* peername, int use_tls, slap_ssf_t ssf, - struct berval *id )); + struct berval *id +#ifdef LDAP_PF_LOCAL_SENDMSG + , struct berval *peerbv +#endif + )); LDAP_SLAPD_F (void) connection_closing LDAP_P(( Connection *c, const char *why )); @@ -656,12 +706,11 @@ LDAP_SLAPD_F (const char *) connection_state2str LDAP_P(( int state )) LDAP_GCCATTR((const)); #ifdef SLAP_LIGHTWEIGHT_DISPATCHER -LDAP_SLAPD_F (int) connection_write_activate LDAP_P((ber_socket_t s)); LDAP_SLAPD_F (int) connection_read_activate LDAP_P((ber_socket_t s)); #else -LDAP_SLAPD_F (int) connection_write LDAP_P((ber_socket_t s)); 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); @@ -675,6 +724,11 @@ LDAP_SLAPD_F (void) connection_fake_init LDAP_P(( Connection *conn, Operation *op, void *threadctx )); +LDAP_SLAPD_F (void) connection_fake_init2 LDAP_P(( + Connection *conn, + Operation *op, + void *threadctx, + int newmem )); LDAP_SLAPD_F (void) connection_assign_nextid LDAP_P((Connection *)); /* @@ -701,10 +755,11 @@ LDAP_SLAPD_F (ContentRule *) cr_bvfind LDAP_P(( * ctxcsn.c */ +LDAP_SLAPD_V( int ) slap_serverID; 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 *)); @@ -719,8 +774,8 @@ 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, int locked )); +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(); @@ -736,6 +791,7 @@ 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; @@ -832,6 +888,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 )); @@ -842,12 +899,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 )); @@ -857,6 +915,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 @@ -869,16 +930,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(( +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 )); @@ -886,6 +954,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 */ @@ -904,6 +981,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, @@ -937,6 +1015,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 @@ -955,21 +1034,17 @@ LDAP_SLAPD_F (int) slap_destroy LDAP_P((void)); LDAP_SLAPD_V (char *) slap_known_controls[]; -/* - * kerberos.c - */ -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND -LDAP_SLAPD_V (char *) ldap_srvtab; -LDAP_SLAPD_V (int) krbv4_ldap_auth(); -#endif - /* * ldapsync.c */ LDAP_SLAPD_F (void) slap_compose_sync_cookie LDAP_P(( - Operation *, struct berval *, struct berval *, int )); + Operation *, struct berval *, BerVarray, int, int )); LDAP_SLAPD_F (void) slap_sync_cookie_free LDAP_P(( struct sync_cookie *, int free_cookie )); +LDAP_SLAPD_F (int) slap_parse_csn_sid LDAP_P(( + struct berval * )); +LDAP_SLAPD_F (int *) slap_parse_csn_sids LDAP_P(( + BerVarray, int, void *memctx )); LDAP_SLAPD_F (int) slap_parse_sync_cookie LDAP_P(( struct sync_cookie *, void *memctx )); LDAP_SLAPD_F (int) slap_init_sync_cookie_ctxcsn LDAP_P(( @@ -992,10 +1067,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 )); /* @@ -1005,6 +1080,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 */ @@ -1016,13 +1103,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 @@ -1047,6 +1130,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 ); @@ -1060,6 +1144,12 @@ LDAP_SLAPD_F( void ) slap_mods_opattrs( Modifications **modsp, int manage_ctxcsn ); +LDAP_SLAPD_F( int ) slap_parse_modlist( + Operation *op, + SlapReply *rs, + BerElement *ber, + req_modify_s *ms ); + /* * mods.c */ @@ -1105,8 +1195,11 @@ LDAP_SLAPD_F (int) module_load LDAP_P(( const char* file_name, int argc, char *argv[] )); LDAP_SLAPD_F (int) module_path LDAP_P(( const char* path )); +LDAP_SLAPD_F (int) module_unload LDAP_P(( const char* file_name )); -LDAP_SLAPD_F (void) *module_resolve LDAP_P(( +LDAP_SLAPD_F (void *) module_handle LDAP_P(( const char* file_name )); + +LDAP_SLAPD_F (void *) module_resolve LDAP_P(( const void *module, const char *name)); #endif /* SLAPD_MODULES */ @@ -1138,7 +1231,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, @@ -1150,6 +1243,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 )); @@ -1201,9 +1295,19 @@ LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P(( : 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 */ @@ -1212,14 +1316,14 @@ 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(( @@ -1229,6 +1333,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 @@ -1348,20 +1453,29 @@ 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 */ @@ -1418,8 +1532,8 @@ 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 */ -#ifdef SLAP_AUTHZ_SYNTAX LDAP_SLAPD_F (int) authzValidate LDAP_P(( Syntax *syn, struct berval *in )); #if 0 @@ -1443,7 +1557,6 @@ LDAP_SLAPD_F (int) authzNormalize LDAP_P(( struct berval *val, struct berval *normalized, void *ctx )); -#endif /* SLAP_AUTHZ_SYNTAX */ /* * schema.c @@ -1455,21 +1568,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 ); @@ -1477,7 +1591,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 @@ -1490,7 +1604,7 @@ 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, + Syntax *syntax, struct berval *in )); LDAP_SLAPD_F( int ) octetStringMatch LDAP_P(( int *matchp, @@ -1513,14 +1627,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 )); @@ -1549,7 +1660,7 @@ 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, int stack, void *ctx )); + ber_len_t size, int stack, void *ctx, int new )); 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 )); @@ -1569,9 +1680,9 @@ 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 * )); +LDAP_SLAPD_F (void) syncinfo_free LDAP_P(( struct syncinfo_s *, int all )); /* syntax.c */ LDAP_SLAPD_F (Syntax *) syn_find LDAP_P(( @@ -1632,7 +1743,8 @@ LDAP_SLAPD_F (int) ordered_value_add LDAP_P(( LDAP_SLAPD_F (int) ordered_value_validate LDAP_P(( AttributeDescription *ad, - struct berval *in )); + struct berval *in, + int mop )); LDAP_SLAPD_F (int) ordered_value_pretty LDAP_P(( AttributeDescription *ad, @@ -1744,9 +1856,7 @@ 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; -#ifndef HAVE_GMTIME_R 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; @@ -1779,6 +1889,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)); @@ -1814,8 +1925,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; \ @@ -1833,12 +1944,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 ) { \ @@ -1850,13 +1962,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; \ @@ -1867,7 +1985,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)