X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fproto-slap.h;h=9f0c70eaede91c74bbb217fc55b40f5b8896e410;hb=c80d93f2bb0d24da2919fa0994f7d1c4f6459897;hp=ef98b8e5c3527e2fe59d6d56047f1f83cacc8587;hpb=d6a37432bd4349fca19e93272e9baf32a8bdf065;p=openldap

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index ef98b8e5c3..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
@@ -37,7 +37,7 @@ LDAP_SLAPD_F (int) is_ad_subtype LDAP_P((
 
 LDAP_SLAPD_F (int) ad_inlist LDAP_P((
 	AttributeDescription *desc,
-	struct berval **attrs ));
+	AttributeName *attrs ));
 
 LDAP_SLAPD_F (int) slap_str2undef_ad LDAP_P((
 	const char *,
@@ -53,6 +53,10 @@ 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
  */
@@ -125,7 +129,7 @@ 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 ));
+	BVarray vals ));
 LDAP_SLAPD_F (Attribute *) attrs_find LDAP_P((
 	Attribute *a, AttributeDescription *desc ));
 LDAP_SLAPD_F (Attribute *) attr_find LDAP_P((
@@ -217,7 +221,7 @@ LDAP_SLAPD_F (int) backend_attribute LDAP_P((BackendDB *be,
 	Entry *target,
 	struct berval *entry_ndn,
 	AttributeDescription *entry_at,
-	struct berval ***vals
+	BVarray *vals
 ));
 
 LDAP_SLAPD_F (Attribute *) backend_operational(
@@ -225,7 +229,7 @@ LDAP_SLAPD_F (Attribute *) backend_operational(
 	Connection *conn,
 	Operation *op,
 	Entry *e,
-	struct berval **attrs,
+	AttributeName *attrs,
 	int opattrs );
 
 
@@ -271,16 +275,14 @@ 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 (struct berval **) str2bvec LDAP_P(( struct berval **vec,
-	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 ));
-LDAP_SLAPD_F (int) bvec_inlist LDAP_P((
-    struct berval **a,
-    struct berval *s ));	
 
 /*
  * controls.c
@@ -290,7 +292,7 @@ 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
@@ -357,11 +359,21 @@ LDAP_SLAPD_F (int) dnNormalize LDAP_P((
 	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, 
@@ -380,7 +392,7 @@ 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 ));
+	struct berval *dn, struct berval *rdn ));
 
 LDAP_SLAPD_F (int) rdnValidate LDAP_P(( struct berval * rdn ));
 
@@ -426,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,
@@ -434,9 +446,9 @@ 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((
@@ -445,7 +457,7 @@ 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 ));
 
@@ -504,6 +516,12 @@ 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,
@@ -542,11 +560,6 @@ LDAP_SLAPD_F (void) *module_resolve LDAP_P((
 
 #endif /* SLAPD_MODULES */
 
-/*
- * controls.c
- */
-LDAP_SLAPD_V (char *) supportedControls[];
-
 /*
  * mra.c
  */
@@ -593,11 +606,11 @@ LDAP_SLAPD_F (void) replog LDAP_P(( Backend *be, Operation *op,
 LDAP_SLAPD_F (int) validate_global_referral LDAP_P((
 	const char *url ));
 
-LDAP_SLAPD_F (struct berval **) get_entry_referrals LDAP_P((
+LDAP_SLAPD_F (BVarray) get_entry_referrals LDAP_P((
 	Backend *be, Connection *conn, Operation *op, Entry *e ));
 
-LDAP_SLAPD_F (struct berval **) referral_rewrite LDAP_P((
-	struct berval **refs,
+LDAP_SLAPD_F (BVarray) referral_rewrite LDAP_P((
+	BVarray refs,
 	struct berval *base,
 	struct berval *target,
 	int scope ));
@@ -609,14 +622,14 @@ LDAP_SLAPD_F (struct berval **) referral_rewrite LDAP_P((
 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 ));
 
@@ -627,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 ));
 
@@ -639,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,
+	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, struct berval **attrs, int attrsonly,
+	Entry *e, AttributeName *attrs, int attrsonly,
 	LDAPControl **ctrls ));
 
 LDAP_SLAPD_F (int) str2result LDAP_P(( char *s,
@@ -705,8 +718,9 @@ LDAP_SLAPD_F (int) syn_schema_info( Entry *e );
  */
 
 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(( 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 ));
@@ -749,6 +763,7 @@ LDAP_SLAPD_F (int) syn_add LDAP_P((
 	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,
 	unsigned usage,
@@ -785,6 +800,8 @@ LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P((
 	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)
 
 
 /*
@@ -792,12 +809,13 @@ LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P((
  */
 LDAP_SLAPD_F( int ) oc_check_allowed(
 	AttributeType *type,
-	struct berval **oclist,
+	BVarray oclist,
 	ObjectClass *sc );
 
 LDAP_SLAPD_F( int ) structural_class(
-	struct berval **ocs,
+	BVarray ocs,
 	struct berval *scbv,
+	ObjectClass **sc,
 	const char **text,
 	char *textbuf, size_t textlen );
 
@@ -815,8 +833,13 @@ LDAP_SLAPD_F( int ) mods_structural_class(
 /*
  * 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
@@ -838,16 +861,7 @@ LDAP_SLAPD_F (int) dscompare LDAP_P(( const char *s1, const char *s2del,
 /*
  * 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;
 
 
 /*
@@ -868,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,
@@ -882,11 +896,11 @@ LDAP_SLAPD_F (int) value_match LDAP_P((
 LDAP_SLAPD_F (int) value_find_ex LDAP_P((
 	AttributeDescription *ad,
 	unsigned flags,
-	struct berval **values,
+	BVarray values,
 	struct berval *value ));
 LDAP_SLAPD_F (int) value_add LDAP_P((
-	struct berval ***vals,
-	struct berval **addvals ));
+	BVarray *vals,
+	BVarray addvals ));
 
 /*
  * user.c
@@ -898,34 +912,27 @@ 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 );
 
 /*
@@ -959,7 +966,7 @@ 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 (struct berval **)	default_referral;
+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;