X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fproto-slap.h;h=909996dac50620d167801854936075d5fb43c02e;hb=cd786446f01f90f4633bad1aa4b417ff5c06a536;hp=5ad9092de766b5f8545a5c4989df91913ed1b5a9;hpb=88c039607518e62d035ab7479c8a31970ba85977;p=openldap diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 5ad9092de7..909996dac5 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,6 +31,28 @@ 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 +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 */ + /* * acl.c */ @@ -71,12 +93,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 +157,18 @@ 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 (int) slap_ad_undef_promote LDAP_P(( + char *name, + AttributeType *nat )); LDAP_SLAPD_F (AttributeDescription *) ad_find_tags LDAP_P(( AttributeType *type, @@ -143,6 +185,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 +205,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 @@ -256,6 +305,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)); @@ -267,7 +320,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, @@ -342,6 +396,15 @@ 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 */ @@ -363,12 +426,30 @@ 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 )); /* * bconfig.c */ LDAP_SLAPD_F (int) slap_loglevel_register LDAP_P (( slap_mask_t m, struct berval *s )); 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 @@ -519,6 +600,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 @@ -577,13 +663,19 @@ 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)); +#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 (unsigned long) connections_nextid(void); @@ -626,11 +718,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 * )); /* @@ -641,7 +733,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_P((void)); +LDAP_SLAPD_F (void) slapd_sd_unlock LDAP_P((void)); LDAP_SLAPD_F (RETSIGTYPE) slap_sig_shutdown LDAP_P((int sig)); LDAP_SLAPD_F (RETSIGTYPE) slap_sig_wake LDAP_P((int sig)); @@ -650,7 +745,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; @@ -722,7 +817,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, @@ -795,7 +890,7 @@ 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, + const struct berval *ext_oid, slap_mask_t flags, SLAP_EXTOP_MAIN_FN *ext_main )); @@ -823,6 +918,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, @@ -832,8 +928,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 @@ -924,6 +1020,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 */ @@ -935,13 +1039,15 @@ 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 ); + Modifications **pmod )); + +LDAP_SLAPD_F (void) slap_modrdn2mods_free LDAP_P(( Modifications *mod )); /* * modify.c @@ -974,12 +1080,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 ); /* @@ -1086,39 +1189,41 @@ 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 (void) oc_unparse LDAP_P(( @@ -1140,7 +1245,9 @@ LDAP_SLAPD_F (int) parse_oidm LDAP_P(( */ 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 )); @@ -1148,6 +1255,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 @@ -1260,6 +1368,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; @@ -1337,6 +1446,31 @@ LDAP_SLAPD_F (int) slap_sasl_rewrite_config LDAP_P(( int argc, char **argv )); #endif /* SLAP_AUTH_REWRITE */ +#ifdef SLAP_AUTHZ_SYNTAX +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 )); +#endif /* SLAP_AUTHZ_SYNTAX */ /* * schema.c @@ -1382,6 +1516,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 @@ -1513,6 +1657,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, @@ -1604,6 +1767,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; @@ -1612,6 +1776,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; @@ -1675,8 +1842,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; \ @@ -1694,12 +1861,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 ) { \ @@ -1711,13 +1879,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; \ @@ -1728,7 +1902,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)