X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fproto-slap.h;h=5f8b8743adcb1d0721ee27c46d5dffbfe0729b10;hb=01c38dd6ea7f02cfdc9f77f9299771a4ef6ce968;hp=5abf8772539f8afcb8c12c60ac517c8d89e492cb;hpb=cff53d48674350d8af590b3f91a249d258629734;p=openldap diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 5abf877253..5f8b8743ad 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -31,6 +31,8 @@ LDAP_BEGIN_DECL +struct config_args_s; /* config.h */ + /* * aci.c */ @@ -217,7 +219,7 @@ 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(( @@ -230,10 +232,16 @@ LDAP_SLAPD_F (int) is_at_syntax LDAP_P(( 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 */ @@ -248,6 +256,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, @@ -256,6 +266,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 )); @@ -271,6 +285,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 )); /* @@ -302,6 +318,7 @@ 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 )); @@ -421,6 +438,7 @@ 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 )); @@ -589,6 +607,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(( @@ -608,6 +628,7 @@ LDAP_SLAPD_F (int) bindconf_unparse LDAP_P(( 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 *, ber_len_t buflen )); @@ -695,7 +716,7 @@ 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 *)); @@ -710,8 +731,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(); @@ -727,7 +748,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 (char *) slapd_slp_attrs; +LDAP_SLAPD_V (const char *) slapd_slp_attrs; LDAP_SLAPD_V (slap_ssf_t) local_ssf; LDAP_SLAPD_V (struct runqueue_s) slapd_rq; @@ -824,6 +845,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 )); @@ -834,12 +856,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 )); @@ -849,6 +872,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 @@ -1168,6 +1194,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 )); @@ -1219,9 +1246,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 */ @@ -1230,14 +1267,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(( @@ -1247,6 +1284,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 @@ -1375,8 +1413,7 @@ LDAP_SLAPD_F (int) read_root_dse_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 )); @@ -1443,6 +1480,7 @@ 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 */ LDAP_SLAPD_F (int) authzValidate LDAP_P(( Syntax *syn, struct berval *in )); @@ -1478,21 +1516,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 ); @@ -1500,7 +1539,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 @@ -1536,14 +1575,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 )); @@ -1880,7 +1916,7 @@ LDAP_SLAPD_F (int) fe_access_allowed LDAP_P(( #else # if USE_MP_LONG_LONG # define UI2BV_FORMAT "%llu" -# elif USE_MP_LONG_LONG +# elif USE_MP_LONG # define UI2BV_FORMAT "%lu" # elif HAVE_LONG_LONG # define UI2BV_FORMAT "%llu"