X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fproto-slap.h;h=9f0c70eaede91c74bbb217fc55b40f5b8896e410;hb=c80d93f2bb0d24da2919fa0994f7d1c4f6459897;hp=9c48bf6889db5132c7c0c1cfd46c9c73062e1c69;hpb=87e58fb031728cc0dfcf04f7f2df23fd0e7619d4;p=openldap diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 9c48bf6889..9f0c70eaed 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ #ifndef _PROTO_SLAP @@ -10,8 +10,10 @@ LDAP_BEGIN_DECL -LDAP_SLAPD_F( int ) schema_init_done; -LDAP_SLAPD_F( struct slap_internal_schema ) slap_schema; +LDAP_SLAPD_V( int ) schema_init_done; +LDAP_SLAPD_V( struct slap_internal_schema ) slap_schema; + +LDAP_SLAPD_F( int ) slap_valid_descr( const char * ); LDAP_SLAPD_F (int) slap_str2ad LDAP_P(( const char *, @@ -26,12 +28,8 @@ LDAP_SLAPD_F (int) slap_bv2ad LDAP_P(( LDAP_SLAPD_F (AttributeDescription *) ad_dup LDAP_P(( AttributeDescription *desc )); -LDAP_SLAPD_F (void) ad_free LDAP_P(( - AttributeDescription *desc, - int freeit )); - #define ad_cmp(l,r) ( strcasecmp( \ - (l)->ad_cname->bv_val, (r)->ad_cname->bv_val )) + (l)->ad_cname.bv_val, (r)->ad_cname.bv_val )) LDAP_SLAPD_F (int) is_ad_subtype LDAP_P(( AttributeDescription *sub, @@ -39,7 +37,7 @@ LDAP_SLAPD_F (int) is_ad_subtype LDAP_P(( LDAP_SLAPD_F (int) ad_inlist LDAP_P(( AttributeDescription *desc, - char **attrs )); + AttributeName *attrs )); LDAP_SLAPD_F (int) slap_str2undef_ad LDAP_P(( const char *, @@ -51,6 +49,14 @@ LDAP_SLAPD_F (int) slap_bv2undef_ad LDAP_P(( AttributeDescription **ad, const char **text )); +LDAP_SLAPD_F (AttributeDescription *) ad_find_lang LDAP_P(( + AttributeType *type, + struct berval *lang )); + +LDAP_SLAPD_F (AttributeName *) str2anlist LDAP_P(( AttributeName *an, + const char *str, const char *brkstr )); +LDAP_SLAPD_F (int) an_find LDAP_P(( AttributeName *a, struct berval *s )); + /* * acl.c */ @@ -79,18 +85,29 @@ LDAP_SLAPD_F (slap_access_t) str2access LDAP_P(( const char *str )); #define ACCESSMASK_MAXLEN sizeof("unknown (+wrscan)") LDAP_SLAPD_F (char *) accessmask2str LDAP_P(( slap_mask_t mask, char* )); LDAP_SLAPD_F (slap_mask_t) str2accessmask LDAP_P(( const char *str )); +LDAP_SLAPD_F (void) acl_destroy LDAP_P(( AccessControl*, AccessControl* )); +LDAP_SLAPD_F (void) acl_free LDAP_P(( AccessControl *a )); /* * at.c */ -LDAP_SLAPD_F (void) at_config LDAP_P(( const char *fname, int lineno, int argc, char **argv )); -LDAP_SLAPD_F (AttributeType *) at_find LDAP_P(( const char *name )); -LDAP_SLAPD_F (int) at_find_in_list LDAP_P(( AttributeType *sat, AttributeType **list )); -LDAP_SLAPD_F (int) at_append_to_list LDAP_P(( AttributeType *sat, AttributeType ***listp )); -LDAP_SLAPD_F (int) at_delete_from_list LDAP_P(( int pos, AttributeType ***listp )); +LDAP_SLAPD_F (void) at_config LDAP_P(( + const char *fname, int lineno, + int argc, char **argv )); +LDAP_SLAPD_F (AttributeType *) at_find LDAP_P(( + const char *name )); +LDAP_SLAPD_F (AttributeType *) at_bvfind LDAP_P(( + struct berval *name )); +LDAP_SLAPD_F (int) at_find_in_list LDAP_P(( + AttributeType *sat, AttributeType **list )); +LDAP_SLAPD_F (int) at_append_to_list LDAP_P(( + AttributeType *sat, AttributeType ***listp )); +LDAP_SLAPD_F (int) at_delete_from_list LDAP_P(( + int pos, AttributeType ***listp )); LDAP_SLAPD_F (int) at_schema_info LDAP_P(( Entry *e )); -LDAP_SLAPD_F (int) at_add LDAP_P(( LDAPAttributeType *at, const char **err )); +LDAP_SLAPD_F (int) at_add LDAP_P(( + LDAPAttributeType *at, const char **err )); LDAP_SLAPD_F (int) is_at_subtype LDAP_P(( AttributeType *sub, @@ -112,10 +129,13 @@ LDAP_SLAPD_F (Attribute *) attr_dup LDAP_P(( Attribute *a )); LDAP_SLAPD_F (int) attr_merge LDAP_P(( Entry *e, AttributeDescription *desc, - struct berval **vals )); -LDAP_SLAPD_F (Attribute *) attrs_find LDAP_P(( Attribute *a, AttributeDescription *desc )); -LDAP_SLAPD_F (Attribute *) attr_find LDAP_P(( Attribute *a, AttributeDescription *desc )); -LDAP_SLAPD_F (int) attr_delete LDAP_P(( Attribute **attrs, AttributeDescription *desc )); + BVarray vals )); +LDAP_SLAPD_F (Attribute *) attrs_find LDAP_P(( + Attribute *a, AttributeDescription *desc )); +LDAP_SLAPD_F (Attribute *) attr_find LDAP_P(( + Attribute *a, AttributeDescription *desc )); +LDAP_SLAPD_F (int) attr_delete LDAP_P(( + Attribute **attrs, AttributeDescription *desc )); LDAP_SLAPD_F (void) attrs_free LDAP_P(( Attribute *a )); LDAP_SLAPD_F (Attribute *) attrs_dup LDAP_P(( Attribute *a )); @@ -141,6 +161,7 @@ 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)); LDAP_SLAPD_F (int) backend_startup 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)); @@ -148,14 +169,18 @@ 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 *) select_backend LDAP_P(( - const char * dn, - int manageDSAit )); - -LDAP_SLAPD_F (int) be_issuffix LDAP_P(( Backend *be, const char *suffix )); -LDAP_SLAPD_F (int) be_isroot LDAP_P(( Backend *be, const char *ndn )); + struct berval * dn, + int manageDSAit, + int noSubordinates )); + +LDAP_SLAPD_F (int) be_issuffix LDAP_P(( Backend *be, + const char *suffix )); +LDAP_SLAPD_F (int) be_isroot LDAP_P(( Backend *be, + struct berval *ndn )); LDAP_SLAPD_F (int) be_isroot_pw LDAP_P(( Backend *be, - Connection *conn, const char *ndn, struct berval *cred )); -LDAP_SLAPD_F (char *) be_root_dn LDAP_P(( Backend *be )); + Connection *conn, struct berval *ndn, struct berval *cred )); +LDAP_SLAPD_F (int) be_isupdate LDAP_P(( Backend *be, struct berval *ndn )); +LDAP_SLAPD_F (struct berval *) be_root_dn LDAP_P(( Backend *be )); LDAP_SLAPD_F (int) be_entry_release_rw LDAP_P(( BackendDB *be, Connection *c, Operation *o, Entry *e, int rw )); #define be_entry_release_r( be, c, o, e ) be_entry_release_rw( be, c, o, e, 0 ) @@ -167,15 +192,15 @@ LDAP_SLAPD_F( int ) backend_check_restrictions LDAP_P(( BackendDB *be, Connection *conn, Operation *op, - const char *extoid, + const void *opdata, const char **text )); LDAP_SLAPD_F( int ) backend_check_referrals LDAP_P(( BackendDB *be, Connection *conn, Operation *op, - const char *dn, - const char *ndn )); + struct berval *dn, + struct berval *ndn )); LDAP_SLAPD_F (int) backend_connection_init LDAP_P((Connection *conn)); LDAP_SLAPD_F (int) backend_connection_destroy LDAP_P((Connection *conn)); @@ -184,8 +209,8 @@ LDAP_SLAPD_F (int) backend_group LDAP_P((BackendDB *be, Connection *conn, Operation *op, Entry *target, - const char *gr_ndn, - const char *op_ndn, + struct berval *gr_ndn, + struct berval *op_ndn, ObjectClass *group_oc, AttributeDescription *group_at )); @@ -194,18 +219,26 @@ LDAP_SLAPD_F (int) backend_attribute LDAP_P((BackendDB *be, Connection *conn, Operation *op, Entry *target, - const char *e_ndn, + struct berval *entry_ndn, AttributeDescription *entry_at, - struct berval ***vals + BVarray *vals )); LDAP_SLAPD_F (Attribute *) backend_operational( BackendDB *, Connection *conn, Operation *op, - Entry * ); + Entry *e, + AttributeName *attrs, + int opattrs ); +/* + * backglue.c + */ + +LDAP_SLAPD_F (int) glue_back_initialize( BackendInfo *bi ); +LDAP_SLAPD_F (int) glue_sub_init( void ); /* * ch_malloc.c @@ -236,11 +269,20 @@ LDAP_SLAPD_F (void) ch_free LDAP_P(( void * )); */ LDAP_SLAPD_F (void) charray_add LDAP_P(( char ***a, const char *s )); +LDAP_SLAPD_F (void) charray_add_n LDAP_P(( char ***a, const char *s, int l )); LDAP_SLAPD_F (void) charray_merge LDAP_P(( char ***a, char **s )); LDAP_SLAPD_F (void) charray_free LDAP_P(( char **array )); LDAP_SLAPD_F (int) charray_inlist LDAP_P(( char **a, const char *s )); LDAP_SLAPD_F (char **) charray_dup LDAP_P(( char **a )); LDAP_SLAPD_F (char **) str2charray LDAP_P(( const char *str, const char *brkstr )); +LDAP_SLAPD_F (int) charray_strcmp LDAP_P(( const char **a1, const char **a2 )); +LDAP_SLAPD_F (int) charray_strcasecmp LDAP_P(( const char **a1, const char **a2 )); + +LDAP_SLAPD_F (int) bvarray_add LDAP_P(( BVarray *a, struct berval *bv )); +LDAP_SLAPD_F (void) bvarray_free LDAP_P(( struct berval *a )); + +LDAP_SLAPD_F (char *) slap_strcopy LDAP_P(( + char *dst, const char *src )); /* * controls.c @@ -250,14 +292,14 @@ LDAP_SLAPD_F (int) get_ctrls LDAP_P(( Operation *op, int senderrors )); -LDAP_SLAPD_F (int) get_manageDSAit LDAP_P(( Operation *op )); +LDAP_SLAPD_F (char *) get_supported_ctrl LDAP_P((int index)); /* * config.c */ LDAP_SLAPD_F (int) read_config LDAP_P(( const char *fname )); - +LDAP_SLAPD_F (void) config_destroy LDAP_P ((void)); /* * index.c @@ -285,15 +327,17 @@ LDAP_SLAPD_F (long) connection_init LDAP_P(( LDAP_SLAPD_F (void) connection_closing LDAP_P(( Connection *c )); 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)); +LDAP_SLAPD_F (const char *) connection_state2str LDAP_P(( int state )) + LDAP_GCCATTR((const)); LDAP_SLAPD_F (int) connection_write LDAP_P((ber_socket_t s)); LDAP_SLAPD_F (int) connection_read LDAP_P((ber_socket_t s)); LDAP_SLAPD_F (unsigned long) connections_nextid(void); -LDAP_SLAPD_F (Connection *) connection_first LDAP_P((ber_socket_t *)); -LDAP_SLAPD_F (Connection *) connection_next LDAP_P((Connection *, ber_socket_t *)); +LDAP_SLAPD_F (Connection *) connection_first LDAP_P(( ber_socket_t * )); +LDAP_SLAPD_F (Connection *) connection_next LDAP_P(( + Connection *, ber_socket_t *)); LDAP_SLAPD_F (void) connection_done LDAP_P((Connection *)); LDAP_SLAPD_F (void) connection2anonymous LDAP_P((Connection *)); @@ -306,31 +350,84 @@ LDAP_SLAPD_F (void) connection_internal_close( Connection *conn ); * dn.c */ +LDAP_SLAPD_F (int) dnValidate LDAP_P(( + Syntax *syntax, + struct berval *val )); + +LDAP_SLAPD_F (int) dnNormalize LDAP_P(( + Syntax *syntax, + struct berval *val, + struct berval **normalized )); + +LDAP_SLAPD_F (int) dnNormalize2 LDAP_P(( + Syntax *syntax, + struct berval *val, + struct berval *normalized )); + +LDAP_SLAPD_F (int) dnPretty LDAP_P(( + Syntax *syntax, + struct berval *val, + struct berval **pretty )); + +LDAP_SLAPD_F (int) dnPretty2 LDAP_P(( + Syntax *syntax, + struct berval *val, + struct berval *pretty )); + +LDAP_SLAPD_F (int) dnPrettyNormal LDAP_P(( + Syntax *syntax, + struct berval *val, + struct berval *pretty, + struct berval *normal )); + +LDAP_SLAPD_F (int) dnMatch LDAP_P(( + int *matchp, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *value, + void *assertedValue )); + +LDAP_SLAPD_F (int) dnIsSuffix LDAP_P(( + const struct berval *dn, const struct berval *suffix )); + +LDAP_SLAPD_F (int) dnExtractRdn LDAP_P(( + struct berval *dn, struct berval *rdn )); + +LDAP_SLAPD_F (int) rdnValidate LDAP_P(( struct berval * rdn )); + +#define SLAP_DN_MIGRATION +#ifdef SLAP_DN_MIGRATION + /* These routines are deprecated!!! */ LDAP_SLAPD_F (char *) dn_validate LDAP_P(( char *dn )); LDAP_SLAPD_F (char *) dn_normalize LDAP_P(( char *dn )); LDAP_SLAPD_F (char *) dn_parent LDAP_P(( Backend *be, const char *dn )); -LDAP_SLAPD_F (char **) dn_subtree LDAP_P(( Backend *be, const char *dn )); -LDAP_SLAPD_F (char *) dn_rdn LDAP_P(( Backend *be, const char *dn )); +LDAP_SLAPD_F (char *) dn_rdn LDAP_P(( Backend *be, struct berval *dn )); +LDAP_SLAPD_F (int) dn_rdnlen LDAP_P(( Backend *be, struct berval *dn )); LDAP_SLAPD_F (int) dn_issuffix LDAP_P(( const char *dn, const char *suffix )); -LDAP_SLAPD_F (int) rdn_validate LDAP_P(( const char* str )); LDAP_SLAPD_F (char *) rdn_attr_value LDAP_P(( const char * rdn )); LDAP_SLAPD_F (char *) rdn_attr_type LDAP_P(( const char * rdn )); +LDAP_SLAPD_F (int) rdn_attrs LDAP_P(( const char * rdn, + char ***ptypes, char ***pvals )); + +LDAP_SLAPD_F (void) build_new_dn LDAP_P(( struct berval * new_dn, + struct berval * parent_dn, + struct berval * newrdn )); +#endif -LDAP_SLAPD_F (void) build_new_dn LDAP_P(( char ** new_dn, - const char *e_dn, - const char * p_dn, - const char * newrdn )); /* * entry.c */ +LDAP_SLAPD_V (const Entry) slap_entry_root; + LDAP_SLAPD_F (int) entry_destroy LDAP_P((void)); LDAP_SLAPD_F (Entry *) str2entry LDAP_P(( char *s )); LDAP_SLAPD_F (char *) entry2str LDAP_P(( Entry *e, int *len )); LDAP_SLAPD_F (int) entry_decode LDAP_P(( struct berval *bv, Entry **e )); -LDAP_SLAPD_F (int) entry_encode LDAP_P(( Entry *e, struct berval **bv )); +LDAP_SLAPD_F (int) entry_encode LDAP_P(( Entry *e, struct berval *bv )); LDAP_SLAPD_F (void) entry_free LDAP_P(( Entry *e )); LDAP_SLAPD_F (int) entry_cmp LDAP_P(( Entry *a, Entry *b )); @@ -341,7 +438,7 @@ LDAP_SLAPD_F (int) entry_id_cmp LDAP_P(( Entry *a, Entry *b )); * extended.c */ -typedef int (*SLAP_EXTOP_MAIN_FN) LDAP_P(( +typedef int (SLAP_EXTOP_MAIN_FN) LDAP_P(( Connection *conn, Operation *op, const char * reqoid, struct berval * reqdata, @@ -349,17 +446,18 @@ typedef int (*SLAP_EXTOP_MAIN_FN) LDAP_P(( struct berval ** rspdata, LDAPControl *** rspctrls, const char ** text, - struct berval *** refs )); + BVarray *refs )); -typedef int (*SLAP_EXTOP_GETOID_FN) LDAP_P(( +typedef int (SLAP_EXTOP_GETOID_FN) LDAP_P(( int index, char *oid, int blen )); -LDAP_SLAPD_F (int) load_extension LDAP_P((const void *module, const char *file_name)); +LDAP_SLAPD_F (int) load_extension LDAP_P(( + const void *module, const char *file_name)); LDAP_SLAPD_F (char *) get_supported_extension LDAP_P((int index)); LDAP_SLAPD_F (int) load_extop LDAP_P(( const char *ext_oid, - SLAP_EXTOP_MAIN_FN ext_main )); + SLAP_EXTOP_MAIN_FN *ext_main )); LDAP_SLAPD_F (int) extops_init LDAP_P(( void )); @@ -375,7 +473,7 @@ LDAP_SLAPD_F (int) get_filter LDAP_P(( Connection *conn, BerElement *ber, Filter **filt, - char **fstr, + struct berval *fstr, const char **text )); LDAP_SLAPD_F (void) filter_free LDAP_P(( Filter *f )); @@ -386,13 +484,27 @@ LDAP_SLAPD_F (void) filter_print LDAP_P(( Filter *f )); */ LDAP_SLAPD_F (int) test_filter LDAP_P(( - Backend *be, Connection *conn, Operation *op, Entry *e, Filter *f )); + Backend *be, Connection *conn, Operation *op, + Entry *e, Filter *f )); + +/* + * limits.c + */ +LDAP_SLAPD_F (int) get_limits LDAP_P(( + Backend *be, struct berval *ndn, + struct slap_limits_set **limit )); +LDAP_SLAPD_F (int) parse_limits LDAP_P(( + Backend *be, const char *fname, int lineno, + int argc, char **argv )); +LDAP_SLAPD_F (int) parse_limit LDAP_P(( const char *arg, + struct slap_limits_set *limit )); /* * lock.c */ -LDAP_SLAPD_F (FILE *) lock_fopen LDAP_P(( const char *fname, const char *type, FILE **lfp )); +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 )); @@ -400,20 +512,29 @@ LDAP_SLAPD_F (int) lock_fclose LDAP_P(( FILE *fp, FILE *lfp )); * modify.c * should be relocated to separate file */ -LDAP_SLAPD_F( void ) slap_mod_free LDAP_P(( Modification *mod, int freeit )); -LDAP_SLAPD_F( void ) slap_mods_free LDAP_P(( Modifications *mods )); -LDAP_SLAPD_F( void ) slap_modlist_free LDAP_P(( LDAPModList *ml )); +LDAP_SLAPD_F( void ) slap_mod_free( Modification *mod, int freeit ); +LDAP_SLAPD_F( void ) slap_mods_free( Modifications *mods ); +LDAP_SLAPD_F( void ) slap_modlist_free( LDAPModList *ml ); + +LDAP_SLAPD_F( int ) slap_mods_check( + Modifications *ml, + int update, + const char **text, + char *textbuf, size_t textlen ); LDAP_SLAPD_F( int ) slap_modlist2mods( LDAPModList *ml, int update, Modifications **mods, - const char **text ); + const char **text, + char *textbuf, size_t textlen ); LDAP_SLAPD_F( int ) slap_mods_opattrs( Operation *op, + Modifications *mods, Modifications **modlist, - const char **text ); + const char **text, + char *textbuf, size_t textlen ); /* * module.c @@ -439,14 +560,6 @@ LDAP_SLAPD_F (void) *module_resolve LDAP_P(( #endif /* SLAPD_MODULES */ -/* - * monitor.c - */ -LDAP_SLAPD_F (char *) supportedControls[]; - -LDAP_SLAPD_F (int) monitor_info LDAP_P(( - Entry **entry, const char **text )); - /* * mra.c */ @@ -475,36 +588,48 @@ LDAP_SLAPD_F (Operation *) slap_op_pop LDAP_P(( Operation **olist )); * phonetic.c */ -LDAP_SLAPD_F (char *) first_word LDAP_P(( char *s )); -LDAP_SLAPD_F (char *) next_word LDAP_P(( char *s )); -LDAP_SLAPD_F (char *) word_dup LDAP_P(( char *w )); LDAP_SLAPD_F (char *) phonetic LDAP_P(( char *s )); /* * repl.c */ +LDAP_SLAPD_F (int) add_replica_info LDAP_P(( Backend *be, + const char *host )); +LDAP_SLAPD_F (int) add_replica_suffix LDAP_P(( Backend *be, + int nr, const char *suffix )); +LDAP_SLAPD_F (void) replog LDAP_P(( Backend *be, Operation *op, + struct berval *dn, struct berval *ndn, void *change )); -LDAP_SLAPD_F (void) replog LDAP_P(( Backend *be, Operation *op, char *dn, void *change )); +/* + * referral.c + */ +LDAP_SLAPD_F (int) validate_global_referral LDAP_P(( + const char *url )); + +LDAP_SLAPD_F (BVarray) get_entry_referrals LDAP_P(( + Backend *be, Connection *conn, Operation *op, Entry *e )); + +LDAP_SLAPD_F (BVarray) referral_rewrite LDAP_P(( + BVarray refs, + struct berval *base, + struct berval *target, + int scope )); /* * result.c */ -LDAP_SLAPD_F (struct berval **) get_entry_referrals LDAP_P(( - Backend *be, Connection *conn, Operation *op, - Entry *e )); - LDAP_SLAPD_F (void) send_ldap_result LDAP_P(( Connection *conn, Operation *op, ber_int_t err, const char *matched, const char *text, - struct berval **refs, + BVarray refs, LDAPControl **ctrls )); LDAP_SLAPD_F (void) send_ldap_sasl LDAP_P(( Connection *conn, Operation *op, ber_int_t err, const char *matched, const char *text, - struct berval **refs, + BVarray refs, LDAPControl **ctrls, struct berval *cred )); @@ -515,7 +640,7 @@ LDAP_SLAPD_F (void) send_ldap_disconnect LDAP_P(( LDAP_SLAPD_F (void) send_ldap_extended LDAP_P(( Connection *conn, Operation *op, ber_int_t err, const char *matched, - const char *text, struct berval **refs, + const char *text, BVarray refs, const char *rspoid, struct berval *rspdata, LDAPControl **ctrls )); @@ -527,19 +652,19 @@ LDAP_SLAPD_F (void) send_ldap_partial LDAP_P(( LDAP_SLAPD_F (void) send_search_result LDAP_P(( Connection *conn, Operation *op, ber_int_t err, const char *matched, const char *text, - struct berval **refs, + BVarray refs, LDAPControl **ctrls, int nentries )); LDAP_SLAPD_F (int) send_search_reference LDAP_P(( Backend *be, Connection *conn, Operation *op, - Entry *e, struct berval **refs, int scope, + Entry *e, BVarray refs, LDAPControl **ctrls, - struct berval ***v2refs )); + BVarray *v2refs )); LDAP_SLAPD_F (int) send_search_entry LDAP_P(( Backend *be, Connection *conn, Operation *op, - Entry *e, char **attrs, int attrsonly, + Entry *e, AttributeName *attrs, int attrsonly, LDAPControl **ctrls )); LDAP_SLAPD_F (int) str2result LDAP_P(( char *s, @@ -565,17 +690,17 @@ LDAP_SLAPD_F (int) slap_sasl_close( Connection *c ); LDAP_SLAPD_F (int) slap_sasl_bind LDAP_P(( Connection *conn, Operation *op, - const char *dn, const char *ndn, + struct berval *dn, struct berval *ndn, struct berval *cred, char **edn, slap_ssf_t *ssf )); /* * saslauthz.c */ +LDAP_SLAPD_F (char *) slap_sasl2dn LDAP_P(( char *saslname )); LDAP_SLAPD_F (int) slap_sasl_authorized LDAP_P(( - Connection *conn, - const char *authcid, - const char *authzid )); + char *authcid, + char *authzid )); LDAP_SLAPD_F (int) slap_sasl_regexp_config LDAP_P(( const char *match, const char *replace )); @@ -592,8 +717,18 @@ LDAP_SLAPD_F (int) syn_schema_info( Entry *e ); * schema.c */ +LDAP_SLAPD_F (void) oc_destroy LDAP_P(( void )); +LDAP_SLAPD_F (void) oidm_destroy LDAP_P(( void )); +LDAP_SLAPD_F (void) at_destroy LDAP_P(( void )); +LDAP_SLAPD_F (void) ad_destroy LDAP_P(( AttributeDescription * )); +LDAP_SLAPD_F (void) mr_destroy LDAP_P(( void )); +LDAP_SLAPD_F (void) syn_destroy LDAP_P(( void )); +LDAP_SLAPD_F (void) schema_destroy LDAP_P(( void )); + LDAP_SLAPD_F (ObjectClass *) oc_find LDAP_P(( const char *ocname)); +LDAP_SLAPD_F (ObjectClass *) oc_bvfind LDAP_P(( + struct berval *ocname)); LDAP_SLAPD_F (int) oc_add LDAP_P(( LDAPObjectClass *oc, @@ -604,8 +739,10 @@ LDAP_SLAPD_F (int) is_object_subclass LDAP_P(( ObjectClass *sup )); -LDAP_SLAPD_F (Syntax *) syn_find LDAP_P((const char *synname)); -LDAP_SLAPD_F (Syntax *) syn_find_desc LDAP_P((const char *syndesc, int *slen)); +LDAP_SLAPD_F (Syntax *) syn_find LDAP_P(( + const char *synname )); +LDAP_SLAPD_F (Syntax *) syn_find_desc LDAP_P(( + const char *syndesc, int *slen )); #ifdef SLAPD_BINARY_CONVERSION LDAP_SLAPD_F (int) syn_add LDAP_P(( LDAPSyntax *syn, @@ -615,7 +752,7 @@ LDAP_SLAPD_F (int) syn_add LDAP_P(( slap_syntax_transform_func *pretty, slap_syntax_transform_func *ber2str, slap_syntax_transform_func *str2ber, - const char **err)); + const char **err )); #else LDAP_SLAPD_F (int) syn_add LDAP_P(( LDAPSyntax *syn, @@ -623,11 +760,12 @@ LDAP_SLAPD_F (int) syn_add LDAP_P(( slap_syntax_validate_func *validate, slap_syntax_transform_func *normalize, slap_syntax_transform_func *pretty, - const char **err)); + const char **err )); #endif +LDAP_SLAPD_F (MatchingRule *) mr_bvfind LDAP_P((struct berval *mrname)); LDAP_SLAPD_F (MatchingRule *) mr_find LDAP_P((const char *mrname)); -LDAP_SLAPD_F (int) mr_add LDAP_P((LDAPMatchingRule *mr, +LDAP_SLAPD_F (int) mr_add LDAP_P(( LDAPMatchingRule *mr, unsigned usage, slap_mr_convert_func *convert, slap_mr_normalize_func *normalize, @@ -635,17 +773,17 @@ LDAP_SLAPD_F (int) mr_add LDAP_P((LDAPMatchingRule *mr, slap_mr_indexer_func *indexer, slap_mr_filter_func *filter, MatchingRule * associated, - const char **err)); + const char **err )); LDAP_SLAPD_F (int) register_syntax LDAP_P(( - char *desc, + const char *desc, unsigned flags, slap_syntax_validate_func *validate, slap_syntax_transform_func *normalize, slap_syntax_transform_func *pretty )); LDAP_SLAPD_F (int) register_matching_rule LDAP_P(( - char * desc, + const char * desc, unsigned usage, slap_mr_convert_func *convert, slap_mr_normalize_func *normalize, @@ -658,53 +796,72 @@ LDAP_SLAPD_F (int) schema_info LDAP_P(( Entry **entry, const char **text )); LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P(( Entry *, ObjectClass *oc )); -#define is_entry_alias(e) is_entry_objectclass((e), slap_schema.si_oc_alias) -#define is_entry_referral(e) is_entry_objectclass((e), slap_schema.si_oc_referral) +#define is_entry_alias(e) \ + is_entry_objectclass((e), slap_schema.si_oc_alias) +#define is_entry_referral(e) \ + is_entry_objectclass((e), slap_schema.si_oc_referral) +#define is_entry_subentry(e) \ + is_entry_objectclass((e), slap_schema.si_oc_subentry) /* * schema_check.c */ -int oc_check_allowed( +LDAP_SLAPD_F( int ) oc_check_allowed( AttributeType *type, - struct berval **oclist ); -LDAP_SLAPD_F (int) entry_schema_check LDAP_P(( + BVarray oclist, + ObjectClass *sc ); + +LDAP_SLAPD_F( int ) structural_class( + BVarray ocs, + struct berval *scbv, + ObjectClass **sc, + const char **text, + char *textbuf, size_t textlen ); + +LDAP_SLAPD_F( int ) entry_schema_check( Entry *e, Attribute *attrs, - const char** text )); + const char** text, + char *textbuf, size_t textlen ); +LDAP_SLAPD_F( int ) mods_structural_class( + Modifications *mods, + struct berval *oc, + const char** text, + char *textbuf, size_t textlen ); /* * schema_init.c */ -LDAP_SLAPD_F (int) schema_init LDAP_P((void)); -LDAP_SLAPD_F (int) schema_prep LDAP_P((void)); +LDAP_SLAPD_F (int) slap_schema_init LDAP_P((void)); +/* + * schema_prep.c + */ +LDAP_SLAPD_F (int) slap_schema_load LDAP_P((void)); +LDAP_SLAPD_F (int) slap_schema_check LDAP_P((void)); /* * schemaparse.c */ -LDAP_SLAPD_F (void) parse_oc_old LDAP_P(( Backend *be, const char *fname, int lineno, int argc, char **argv )); -LDAP_SLAPD_F (void) parse_oc LDAP_P(( const char *fname, int lineno, char *line, char **argv )); -LDAP_SLAPD_F (void) parse_at LDAP_P(( const char *fname, int lineno, char *line, char **argv )); -LDAP_SLAPD_F (void) parse_oidm LDAP_P(( const char *fname, int lineno, int argc, char **argv )); +LDAP_SLAPD_F (int) parse_oc_old LDAP_P(( + Backend *be, const char *fname, int lineno, int argc, char **argv )); +LDAP_SLAPD_F (int) parse_oc LDAP_P(( + const char *fname, int lineno, char *line, char **argv )); +LDAP_SLAPD_F (int) parse_at LDAP_P(( + const char *fname, int lineno, char *line, char **argv )); +LDAP_SLAPD_F (int) parse_oidm LDAP_P(( + const char *fname, int lineno, int argc, char **argv )); 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) dscompare LDAP_P(( const char *s1, const char *s2del, + char delim )); /* * starttls.c */ - -LDAP_SLAPD_F (int) starttls_extop LDAP_P(( - Connection *conn, Operation *op, - const char * reqoid, - struct berval * reqdata, - char ** rspoid, - struct berval ** rspdata, - LDAPControl ***rspctrls, - const char ** text, - struct berval *** refs )); +LDAP_SLAPD_F (SLAP_EXTOP_MAIN_FN) starttls_extop; /* @@ -716,7 +873,7 @@ LDAP_SLAPD_F (Filter *) str2filter LDAP_P(( const char *str )); /* * suffixalias.c */ -LDAP_SLAPD_F (char *) suffix_alias LDAP_P(( Backend *be, char *ndn )); +LDAP_SLAPD_F (void) suffix_alias LDAP_P(( Backend *be, struct berval *ndn )); /* * value.c @@ -725,7 +882,7 @@ LDAP_SLAPD_F (int) value_normalize LDAP_P(( AttributeDescription *ad, unsigned usage, struct berval *in, - struct berval **out, + struct berval *out, const char ** text )); LDAP_SLAPD_F (int) value_match LDAP_P(( int *match, @@ -735,11 +892,15 @@ LDAP_SLAPD_F (int) value_match LDAP_P(( struct berval *v1, void *v2, const char ** text )); -LDAP_SLAPD_F (int) value_find LDAP_P(( +#define value_find(ad,values,value) (value_find_ex((ad),0,(values),(value))) +LDAP_SLAPD_F (int) value_find_ex LDAP_P(( AttributeDescription *ad, - struct berval **values, + unsigned flags, + BVarray values, struct berval *value )); -LDAP_SLAPD_F (int) value_add LDAP_P(( struct berval ***vals, struct berval **addvals )); +LDAP_SLAPD_F (int) value_add LDAP_P(( + BVarray *vals, + BVarray addvals )); /* * user.c @@ -751,111 +912,116 @@ LDAP_SLAPD_F (void) slap_init_user LDAP_P(( char *username, char *groupname )); /* * passwd.c */ -LDAP_SLAPD_F (int) passwd_extop LDAP_P(( - Connection *conn, Operation *op, - const char * reqoid, - struct berval * reqdata, - char ** rspoid, - struct berval ** rspdata, - LDAPControl *** rspctrls, - const char ** text, - struct berval *** refs )); +LDAP_SLAPD_F (SLAP_EXTOP_MAIN_FN) passwd_extop; LDAP_SLAPD_F (int) slap_passwd_check( Connection *conn, Attribute *attr, struct berval *cred ); -LDAP_SLAPD_F (struct berval *) slap_passwd_generate( void ); +LDAP_SLAPD_F (void) slap_passwd_generate( struct berval * ); -LDAP_SLAPD_F (struct berval *) slap_passwd_hash( - struct berval *cred ); +LDAP_SLAPD_F (void) slap_passwd_hash( + struct berval *cred, + struct berval *hash ); LDAP_SLAPD_F (struct berval *) slap_passwd_return( struct berval *cred ); LDAP_SLAPD_F (int) slap_passwd_parse( struct berval *reqdata, - struct berval **id, - struct berval **oldpass, - struct berval **newpass, + struct berval *id, + struct berval *oldpass, + struct berval *newpass, const char **text ); /* * kerberos.c */ #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND -extern char *ldap_srvtab; -LDAP_SLAPD_F (int) krbv4_ldap_auth(); +LDAP_SLAPD_V (char *) ldap_srvtab; +LDAP_SLAPD_V (int) krbv4_ldap_auth(); #endif /* - * Other... + * operational.c */ +LDAP_SLAPD_F (Attribute *) slap_operational_subschemaSubentry( void ); +LDAP_SLAPD_F (Attribute *) slap_operational_hasSubordinate( int has ); -LDAP_SLAPD_F (slap_mask_t) global_restrictops; -LDAP_SLAPD_F (slap_mask_t) global_allows; -LDAP_SLAPD_F (slap_mask_t) global_disallows; -LDAP_SLAPD_F (slap_mask_t) global_requires; -LDAP_SLAPD_F (slap_ssf_set_t) global_ssf_set; - -LDAP_SLAPD_F (struct berval **) default_referral; -LDAP_SLAPD_F (char *) replogfile; -LDAP_SLAPD_F (const char) Versionstr[]; -LDAP_SLAPD_F (int) defsize; -LDAP_SLAPD_F (int) deftime; -LDAP_SLAPD_F (int) g_argc; -LDAP_SLAPD_F (slap_access_t) global_default_access; -LDAP_SLAPD_F (int) global_lastmod; -LDAP_SLAPD_F (int) global_idletimeout; -LDAP_SLAPD_F (int) global_schemacheck; -LDAP_SLAPD_F (char) *global_host; -LDAP_SLAPD_F (char) *global_realm; -LDAP_SLAPD_F (char) *default_passwd_hash; -LDAP_SLAPD_F (int) lber_debug; -LDAP_SLAPD_F (int) ldap_syslog; -LDAP_SLAPD_F (char *) default_search_base; -LDAP_SLAPD_F (char *) default_search_nbase; - -LDAP_SLAPD_F (int) nSaslRegexp; -LDAP_SLAPD_F (SaslRegexp_t*) SaslRegexp; - -LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) num_sent_mutex; -LDAP_SLAPD_F (long) num_bytes_sent; -LDAP_SLAPD_F (long) num_pdu_sent; -LDAP_SLAPD_F (long) num_entries_sent; -LDAP_SLAPD_F (long) num_refs_sent; - -LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) num_ops_mutex; -LDAP_SLAPD_F (long) num_ops_completed; -LDAP_SLAPD_F (long) num_ops_initiated; - -LDAP_SLAPD_F (char *) slapd_pid_file; -LDAP_SLAPD_F (char *) slapd_args_file; -LDAP_SLAPD_F (char) **g_argv; -LDAP_SLAPD_F (time_t) starttime; - -LDAP_SLAPD_F (time_t) slap_get_time LDAP_P((void)); - -LDAP_SLAPD_F (ldap_pvt_thread_pool_t) connection_pool; - -LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) entry2str_mutex; -LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) replog_mutex; +/* + * Other... + */ +#define SLAP_SB_MAX_INCOMING_DEFAULT ((1<<18) - 1) +#define SLAP_SB_MAX_INCOMING_AUTH ((1<<24) - 1) + +LDAP_SLAPD_V(unsigned) num_subordinates; + +LDAP_SLAPD_V (ber_len_t) sockbuf_max_incoming; +LDAP_SLAPD_V (ber_len_t) sockbuf_max_incoming_auth; + +LDAP_SLAPD_V (slap_mask_t) global_restrictops; +LDAP_SLAPD_V (slap_mask_t) global_allows; +LDAP_SLAPD_V (slap_mask_t) global_disallows; +LDAP_SLAPD_V (slap_mask_t) global_requires; +LDAP_SLAPD_V (slap_ssf_set_t) global_ssf_set; + +LDAP_SLAPD_V (BVarray) default_referral; +LDAP_SLAPD_V (char *) replogfile; +LDAP_SLAPD_V (const char) Versionstr[]; +LDAP_SLAPD_V (struct slap_limits_set) deflimit; + +LDAP_SLAPD_V (slap_access_t) global_default_access; +LDAP_SLAPD_V (int) global_lastmod; +LDAP_SLAPD_V (int) global_idletimeout; +LDAP_SLAPD_V (int) global_schemacheck; +LDAP_SLAPD_V (char *) global_host; +LDAP_SLAPD_V (char *) global_realm; +LDAP_SLAPD_V (int) sasl_external_x509dn_convert; +LDAP_SLAPD_V (char *) default_passwd_hash; +LDAP_SLAPD_V (int) lber_debug; +LDAP_SLAPD_V (int) ldap_syslog; +LDAP_SLAPD_V (struct berval) default_search_base; +LDAP_SLAPD_V (struct berval) default_search_nbase; + +LDAP_SLAPD_V (int) nSaslRegexp; +LDAP_SLAPD_V (SaslRegexp_t*) SaslRegexp; + +LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) num_sent_mutex; +LDAP_SLAPD_V (unsigned long) num_bytes_sent; +LDAP_SLAPD_V (unsigned long) num_pdu_sent; +LDAP_SLAPD_V (unsigned long) num_entries_sent; +LDAP_SLAPD_V (unsigned long) num_refs_sent; + +LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) num_ops_mutex; +LDAP_SLAPD_V (unsigned long) num_ops_completed; +LDAP_SLAPD_V (unsigned long) num_ops_initiated; + +LDAP_SLAPD_V (char *) slapd_pid_file; +LDAP_SLAPD_V (char *) slapd_args_file; +LDAP_SLAPD_V (time_t) starttime; + +/* use time(3) -- no mutex */ +#define slap_get_time() time( NULL ) + +LDAP_SLAPD_V (ldap_pvt_thread_pool_t) connection_pool; +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; #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD ) -LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) passwd_mutex; +LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) passwd_mutex; #endif -LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) gmtime_mutex; +LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) gmtime_mutex; -LDAP_SLAPD_F (AccessControl *) global_acl; +LDAP_SLAPD_V (AccessControl *) global_acl; LDAP_SLAPD_F (int) slap_init LDAP_P((int mode, const char* name)); LDAP_SLAPD_F (int) slap_startup LDAP_P(( Backend *be )); LDAP_SLAPD_F (int) slap_shutdown LDAP_P(( Backend *be )); LDAP_SLAPD_F (int) slap_destroy LDAP_P((void)); -struct sockaddr_in; - LDAP_SLAPD_F (void) slapd_add_internal(ber_socket_t s); LDAP_SLAPD_F (int) slapd_daemon_init( const char *urls ); LDAP_SLAPD_F (int) slapd_daemon_destroy(void); @@ -871,14 +1037,14 @@ LDAP_SLAPD_F (void) slapd_remove LDAP_P((ber_socket_t s, int wake)); LDAP_SLAPD_F (RETSIGTYPE) slap_sig_shutdown LDAP_P((int sig)); LDAP_SLAPD_F (RETSIGTYPE) slap_sig_wake LDAP_P((int sig)); -LDAP_SLAPD_F (int) config_info LDAP_P(( - Entry **e, const char **text )); - LDAP_SLAPD_F (int) root_dse_info LDAP_P(( Connection *conn, Entry **e, const char **text )); +LDAP_SLAPD_F (int) read_root_dse_file LDAP_P(( + const char *file)); + LDAP_SLAPD_F (int) do_abandon LDAP_P((Connection *conn, Operation *op)); LDAP_SLAPD_F (int) do_add LDAP_P((Connection *conn, Operation *op)); LDAP_SLAPD_F (int) do_bind LDAP_P((Connection *conn, Operation *op)); @@ -891,7 +1057,7 @@ LDAP_SLAPD_F (int) do_unbind LDAP_P((Connection *conn, Operation *op)); LDAP_SLAPD_F (int) do_extended LDAP_P((Connection *conn, Operation *op)); -LDAP_SLAPD_F (ber_socket_t) dtblsize; +LDAP_SLAPD_V (ber_socket_t) dtblsize; LDAP_END_DECL