Kill lber_debug

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

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 4931978ea528974fde750ef35b4cc1ba9f0330b0..473927dcaf2cb6cd212c3c37eaebbdfcbcfcb6b3 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -13,11 +13,12 @@ int access_allowed LDAP_P(( Backend *be, Connection *conn,
        Operation *op, Entry *e,
        char *attr, struct berval *val, int access ));
 
-struct acl * acl_get_applicable LDAP_P(( Backend *be,
+AccessControl * acl_get_applicable LDAP_P(( Backend *be,
        Operation *op, Entry *e,
        char *attr, int nmatches, regmatch_t *matches ));
 
-int acl_access_allowed LDAP_P(( struct acl *a, Backend *be, Connection *conn, Entry *e,
+int acl_access_allowed LDAP_P((
+       AccessControl *a, Backend *be, Connection *conn, Entry *e,
        struct berval *val, Operation *op, int  access, char *edn,
        regmatch_t *matches ));
 
@@ -40,6 +41,7 @@ int str2access LDAP_P(( char *str ));
  */
 
 void attr_free LDAP_P(( Attribute *a ));
+Attribute *attr_dup LDAP_P(( Attribute *a ));
 char * attr_normalize LDAP_P(( char *s ));
 int attr_merge_fast LDAP_P(( Entry *e, char *type, struct berval **vals, int  nvals,
        int  naddvals, int  *maxvals, Attribute ***a ));
@@ -57,6 +59,9 @@ int at_schema_info LDAP_P(( Entry *e ));
 int at_add LDAP_P(( LDAP_ATTRIBUTE_TYPE *at, const char **err ));
 char * at_canonical_name LDAP_P(( char * a_type ));
 
+void attrs_free LDAP_P(( Attribute *a ));
+Attribute *attrs_dup LDAP_P(( Attribute *a ));
+
 /*
  * ava.c
  */
@@ -98,6 +103,12 @@ extern int  backend_group LDAP_P((Backend *be,
        char *gr_ndn, char *op_ndn,
        char *objectclassValue, char *groupattrName));
 
+#ifdef SLAPD_SCHEMA_DN
+/* temporary extern for temporary routine*/
+extern Attribute *backend_subschemasubentry( Backend * );
+#endif
+
+
 /*
  * ch_malloc.c
  */
@@ -147,7 +158,11 @@ int connections_timeout_idle LDAP_P((time_t));
 
 long connection_init LDAP_P((
        ber_socket_t s,
-       const char* name, const char* addr, int use_tls));
+       const char* url,
+       const char* dnsname,
+       const char* peername,
+       const char* sockname,
+       int use_tls ));
 
 void connection_closing LDAP_P(( Connection *c ));
 int connection_state_closing LDAP_P(( Connection *c ));
@@ -171,8 +186,12 @@ char * dn_normalize_case LDAP_P(( char *dn ));
 char * dn_parent LDAP_P(( Backend *be, char *dn ));
 char * dn_rdn LDAP_P(( Backend *be, char *dn ));
 int dn_issuffix LDAP_P(( char *dn, char *suffix ));
+#ifdef DNS_DN
 int dn_type LDAP_P(( char *dn ));
-char * dn_upcase LDAP_P(( char *dn ));
+#endif
+char * str2upper LDAP_P(( char *str ));
+char * str2lower LDAP_P(( char *str ));
+int rdn_validate LDAP_P(( const char* str ));
 char * rdn_attr_value LDAP_P(( char * rdn ));
 char * rdn_attr_type LDAP_P(( char * rdn ));
 void build_new_dn LDAP_P(( char ** new_dn, char *e_dn, char * p_dn,
@@ -226,7 +245,11 @@ extern char *supportedExtensions[];
 extern char *supportedControls[];
 extern char *supportedSASLMechanisms[];
 
-void monitor_info LDAP_P(( Connection *conn, Operation *op ));
+void monitor_info LDAP_P((
+       Connection *conn,
+       Operation *op,
+       char ** attrs,
+       int attrsonly ));
 
 /*
  * operation.c
@@ -254,7 +277,7 @@ char * phonetic LDAP_P(( char *s ));
  * repl.c
  */
 
-void replog LDAP_P(( Backend *be, int optype, char *dn, void *change, int flag ));
+void replog LDAP_P(( Backend *be, Operation *op, char *dn, void *change ));
 
 /*
  * result.c
@@ -289,7 +312,7 @@ int send_search_reference LDAP_P((
 
 int send_search_entry LDAP_P((
        Backend *be, Connection *conn, Operation *op,
-       Entry *e, char **attrs, int attrsonly, int opattrs,
+       Entry *e, char **attrs, int attrsonly,
        LDAPControl **ctrls ));
 
 int str2result LDAP_P(( char *s,
@@ -331,6 +354,11 @@ char *scherr2str LDAP_P((int code));
 
 Filter * str2filter LDAP_P(( char *str ));
 
+/*
+ * suffixalias.c
+ */
+char *suffix_alias LDAP_P(( Backend *be, char *ndn ));
+
 /*
  * value.c
  */
@@ -398,7 +426,7 @@ extern ldap_pvt_thread_mutex_t      crypt_mutex;
 #endif
 extern ldap_pvt_thread_mutex_t gmtime_mutex;
 
-extern struct acl              *global_acl;
+extern AccessControl *global_acl;
 
 int    slap_init LDAP_P((int mode, char* name));
 int    slap_startup LDAP_P((int dbnum));
@@ -407,17 +435,9 @@ int        slap_destroy LDAP_P((void));
 
 struct sockaddr_in;
 
-struct slapd_args {
-       struct sockaddr_in *addr;
-       int tcps;
-#ifdef HAVE_TLS
-       struct sockaddr_in *tls_addr;
-       int tls_tcps;
-#endif
-};
-
-extern int     slapd_daemon LDAP_P((struct slapd_args *args));
-extern int     set_socket LDAP_P((struct sockaddr_in *addr));
+extern int     slapd_daemon_init( char *urls, int port, int tls_port );
+extern int     slapd_daemon_destroy(void);
+extern int     slapd_daemon(void);
 
 extern void slapd_set_write LDAP_P((ber_socket_t s, int wake));
 extern void slapd_clr_write LDAP_P((ber_socket_t s, int wake));
@@ -429,8 +449,17 @@ extern void slapd_remove LDAP_P((ber_socket_t s, int wake));
 extern void    slap_set_shutdown LDAP_P((int sig));
 extern void    slap_do_nothing   LDAP_P((int sig));
 
-extern void    config_info LDAP_P((Connection *conn, Operation *op));
-extern void    root_dse_info LDAP_P((Connection *conn, Operation *op, char **attrs, int attrsonly));
+extern void    config_info LDAP_P((
+       Connection *conn,
+       Operation *op,
+       char ** attrs,
+       int attrsonly ));
+
+extern void    root_dse_info LDAP_P((
+       Connection *conn,
+       Operation *op,
+       char ** attrs,
+       int attrsonly ));
 
 extern int     do_abandon LDAP_P((Connection *conn, Operation *op));
 extern int     do_add LDAP_P((Connection *conn, Operation *op));