Very crude LDIF changes:

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

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 442f2f450a4e9699b760e749236b7986025e58ce..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
  */
@@ -119,6 +130,7 @@ void charray_free LDAP_P(( char **array ));
 int charray_inlist LDAP_P(( char **a, char *s ));
 char ** charray_dup LDAP_P(( char **a ));
 char ** str2charray LDAP_P(( char *str, char *brkstr ));
+char * charray2str LDAP_P(( char **a ));
 
 /*
  * controls.c
@@ -128,6 +140,8 @@ int get_ctrls LDAP_P((
        Operation *op,
        int senderrors ));
 
+int get_manageDSAit LDAP_P(( Operation *op ));
+
 /*
  * config.c
  */
@@ -144,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 ));
@@ -168,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,
@@ -223,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
@@ -251,23 +277,46 @@ 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
  */
 
+struct berval **get_entry_referrals LDAP_P((
+       Backend *be, Connection *conn, Operation *op,
+       Entry *e ));
+
 void send_ldap_result LDAP_P((
        Connection *conn, Operation *op,
-       int err, char *matched, char *text ));
+       int err, char *matched, char *text,
+       struct berval **refs,
+       LDAPControl **ctrls ));
 
 void send_ldap_disconnect LDAP_P((
        Connection *conn, Operation *op,
        int err, char *text ));
 
-void send_ldap_search_result LDAP_P((
+void send_search_result LDAP_P((
        Connection *conn, Operation *op,
-       int err, char *matched, char *text, int nentries ));
+       int err, char *matched, char *text,
+       struct berval **refs,
+       LDAPControl **ctrls,
+       int nentries ));
+
+int send_search_reference LDAP_P((
+       Backend *be, Connection *conn, Operation *op,
+       Entry *e, struct berval **refs, int scope,
+       LDAPControl **ctrls,
+       struct berval ***v2refs ));
+
+int send_search_entry LDAP_P((
+       Backend *be, Connection *conn, Operation *op,
+       Entry *e, char **attrs, int attrsonly,
+       LDAPControl **ctrls ));
+
+int str2result LDAP_P(( char *s,
+       int *code, char **matched, char **info ));
 
 /*
  * schema.c
@@ -286,6 +335,10 @@ int mr_add LDAP_P((LDAP_MATCHING_RULE *mr, slap_mr_normalize_func *normalize, sl
 void schema_info LDAP_P((Connection *conn, Operation *op, char **attrs, int attrsonly));
 int schema_init LDAP_P((void));
 
+int is_entry_objectclass LDAP_P(( Entry *, char* objectclass ));
+#define is_entry_alias(e)              is_entry_objectclass((e), "ALIAS")
+#define is_entry_referral(e)   is_entry_objectclass((e), "REFERRAL")
+
 
 /*
  * schemaparse.c
@@ -301,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
  */
@@ -314,11 +372,6 @@ int value_cmp LDAP_P(( struct berval *v1, struct berval *v2, int syntax,
 int value_find LDAP_P(( struct berval **vals, struct berval *v, int syntax,
        int normalize ));
 
-/*
- * suffixAlias.c
- */
-char *suffixAlias LDAP_P(( char *dn, Operation *op, Backend *be ));
-
 /*
  * user.c
  */
@@ -330,7 +383,7 @@ void slap_init_user LDAP_P(( char *username, char *groupname ));
  * Other...
  */
 
-extern char            *default_referral;
+extern struct berval **default_referral;
 extern char            *replogfile;
 extern const char Versionstr[];
 extern int             active_threads;
@@ -347,7 +400,9 @@ extern int          ldap_syslog;
 
 extern ldap_pvt_thread_mutex_t num_sent_mutex;
 extern long            num_bytes_sent;
+extern long            num_pdu_sent;
 extern long            num_entries_sent;
+extern long            num_refs_sent;
 
 extern ldap_pvt_thread_mutex_t num_ops_mutex;
 extern long            num_ops_completed;
@@ -371,26 +426,18 @@ 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;
 
-extern int     slap_init LDAP_P((int mode, char* name));
-extern int     slap_startup LDAP_P((int dbnum));
-extern int     slap_shutdown LDAP_P((int dbnum));
-extern int     slap_destroy LDAP_P((void));
+int    slap_init LDAP_P((int mode, char* name));
+int    slap_startup LDAP_P((int dbnum));
+int    slap_shutdown LDAP_P((int dbnum));
+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));
@@ -402,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));
@@ -416,11 +472,6 @@ extern int do_search LDAP_P((Connection *conn, Operation *op));
 extern int     do_unbind LDAP_P((Connection *conn, Operation *op));
 extern int     do_extended LDAP_P((Connection *conn, Operation *op));
 
-extern int send_search_entry LDAP_P((
-       Backend *be, Connection *conn, Operation *op,
-       Entry *e, char **attrs, int attrsonly, int opattrs ));
-
-extern int str2result LDAP_P(( char *s, int *code, char **matched, char **info ));
 
 extern ber_socket_t dtblsize;