add new ber dump routine (behind NEW_LOGGING)

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

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index ca1a3e49b428e5bcd2bf20b1f43a8ea1cbc3955f..56bc4c2372edf909aad51548be541fdaaf28a9c3 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -147,28 +147,31 @@ LDAP_SLAPD_F (int) backend_destroy LDAP_P((void));
 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 ));
+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 ));
 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 ));
-LDAP_SLAPD_F (int) be_entry_release_rw LDAP_P(( Backend *be, Entry *e, int rw ));
-#define be_entry_release_r( be, e ) be_entry_release_rw( be, e, 0 )
-#define be_entry_release_w( be, e ) be_entry_release_rw( be, e, 1 )
+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 )
+#define be_entry_release_w( be, c, o, e ) be_entry_release_rw( be, c, o, e, 1 )
 
 LDAP_SLAPD_F (int) backend_unbind LDAP_P((Connection *conn, Operation *op));
 
 LDAP_SLAPD_F( int )    backend_check_restrictions LDAP_P((
-       Backend *be,
+       BackendDB *be,
        Connection *conn,
        Operation *op,
        const char *extoid,
        const char **text ));
 
 LDAP_SLAPD_F( int )    backend_check_referrals LDAP_P((
-       Backend *be,
+       BackendDB *be,
        Connection *conn,
        Operation *op,
        const char *dn,
@@ -177,7 +180,9 @@ LDAP_SLAPD_F( int ) backend_check_referrals LDAP_P((
 LDAP_SLAPD_F (int) backend_connection_init LDAP_P((Connection *conn));
 LDAP_SLAPD_F (int) backend_connection_destroy LDAP_P((Connection *conn));
 
-LDAP_SLAPD_F (int) backend_group LDAP_P((Backend *be,
+LDAP_SLAPD_F (int) backend_group LDAP_P((BackendDB *be,
+       Connection *conn,
+       Operation *op,
        Entry *target,
        const char *gr_ndn,
        const char *op_ndn,
@@ -185,7 +190,7 @@ LDAP_SLAPD_F (int) backend_group LDAP_P((Backend *be,
        AttributeDescription *group_at
 ));
 
-LDAP_SLAPD_F (int) backend_attribute LDAP_P((Backend *be,
+LDAP_SLAPD_F (int) backend_attribute LDAP_P((BackendDB *be,
        Connection *conn,
        Operation *op,
        Entry *target,
@@ -194,7 +199,11 @@ LDAP_SLAPD_F (int) backend_attribute LDAP_P((Backend *be,
        struct berval ***vals
 ));
 
-LDAP_SLAPD_F (Attribute *) backend_operational( Backend *, Entry * );
+LDAP_SLAPD_F (Attribute *) backend_operational(
+       BackendDB *,
+       Connection *conn,
+       Operation *op,
+       Entry * );
 
 
 
@@ -272,7 +281,7 @@ LDAP_SLAPD_F (long) connection_init LDAP_P((
        const char* sockname,
        int use_tls,
        slap_ssf_t ssf,
-       char *id ));
+       const char *id ));
 
 LDAP_SLAPD_F (void) connection_closing LDAP_P(( Connection *c ));
 LDAP_SLAPD_F (int) connection_state_closing LDAP_P(( Connection *c ));
@@ -289,6 +298,10 @@ LDAP_SLAPD_F (void) connection_done LDAP_P((Connection *));
 
 LDAP_SLAPD_F (void) connection2anonymous LDAP_P((Connection *));
 
+LDAP_SLAPD_F (int) connection_internal_open(
+       Connection **conn, LDAP **ldp, const char *id );
+LDAP_SLAPD_F (void) connection_internal_close( Connection *conn );
+
 /*
  * dn.c
  */
@@ -434,6 +447,17 @@ LDAP_SLAPD_F (char *) supportedControls[];
 LDAP_SLAPD_F (int) monitor_info LDAP_P((
        Entry **entry, const char **text ));
 
+/*
+ * mra.c
+ */
+LDAP_SLAPD_F (int) get_mra LDAP_P((
+       BerElement *ber,
+       MatchingRuleAssertion **mra,
+       const char **text ));
+LDAP_SLAPD_F (void) mra_free LDAP_P((
+       MatchingRuleAssertion *mra,
+       int freeit ));
+
 /*
  * operation.c
  */
@@ -534,7 +558,7 @@ LDAP_SLAPD_F (char **) slap_sasl_mechs( Connection *c );
 
 LDAP_SLAPD_F (int) slap_sasl_external( Connection *c,
        slap_ssf_t ssf, /* relative strength of external security */
-       char *authid ); /* asserted authenication id */
+       const char *authid );   /* asserted authenication id */
 
 LDAP_SLAPD_F (int) slap_sasl_reset( Connection *c );
 LDAP_SLAPD_F (int) slap_sasl_close( Connection *c );
@@ -545,6 +569,16 @@ LDAP_SLAPD_F (int) slap_sasl_bind LDAP_P((
        struct berval *cred,
        char **edn, slap_ssf_t *ssf ));
 
+/*
+ * saslauthz.c
+ */
+LDAP_SLAPD_F (int) slap_sasl_authorized LDAP_P((
+       Connection *conn,
+       const char *authcid,
+       const char *authzid ));
+LDAP_SLAPD_F (int) slap_sasl_regexp_config LDAP_P((
+       const char *match, const char *replace ));
+
 /* oc.c */
 LDAP_SLAPD_F (int) oc_schema_info( Entry *e );
 
@@ -607,8 +641,8 @@ LDAP_SLAPD_F (int) register_syntax LDAP_P((
        char *desc,
        unsigned flags,
        slap_syntax_validate_func *validate,
-       slap_syntax_transform_func *ber2str,
-       slap_syntax_transform_func *str2ber ));
+       slap_syntax_transform_func *normalize,
+       slap_syntax_transform_func *pretty ));
 
 LDAP_SLAPD_F (int) register_matching_rule LDAP_P((
        char * desc,
@@ -784,6 +818,9 @@ 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;
@@ -820,6 +857,7 @@ 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);
 LDAP_SLAPD_F (int) slapd_daemon(void);