X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fproto-slap.h;h=c79c434f8ca644792f3daea9af9ab6d531ab12b8;hb=2c7f30061933e3bc65477ea2d9561b264497a6c9;hp=41fed652947a053043df5d1ef913ce1cf0e1996e;hpb=10a696bd1522c384be2188bb49f20ad06f4fab11;p=openldap diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 41fed65294..c79c434f8c 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 @@ -34,24 +34,11 @@ LDAP_BEGIN_DECL /* * 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 @@ -93,8 +80,6 @@ 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_V (const struct berval) aci_bv[]; - LDAP_SLAPD_F (int) acl_get_part LDAP_P(( struct berval *list, int ix, @@ -104,7 +89,7 @@ LDAP_SLAPD_F (int) acl_match_set LDAP_P(( struct berval *subj, Operation *op, Entry *e, - int setref )); + 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 )); @@ -114,7 +99,7 @@ LDAP_SLAPD_F (int) acl_string_expand LDAP_P(( */ 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 )); @@ -187,6 +172,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, @@ -321,7 +307,8 @@ LDAP_SLAPD_F (int) backend_destroy LDAP_P((void)); 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 )); LDAP_SLAPD_F (BackendDB *) select_backend LDAP_P(( struct berval * dn, @@ -404,7 +391,6 @@ 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 ); -LDAP_SLAPD_F (void) glue_sub_detach( BackendDB *be ); /* * backover.c @@ -436,6 +422,8 @@ 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) 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 @@ -571,12 +559,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)); @@ -618,7 +609,7 @@ LDAP_SLAPD_F (int) bindconf_unparse LDAP_P(( 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 )); -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; @@ -719,7 +710,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, 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)); @@ -728,7 +722,7 @@ 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; @@ -866,16 +860,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 )); @@ -883,6 +884,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 */ @@ -901,6 +911,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, @@ -910,8 +921,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 @@ -989,10 +1000,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 )); /* @@ -1002,6 +1013,14 @@ 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_debug_unknowns LDAP_P(( char **unknowns, int *levelp )); + /* * matchedValues.c */ @@ -1013,13 +1032,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 @@ -1054,7 +1069,7 @@ LDAP_SLAPD_F( void ) slap_timestamp( LDAP_SLAPD_F( void ) slap_mods_opattrs( Operation *op, - Modifications *mods, + Modifications **modsp, int manage_ctxcsn ); /* @@ -1338,6 +1353,7 @@ 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; @@ -1358,6 +1374,13 @@ LDAP_SLAPD_F (int) slap_discover_feature LDAP_P(( 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 */ @@ -1565,7 +1588,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 * )); @@ -1628,7 +1651,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, @@ -1735,6 +1759,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; @@ -1809,8 +1834,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; \ @@ -1828,12 +1853,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 ) { \ @@ -1845,13 +1871,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_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; \ @@ -1862,7 +1894,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)