X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fproto-slap.h;h=2334edef12d8f8cbb03ee820e5be9faeb0fbd7bc;hb=329bd66d6ab650e052929af9ccc35bb7416bd87d;hp=fe508d9142e8b80fe0ce4e16c7873f5b3e5e3126;hpb=86a46c267a5279794c1ac858a53a8033d55b7274;p=openldap diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index fe508d9142..2334edef12 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -1,8 +1,28 @@ /* $OpenLDAP$ */ -/* - * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2003 The OpenLDAP Foundation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* Portions Copyright (c) 1995 Regents of the University of Michigan. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that this notice is preserved and that due credit is given + * to the University of Michigan at Ann Arbor. The name of the University + * may not be used to endorse or promote products derived from this + * software without specific prior written permission. This software + * is provided ``as is'' without express or implied warranty. */ + #ifndef PROTO_SLAP_H #define PROTO_SLAP_H @@ -95,7 +115,11 @@ LDAP_SLAPD_F (MatchingRule *) ad_mr( * add.c */ LDAP_SLAPD_F (int) slap_mods2entry LDAP_P(( Modifications *mods, Entry **e, - int repl_user, const char **text, char *textbuf, size_t textlen )); + int repl_user, int dup, const char **text, char *textbuf, size_t textlen )); + +LDAP_SLAPD_F (int) slap_entry2mods LDAP_P(( Entry *e, + Modifications **mods, const char **text, + char *textbuf, size_t textlen )); /* * at.c @@ -253,6 +277,13 @@ LDAP_SLAPD_F (Attribute *) backend_operational( LDAP_SLAPD_F (int) glue_back_initialize( BackendInfo *bi ); 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 ); + /* * ch_malloc.c */ @@ -271,6 +302,9 @@ LDAP_SLAPD_F (void) ch_free LDAP_P(( void * )); /* * controls.c */ +LDAP_SLAPD_F (void) slap_free_ctrls LDAP_P(( + Operation *op, + LDAPControl **ctrls )); LDAP_SLAPD_F (int) get_ctrls LDAP_P(( Operation *op, SlapReply *rs, @@ -290,6 +324,10 @@ LDAP_SLAPD_F (int) get_supported_controls LDAP_P (( char ***ctrloidsp, slap_mask */ LDAP_SLAPD_F (int) read_config LDAP_P(( const char *fname, int depth )); LDAP_SLAPD_F (void) config_destroy LDAP_P ((void)); +LDAP_SLAPD_F (char **) str2clist LDAP_P(( char ***, char *, const char * )); +#ifdef LDAP_SLAPI +LDAP_SLAPD_V (int) slapi_plugins_used; +#endif /* * connection.c @@ -299,6 +337,15 @@ LDAP_SLAPD_F (int) connections_shutdown LDAP_P((void)); LDAP_SLAPD_F (int) connections_destroy LDAP_P((void)); LDAP_SLAPD_F (int) connections_timeout_idle LDAP_P((time_t)); +LDAP_SLAPD_F (int) connection_client_setup LDAP_P(( + ber_socket_t s, + Listener *l, + ldap_pvt_thread_start_t *func, + void *arg )); +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(( ber_socket_t s, Listener* url, @@ -306,7 +353,7 @@ LDAP_SLAPD_F (long) connection_init LDAP_P(( const char* peername, int use_tls, slap_ssf_t ssf, - const char *id )); + struct berval *id )); LDAP_SLAPD_F (void) connection_closing LDAP_P(( Connection *c )); LDAP_SLAPD_F (int) connection_state_closing LDAP_P(( Connection *c )); @@ -341,15 +388,27 @@ LDAP_SLAPD_F (ContentRule *) cr_find LDAP_P(( LDAP_SLAPD_F (ContentRule *) cr_bvfind LDAP_P(( struct berval *crname)); +/* + * ctxcsn.c + */ + +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_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 )); + /* * daemon.c */ -LDAP_SLAPD_F (void) slapd_add_internal(ber_socket_t s); +LDAP_SLAPD_F (void) slapd_add_internal(ber_socket_t s, int isactive); 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 wake)); +LDAP_SLAPD_F (void) slapd_remove LDAP_P((ber_socket_t s, int wasactive, int wake)); LDAP_SLAPD_F (RETSIGTYPE) slap_sig_shutdown LDAP_P((int sig)); LDAP_SLAPD_F (RETSIGTYPE) slap_sig_wake LDAP_P((int sig)); @@ -359,6 +418,8 @@ 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_V (volatile sig_atomic_t) slapd_abrupt_shutdown; + /* * dn.c */ @@ -371,14 +432,8 @@ LDAP_SLAPD_F (int) dnValidate LDAP_P(( struct berval *val )); LDAP_SLAPD_F (slap_mr_normalize_func) dnNormalize; -#define dnNormalize2(s,v,n,x) dnNormalize(0,(s),NULL,(v),(n),(x)) - -LDAP_SLAPD_F (int) dnPretty LDAP_P(( - Syntax *syntax, - struct berval *val, - struct berval **pretty )); -LDAP_SLAPD_F (slap_syntax_transform_func) dnPretty2; +LDAP_SLAPD_F (slap_syntax_transform_func) dnPretty; LDAP_SLAPD_F (int) dnPrettyNormal LDAP_P(( Syntax *syntax, @@ -408,7 +463,8 @@ LDAP_SLAPD_F (int) dn_rdnlen LDAP_P(( Backend *be, struct berval *dn )); LDAP_SLAPD_F (void) build_new_dn LDAP_P(( struct berval * new_dn, struct berval * parent_dn, - struct berval * newrdn )); + struct berval * newrdn, + void *memctx )); LDAP_SLAPD_F (void) dnParent LDAP_P(( struct berval *dn, struct berval *pdn )); @@ -442,16 +498,19 @@ 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 )); 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 )); /* * extended.c */ +LDAP_SLAPD_F (int) exop_root_dse_info LDAP_P ((Entry *e)); + #ifdef LDAP_EXOP_X_CANCEL -const struct berval slap_EXOP_CANCEL; +LDAP_SLAPD_V( const struct berval ) slap_EXOP_CANCEL; #endif -const struct berval slap_EXOP_WHOAMI; -const struct berval slap_EXOP_MODIFY_PASSWD; -const struct berval slap_EXOP_START_TLS; +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; typedef int (SLAP_EXTOP_MAIN_FN) LDAP_P(( Operation *op, SlapReply *rs )); @@ -460,6 +519,7 @@ typedef int (SLAP_EXTOP_GETOID_FN) LDAP_P(( LDAP_SLAPD_F (int) load_extop LDAP_P(( struct berval *ext_oid, + slap_mask_t flags, SLAP_EXTOP_MAIN_FN *ext_main )); LDAP_SLAPD_F (int) extops_init LDAP_P(( void )); @@ -512,6 +572,7 @@ LDAP_SLAPD_V( const struct berval ) slap_empty_bv; LDAP_SLAPD_V( const struct berval ) slap_unknown_bv; 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; /* * index.c @@ -536,6 +597,34 @@ LDAP_SLAPD_V (char *) ldap_srvtab; LDAP_SLAPD_V (int) krbv4_ldap_auth(); #endif +/* + * 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 )); +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 * )); +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(( + struct sync_cookie *, struct sync_cookie * )); +LDAP_SLAPD_F (int) slap_build_syncUUID_set LDAP_P(( + Operation *, BerVarray *, Entry * )); + /* * limits.c */ @@ -609,6 +698,10 @@ LDAP_SLAPD_F( int ) modify_replace_values( Entry *e, Modification *mod, int permissive, const char **text, char *textbuf, size_t textlen ); +LDAP_SLAPD_F( int ) modify_increment_values( Entry *e, + Modification *mod, + int permissive, + const char **text, char *textbuf, size_t textlen ); LDAP_SLAPD_F( void ) slap_mod_free( Modification *mod, int freeit ); LDAP_SLAPD_F( void ) slap_mods_free( Modifications *mods ); @@ -708,6 +801,18 @@ LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P(( (((e)->e_ocflags & SLAP_OC__END) \ ? (((e)->e_ocflags & SLAP_OC_DYNAMICOBJECT) != 0) \ : is_entry_objectclass((e), slap_schema.si_oc_dynamicObject, 1)) +#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)) +#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)) +#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)) LDAP_SLAPD_F (int) oc_schema_info( Entry *e ); @@ -739,6 +844,11 @@ LDAP_SLAPD_F (Operation *) slap_op_pop LDAP_P(( Operation **olist )); LDAP_SLAPD_F (Attribute *) slap_operational_subschemaSubentry( Backend *be ); LDAP_SLAPD_F (Attribute *) slap_operational_hasSubordinate( int has ); +/* + * overlays.c + */ +LDAP_SLAPD_F (int) overlay_init( void ); + /* * passwd.c */ @@ -747,13 +857,15 @@ LDAP_SLAPD_F (SLAP_EXTOP_MAIN_FN) passwd_extop; LDAP_SLAPD_F (int) slap_passwd_check( Connection *conn, Attribute *attr, - struct berval *cred ); + struct berval *cred, + const char **text ); LDAP_SLAPD_F (void) slap_passwd_generate( struct berval * ); LDAP_SLAPD_F (void) slap_passwd_hash( struct berval *cred, - struct berval *hash ); + struct berval *hash, + const char **text ); LDAP_SLAPD_F (struct berval *) slap_passwd_return( struct berval *cred ); @@ -801,6 +913,7 @@ LDAP_SLAPD_F (int) add_replica_suffix LDAP_P(( Backend *be, LDAP_SLAPD_F (int) add_replica_attrs LDAP_P(( Backend *be, int nr, char *attrs, int exclude )); LDAP_SLAPD_F (void) replog LDAP_P(( Operation *op )); +LDAP_SLAPD_F (void) repstamp LDAP_P(( Operation *op )); /* * result.c @@ -809,10 +922,16 @@ LDAP_SLAPD_F (void) slap_send_ldap_result LDAP_P(( Operation *op, SlapReply *rs LDAP_SLAPD_F (void) send_ldap_sasl LDAP_P(( Operation *op, SlapReply *rs )); LDAP_SLAPD_F (void) send_ldap_disconnect LDAP_P(( Operation *op, SlapReply *rs )); LDAP_SLAPD_F (void) slap_send_ldap_extended LDAP_P(( Operation *op, SlapReply *rs )); -LDAP_SLAPD_F (void) slap_send_ldap_intermediate_resp LDAP_P(( Operation *op, SlapReply *rs )); +LDAP_SLAPD_F (void) slap_send_ldap_intermediate LDAP_P(( Operation *op, SlapReply *rs )); LDAP_SLAPD_F (void) slap_send_search_result LDAP_P(( Operation *op, SlapReply *rs )); LDAP_SLAPD_F (int) slap_send_search_reference LDAP_P(( Operation *op, SlapReply *rs )); LDAP_SLAPD_F (int) slap_send_search_entry LDAP_P(( Operation *op, SlapReply *rs )); +LDAP_SLAPD_F (int) slap_null_cb LDAP_P(( Operation *op, SlapReply *rs )); + +LDAP_SLAPD_V( const struct berval ) slap_pre_read_bv; +LDAP_SLAPD_V( const struct berval ) slap_post_read_bv; +LDAP_SLAPD_F (int) slap_read_controls LDAP_P(( Operation *op, SlapReply *rs, + Entry *e, const struct berval *oid, LDAPControl **ctrl )); LDAP_SLAPD_F (int) str2result LDAP_P(( char *s, int *code, char **matched, char **info )); @@ -835,12 +954,12 @@ LDAP_SLAPD_F (int) slap_sasl_init(void); LDAP_SLAPD_F (char *) slap_sasl_secprops( const char * ); LDAP_SLAPD_F (int) slap_sasl_destroy(void); -LDAP_SLAPD_F (int) slap_sasl_open( Connection *c ); +LDAP_SLAPD_F (int) slap_sasl_open( Connection *c, int reopen ); LDAP_SLAPD_F (char **) slap_sasl_mechs( Connection *c ); LDAP_SLAPD_F (int) slap_sasl_external( Connection *c, slap_ssf_t ssf, /* relative strength of external security */ - const char *authid ); /* asserted authenication id */ + struct berval *authid ); /* asserted authenication id */ LDAP_SLAPD_F (int) slap_sasl_reset( Connection *c ); LDAP_SLAPD_F (int) slap_sasl_close( Connection *c ); @@ -865,12 +984,16 @@ LDAP_SLAPD_F (int) slap_sasl_getdn( Connection *conn, Operation *op, /* * saslauthz.c */ +LDAP_SLAPD_F (int) slap_parse_user LDAP_P(( + struct berval *id, struct berval *user, + struct berval *realm, struct berval *mech )); LDAP_SLAPD_F (void) slap_sasl2dn LDAP_P(( Operation *op, struct berval *saslname, - struct berval *dn )); + struct berval *dn, + int flags )); LDAP_SLAPD_F (int) slap_sasl_authorized LDAP_P(( - Connection *conn, + Operation *op, struct berval *authcid, struct berval *authzid )); LDAP_SLAPD_F (int) slap_sasl_regexp_config LDAP_P(( @@ -942,6 +1065,14 @@ 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 )); +/* + * sessionlog.c + */ +LDAP_SLAPD_F (int) slap_send_session_log LDAP_P(( + Operation *, Operation *, SlapReply *)); +LDAP_SLAPD_F (int) slap_add_session_log LDAP_P(( + Operation *, Operation *, Entry * )); + /* * sl_malloc.c */ @@ -950,9 +1081,10 @@ LDAP_SLAPD_F (void *) sl_malloc LDAP_P(( ber_len_t size, void *ctx )); LDAP_SLAPD_F (void *) sl_realloc LDAP_P(( void *block, ber_len_t size, void *ctx )); LDAP_SLAPD_F (void *) sl_calloc LDAP_P(( ber_len_t nelem, ber_len_t size, void *ctx )); LDAP_SLAPD_F (void) sl_free LDAP_P(( void *, void *ctx )); +LDAP_SLAPD_F (void) sl_mem_init LDAP_P(( void )); LDAP_SLAPD_F (void *) sl_mem_create LDAP_P(( ber_len_t size, void *ctx )); -LDAP_SLAPD_F (void *) sl_mark LDAP_P(( void *ctx )); -LDAP_SLAPD_F (void) sl_release LDAP_P(( void *, void *ctx )); +LDAP_SLAPD_F (void) sl_mem_detach LDAP_P(( void *ctx, void *memctx )); +LDAP_SLAPD_F (void) sl_mem_destroy LDAP_P(( void *key, void *data )); LDAP_SLAPD_F (void *) sl_context LDAP_P(( void *ptr )); /* @@ -966,6 +1098,32 @@ LDAP_SLAPD_F (SLAP_EXTOP_MAIN_FN) starttls_extop; LDAP_SLAPD_F (Filter *) str2filter LDAP_P(( const char *str )); 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 (Entry*) syncrepl_message_to_entry LDAP_P(( + syncinfo_t *, Operation *, LDAPMessage *, + Modifications **, int )); +LDAP_SLAPD_F (int) syncrepl_entry LDAP_P(( + syncinfo_t *, Operation*, Entry*, + Modifications*,int, struct berval*, + struct sync_cookie * )); +LDAP_SLAPD_F (void) syncrepl_updateCookie LDAP_P(( + syncinfo_t *, Operation *, struct berval *, + struct sync_cookie * )); +LDAP_SLAPD_F (void) syncrepl_add_glue LDAP_P(( + Operation*, Entry* )); +LDAP_SLAPD_F (Entry*) slap_create_syncrepl_entry LDAP_P(( + Backend *, struct berval *, + struct berval *, struct berval * )); +LDAP_SLAPD_F (struct berval *) slap_uuidstr_from_normalized LDAP_P(( + struct berval *, struct berval *, void * )); + /* syntax.c */ LDAP_SLAPD_F (Syntax *) syn_find LDAP_P(( const char *synname )); @@ -1088,11 +1246,14 @@ 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; +LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) repstamp_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 LDAP_SLAPD_V (AccessControl *) global_acl; @@ -1118,15 +1279,6 @@ LDAP_SLAPD_F (int) do_search LDAP_P((Operation *op, SlapReply *rs)); LDAP_SLAPD_F (int) do_unbind LDAP_P((Operation *op, SlapReply *rs)); LDAP_SLAPD_F (int) do_extended LDAP_P((Operation *op, SlapReply *rs)); -/* - * syncrepl - */ - -#ifdef LDAP_SYNCREPL -LDAP_SLAPD_F (void) init_syncrepl LDAP_P(()); -LDAP_SLAPD_F (void*) do_syncrepl LDAP_P((void *, void *)); -#endif - LDAP_END_DECL #endif /* PROTO_SLAP_H */