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 6fd484ee277c06d562825ca9cf32459fc972ebef..56bc4c2372edf909aad51548be541fdaaf28a9c3 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -77,8 +77,8 @@ LDAP_SLAPD_F (char *) access2str LDAP_P(( slap_access_t access ));
 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_access_mask_t mask, char* ));
-LDAP_SLAPD_F (slap_access_mask_t) str2accessmask LDAP_P(( const char *str ));
+LDAP_SLAPD_F (char *) accessmask2str LDAP_P(( slap_mask_t mask, char* ));
+LDAP_SLAPD_F (slap_mask_t) str2accessmask LDAP_P(( const char *str ));
 
 /*
  * at.c
@@ -147,26 +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, const char *ndn, struct berval *cred ));
+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_controls LDAP_P((
-       Backend *be,
+LDAP_SLAPD_F( int )    backend_check_restrictions LDAP_P((
+       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,
@@ -175,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,
@@ -183,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,
@@ -192,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 * );
 
 
 
@@ -252,7 +263,7 @@ LDAP_SLAPD_F (int) read_config LDAP_P(( const char *fname ));
  * index.c
  */
 LDAP_SLAPD_F (int) slap_index2prefix LDAP_P(( int indextype ));
-LDAP_SLAPD_F (int) slap_str2index LDAP_P(( const char *str, slap_index *idx ));
+LDAP_SLAPD_F (int) slap_str2index LDAP_P(( const char *str, slap_mask_t *idx ));
 
 /*
  * connection.c
@@ -269,8 +280,8 @@ LDAP_SLAPD_F (long) connection_init LDAP_P((
        const char* peername,
        const char* sockname,
        int use_tls,
-       unsigned ssf,
-       char *id ));
+       slap_ssf_t ssf,
+       const char *id ));
 
 LDAP_SLAPD_F (void) connection_closing LDAP_P(( Connection *c ));
 LDAP_SLAPD_F (int) connection_state_closing LDAP_P(( Connection *c ));
@@ -285,6 +296,12 @@ 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 *));
+
+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
  */
@@ -311,8 +328,11 @@ 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 (void) entry_free LDAP_P(( Entry *e ));
 
+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 (void) entry_free LDAP_P(( Entry *e ));
 LDAP_SLAPD_F (int) entry_cmp LDAP_P(( Entry *a, Entry *b ));
 LDAP_SLAPD_F (int) entry_dn_cmp LDAP_P(( Entry *a, Entry *b ));
 LDAP_SLAPD_F (int) entry_id_cmp LDAP_P(( Entry *a, Entry *b ));
@@ -321,18 +341,7 @@ LDAP_SLAPD_F (int) entry_id_cmp LDAP_P(( Entry *a, Entry *b ));
  * extended.c
  */
 
-#define SLAPD_EXTOP_GETVERSION 0
-#define SLAPD_EXTOP_GETPROTO 1
-#define SLAPD_EXTOP_GETAUTH 2
-#define SLAPD_EXTOP_GETDN 3
-#define SLAPD_EXTOP_GETCLIENT 4
-
-typedef int (*SLAP_EXTOP_CALLBACK_FN) LDAP_P((
-       Connection *conn, Operation *op,
-       int msg, int arg, void *argp ));
-
 typedef int (*SLAP_EXTOP_MAIN_FN) LDAP_P((
-       SLAP_EXTOP_CALLBACK_FN,
        Connection *conn, Operation *op,
        const char * reqoid,
        struct berval * reqdata,
@@ -438,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
  */
@@ -537,8 +557,8 @@ LDAP_SLAPD_F (int) slap_sasl_open( Connection *c );
 LDAP_SLAPD_F (char **) slap_sasl_mechs( Connection *c );
 
 LDAP_SLAPD_F (int) slap_sasl_external( Connection *c,
-       unsigned ssf,   /* relative strength of external security */
-       char *authid ); /* asserted authenication id */
+       slap_ssf_t ssf, /* relative strength of external security */
+       const char *authid );   /* asserted authenication id */
 
 LDAP_SLAPD_F (int) slap_sasl_reset( Connection *c );
 LDAP_SLAPD_F (int) slap_sasl_close( Connection *c );
@@ -546,8 +566,18 @@ 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,
-       const char *mech, struct berval *cred,
-       char **edn ));
+       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 );
@@ -611,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,
@@ -667,7 +697,6 @@ LDAP_SLAPD_F (int) dscompare LDAP_P(( const char *s1, const char *s2del, char de
  */
 
 LDAP_SLAPD_F (int) starttls_extop LDAP_P((
-       SLAP_EXTOP_CALLBACK_FN,
        Connection *conn, Operation *op,
        const char * reqoid,
        struct berval * reqdata,
@@ -723,7 +752,6 @@ LDAP_SLAPD_F (void) slap_init_user LDAP_P(( char *username, char *groupname ));
  * passwd.c
  */
 LDAP_SLAPD_F (int) passwd_extop LDAP_P((
-       SLAP_EXTOP_CALLBACK_FN,
        Connection *conn, Operation *op,
        const char * reqoid,
        struct berval * reqdata,
@@ -734,6 +762,7 @@ LDAP_SLAPD_F (int) passwd_extop LDAP_P((
        struct berval *** refs ));
 
 LDAP_SLAPD_F (int) slap_passwd_check(
+       Connection                      *conn,
        Attribute                       *attr,
        struct berval           *cred );
 
@@ -764,6 +793,12 @@ LDAP_SLAPD_F (int) krbv4_ldap_auth();
  * Other...
  */
 
+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[];
@@ -771,14 +806,20 @@ 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_readonly;
 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)            *global_ucdata_path;
 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;
@@ -802,8 +843,8 @@ 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;
 
-#ifdef SLAPD_CRYPT
-LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) crypt_mutex;
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) passwd_mutex;
 #endif
 LDAP_SLAPD_F (ldap_pvt_thread_mutex_t) gmtime_mutex;
 
@@ -816,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);