X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fproto-slap.h;h=24ee5a1207974a174fef8a67d8a3d9949af9e9d8;hb=6044e46ec7af21658829edde47c4c9c904093df3;hp=ef6e454115b51771b0debcac7570c16f6f5da866;hpb=9cdcd58afcf89d0536e5b263744e73fa2f34a7e0;p=openldap diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index ef6e454115..24ee5a1207 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-2008 The OpenLDAP Foundation. + * Copyright 1998-2009 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -93,7 +93,7 @@ LDAP_SLAPD_F (int) acl_match_set LDAP_P(( 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 )); + struct berval *dnmatch, struct berval *valmatch, AclRegexMatches *matches )); /* * aclparse.c @@ -111,7 +111,7 @@ LDAP_SLAPD_F (slap_access_t) str2access LDAP_P(( const char *str )); LDAP_SLAPD_F (char *) accessmask2str LDAP_P(( slap_mask_t mask, char*, int debug )); LDAP_SLAPD_F (slap_mask_t) str2accessmask LDAP_P(( const char *str )); LDAP_SLAPD_F (void) acl_unparse LDAP_P(( AccessControl*, struct berval* )); -LDAP_SLAPD_F (void) acl_destroy LDAP_P(( AccessControl*, AccessControl* )); +LDAP_SLAPD_F (void) acl_destroy LDAP_P(( AccessControl* )); LDAP_SLAPD_F (void) acl_free LDAP_P(( AccessControl *a )); @@ -191,6 +191,15 @@ LDAP_SLAPD_V( AttributeName * ) slap_anlist_all_user_attributes; LDAP_SLAPD_V( AttributeName * ) slap_anlist_all_operational_attributes; LDAP_SLAPD_V( AttributeName * ) slap_anlist_all_attributes; +LDAP_SLAPD_V( struct berval * ) slap_bv_no_attrs; +LDAP_SLAPD_V( struct berval * ) slap_bv_all_user_attrs; +LDAP_SLAPD_V( struct berval * ) slap_bv_all_operational_attrs; + +/* deprecated; only defined for backward compatibility */ +#define NoAttrs (*slap_bv_no_attrs) +#define AllUser (*slap_bv_all_user_attrs) +#define AllOper (*slap_bv_all_operational_attrs) + /* * add.c */ @@ -426,7 +435,7 @@ LDAP_SLAPD_V(BackendInfo) slap_binfo[]; */ LDAP_SLAPD_F (int) glue_sub_init( void ); -LDAP_SLAPD_F (int) glue_sub_attach( void ); +LDAP_SLAPD_F (int) glue_sub_attach( int online ); LDAP_SLAPD_F (int) glue_sub_add( BackendDB *be, int advert, int online ); LDAP_SLAPD_F (int) glue_sub_del( BackendDB *be ); @@ -435,7 +444,7 @@ LDAP_SLAPD_F (int) glue_sub_del( BackendDB *be ); */ LDAP_SLAPD_F (int) overlay_register LDAP_P(( slap_overinst *on )); LDAP_SLAPD_F (int) overlay_config LDAP_P(( BackendDB *be, const char *ov, - int idx, BackendInfo **res )); + int idx, BackendInfo **res, ConfigReply *cr )); LDAP_SLAPD_F (void) overlay_destroy_one LDAP_P(( BackendDB *be, slap_overinst *on )); @@ -469,6 +478,12 @@ 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 )); +#ifdef SLAP_CONFIG_DELETE +LDAP_SLAPD_F (void) overlay_remove LDAP_P(( + BackendDB *be, slap_overinst *on )); +#endif /* SLAP_CONFIG_DELETE */ +LDAP_SLAPD_F (int) overlay_callback_after_backover LDAP_P(( + Operation *op, slap_callback *sc, int append )); /* * bconfig.c @@ -654,6 +669,13 @@ LDAP_SLAPD_F (int) slap_ctrl_session_tracking_request_add LDAP_P(( Operation *op, SlapReply *rs, LDAPControl *ctrl )); #endif /* SLAP_CONTROL_X_SESSION_TRACKING */ +#ifdef SLAP_CONTROL_X_WHATFAILED +LDAP_SLAPD_F (int) +slap_ctrl_whatFailed_add LDAP_P(( + Operation *op, + SlapReply *rs, + char **oids )); +#endif /* SLAP_CONTROL_X_WHATFAILED */ /* * config.c @@ -732,6 +754,7 @@ LDAP_SLAPD_F (Connection *) connection_init LDAP_P(( LDAP_SLAPD_F (void) connection_closing LDAP_P(( Connection *c, const char *why )); +LDAP_SLAPD_F (void) connection_hangup LDAP_P(( ber_socket_t fd )); 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)); @@ -788,13 +811,10 @@ LDAP_SLAPD_F (ContentRule *) cr_bvfind LDAP_P(( */ 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 )); + Operation *, struct berval *maxcsn, int *foundit )); 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 *, struct berval *, int )); LDAP_SLAPD_F (void) slap_queue_csn LDAP_P(( Operation *, struct berval * )); @@ -819,6 +839,8 @@ 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 (int) slapd_clr_read LDAP_P((ber_socket_t s, int wake)); +LDAP_SLAPD_F (void) slapd_clr_writetime LDAP_P((time_t old)); +LDAP_SLAPD_F (time_t) slapd_get_writetime LDAP_P((void)); LDAP_SLAPD_V (volatile sig_atomic_t) slapd_abrupt_shutdown; LDAP_SLAPD_V (volatile sig_atomic_t) slapd_shutdown; @@ -1023,7 +1045,7 @@ LDAP_SLAPD_F (int) get_filter LDAP_P(( const char **text )); 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) filter_free_x LDAP_P(( Operation *op, Filter *f, int freeme )); 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 )); @@ -1109,9 +1131,6 @@ LDAP_SLAPD_F (int) slap_build_syncUUID_set LDAP_P(( /* * limits.c */ -LDAP_SLAPD_F (int) limits_get LDAP_P(( - Operation *op, struct berval *ndn, - struct slap_limits_set **limit )); LDAP_SLAPD_F (int) limits_parse LDAP_P(( Backend *be, const char *fname, int lineno, int argc, char **argv )); @@ -1632,6 +1651,7 @@ LDAP_SLAPD_F( int ) entry_schema_check( Attribute *attrs, int manage, int add, + Attribute **socp, const char** text, char *textbuf, size_t textlen ); @@ -1693,6 +1713,8 @@ LDAP_SLAPD_F (int) parse_at LDAP_P(( 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 )); +LDAP_SLAPD_F (int) parse_syn LDAP_P(( + struct config_args_s *ca, Syntax **sat, Syntax *prev )); /* * sessionlog.c @@ -1752,7 +1774,10 @@ LDAP_SLAPD_F (Syntax *) syn_find_desc LDAP_P(( const char *syndesc, int *slen )); LDAP_SLAPD_F (int) syn_add LDAP_P(( LDAPSyntax *syn, + int user, slap_syntax_defs_rec *def, + Syntax **ssyn, + Syntax *prev, const char **err )); LDAP_SLAPD_F (void) syn_destroy LDAP_P(( void )); @@ -1761,6 +1786,13 @@ LDAP_SLAPD_F (int) register_syntax LDAP_P(( LDAP_SLAPD_F (int) syn_schema_info( Entry *e ); +LDAP_SLAPD_F (int) syn_start LDAP_P(( Syntax **at )); +LDAP_SLAPD_F (int) syn_next LDAP_P(( Syntax **at )); +LDAP_SLAPD_F (void) syn_delete LDAP_P(( Syntax *at )); + +LDAP_SLAPD_F (void) syn_unparse LDAP_P(( + BerVarray *bva, Syntax *start, Syntax *end, int system )); + /* * user.c */ @@ -1897,6 +1929,7 @@ LDAP_SLAPD_V (const char) Versionstr[]; LDAP_SLAPD_V (int) global_gentlehup; LDAP_SLAPD_V (int) global_idletimeout; +LDAP_SLAPD_V (int) global_writetimeout; LDAP_SLAPD_V (char *) global_host; LDAP_SLAPD_V (char *) global_realm; LDAP_SLAPD_V (char *) sasl_host; @@ -1930,10 +1963,6 @@ LDAP_SLAPD_V (ber_socket_t) dtblsize; LDAP_SLAPD_V (int) use_reverse_lookup; -LDAP_SLAPD_V (struct berval) AllUser; -LDAP_SLAPD_V (struct berval) AllOper; -LDAP_SLAPD_V (struct berval) NoAttrs; - /* * operations */