Fixup bdb_entry_release now that entry_decode uses two memory blocks

[openldap] / servers / slapd / proto-slap.h

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index f3a7c50238c6e099a366fbc590d5188880abd8d9..d5034175eb50b48e5b92c3415980b80e58292b23 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -28,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,
@@ -53,6 +49,10 @@ 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 ));
+
 /*
  * acl.c
  */
@@ -158,6 +158,7 @@ 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 ));
 LDAP_SLAPD_F (int) be_isroot_pw LDAP_P(( Backend *be,
        Connection *conn, const char *ndn, struct berval *cred ));
+LDAP_SLAPD_F (int) be_isupdate LDAP_P(( Backend *be, const char *ndn ));
 LDAP_SLAPD_F (char *) 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 ));
@@ -239,11 +240,15 @@ 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 ));
+       
 
 /*
  * controls.c
@@ -311,6 +316,7 @@ LDAP_SLAPD_F (void) connection_internal_close( Connection *conn );
 
 LDAP_SLAPD_F (char *) dn_validate LDAP_P(( char *dn ));
 LDAP_SLAPD_F (char *) dn_normalize LDAP_P(( char *dn ));
+LDAP_SLAPD_F (int) dn_match LDAP_P(( const char *val, const char *asserted ));
 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 ));
@@ -318,6 +324,7 @@ 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(( char ** new_dn,
        const char *e_dn,
@@ -327,13 +334,15 @@ LDAP_SLAPD_F (void) build_new_dn LDAP_P(( char ** new_dn,
  * entry.c
  */
 
+extern 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 ));
@@ -391,6 +400,19 @@ 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 ));
 
+/*
+ * limits.c
+ */
+LDAP_SLAPD_F (int) get_limits LDAP_P((
+       Backend *be, const char *ndn, struct slap_limits_set **limit ));
+LDAP_SLAPD_F (int) add_limits LDAP_P((
+       Backend *be, int type, const char *pattern, 
+       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
  */
@@ -444,13 +466,10 @@ LDAP_SLAPD_F (void) *module_resolve LDAP_P((
 #endif /* SLAPD_MODULES */
 
 /*
- * monitor.c
+ * controls.c
  */
 LDAP_SLAPD_F (char *) supportedControls[];
 
-LDAP_SLAPD_F (int) monitor_info LDAP_P((
-       Entry **entry, const char **text ));
-
 /*
  * mra.c
  */
@@ -487,16 +506,29 @@ 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, char *dn, void *change ));
 
 /*
- * result.c
+ * referral.c
  */
+LDAP_SLAPD_F (int) validate_global_referral LDAP_P((
+       const char *url ));
 
 LDAP_SLAPD_F (struct berval **) get_entry_referrals LDAP_P((
        Backend *be, Connection *conn, Operation *op,
-       Entry *e ));
+       Entry *e, const char *target, int scope ));
+
+LDAP_SLAPD_F (struct berval **) referral_rewrite LDAP_P((
+       struct berval **refs,
+       const char *base,
+       const char *target,
+       int scope ));
+
+/*
+ * result.c
+ */
 
 LDAP_SLAPD_F (void) send_ldap_result LDAP_P((
        Connection *conn, Operation *op,
@@ -537,7 +569,7 @@ LDAP_SLAPD_F (void) send_search_result LDAP_P((
 
 LDAP_SLAPD_F (int) send_search_reference LDAP_P((
        Backend *be, Connection *conn, Operation *op,
-       Entry *e, struct berval **refs, int scope,
+       Entry *e, struct berval **refs,
        LDAPControl **ctrls,
        struct berval ***v2refs ));
 
@@ -596,6 +628,13 @@ LDAP_SLAPD_F (int) syn_schema_info( Entry *e );
  * schema.c
  */
 
+LDAP_SLAPD_F (void) oc_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) 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));
 
@@ -684,6 +723,21 @@ LDAP_SLAPD_F (int) entry_schema_check LDAP_P((
 LDAP_SLAPD_F (int) schema_init LDAP_P((void));
 LDAP_SLAPD_F (int) schema_prep LDAP_P((void));
 
+LDAP_SLAPD_F (int) dnNormalize LDAP_P((
+       Syntax *syntax, 
+       struct berval *val, 
+       struct berval **normalized ));
+LDAP_SLAPD_F (int) dnPretty LDAP_P(( 
+       Syntax *syntax, 
+       struct berval *val, 
+       struct berval **normalized ));
+LDAP_SLAPD_F (int) dnMatch LDAP_P(( 
+       int *matchp, 
+       slap_mask_t flags, 
+       Syntax *syntax, 
+       MatchingRule *mr,
+       struct berval *value, 
+       void *assertedValue ));
 
 /*
  * schemaparse.c
@@ -745,11 +799,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,
+       unsigned flags,
        struct berval **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((
+       struct berval ***vals,
+       struct berval **addvals ));
 
 /*
  * user.c
@@ -802,8 +860,8 @@ LDAP_SLAPD_F (int)  krbv4_ldap_auth();
 /*
  * Other...
  */
-#define SLAP_SB_MAX_INCOMING_DEFAULT (1<<18 - 1)
-#define SLAP_SB_MAX_INCOMING_AUTH (1<<24 - 1)
+#define SLAP_SB_MAX_INCOMING_DEFAULT ((1<<18) - 1)
+#define SLAP_SB_MAX_INCOMING_AUTH ((1<<24) - 1)
 
 LDAP_SLAPD_F (ber_len_t) sockbuf_max_incoming;
 LDAP_SLAPD_F (ber_len_t) sockbuf_max_incoming_auth;
@@ -817,13 +875,11 @@ 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 (struct slap_limits_set)          deflimit;
 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_backendsyncfreq;
 LDAP_SLAPD_F (int)             global_schemacheck;
 LDAP_SLAPD_F (char)            *global_host;
 LDAP_SLAPD_F (char)            *global_realm;
@@ -852,7 +908,8 @@ 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));
+/* use time(3) -- no mutex */
+#define slap_get_time()        time( NULL )
 
 LDAP_SLAPD_F (ldap_pvt_thread_pool_t)  connection_pool;
 
@@ -896,6 +953,9 @@ LDAP_SLAPD_F (int) root_dse_info LDAP_P((
        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));