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 4bf68057d6cfb89af8eea421fb74553bcfd87366..d5034175eb50b48e5b92c3415980b80e58292b23 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -49,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
  */
@@ -154,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 ));
@@ -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 ));
@@ -328,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 ));
@@ -620,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));
 
@@ -708,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
@@ -769,13 +799,15 @@ LDAP_SLAPD_F (int) value_match LDAP_P((
        struct berval *v1,
        void *v2,
        const char ** text ));
+#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 ));
-#define value_find(ad, values, value)  ( value_find_ex(ad,0,values,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
@@ -828,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;
@@ -876,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;