Clean up include logging

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

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 883942cbd9052e108ffb6a4f04b4722e6550fa3a..e8bf36c2f8fd6a339ca12f6c5e7e6f80162dfc66 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -13,6 +13,8 @@ LDAP_BEGIN_DECL
 LDAP_SLAPD_F( int ) schema_init_done;
 LDAP_SLAPD_F( struct slap_internal_schema ) slap_schema;
 
+LDAP_SLAPD_F( int ) slap_valid_descr( const char * );
+
 LDAP_SLAPD_F (int) slap_str2ad LDAP_P((
        const char *,
        AttributeDescription **ad,
@@ -141,6 +143,7 @@ LDAP_SLAPD_F (int) backend_init LDAP_P((void));
 LDAP_SLAPD_F (int) backend_add LDAP_P((BackendInfo *aBackendInfo));
 LDAP_SLAPD_F (int) backend_num LDAP_P((Backend *be));
 LDAP_SLAPD_F (int) backend_startup LDAP_P((Backend *be));
+LDAP_SLAPD_F (int) backend_sync LDAP_P((Backend *be));
 LDAP_SLAPD_F (int) backend_shutdown LDAP_P((Backend *be));
 LDAP_SLAPD_F (int) backend_destroy LDAP_P((void));
 
@@ -236,11 +239,15 @@ LDAP_SLAPD_F (void) ch_free LDAP_P(( void * ));
  */
 
 LDAP_SLAPD_F (void) charray_add LDAP_P(( char ***a, const char *s ));
+LDAP_SLAPD_F (void) charray_add_n LDAP_P(( char ***a, const char *s, int l ));
 LDAP_SLAPD_F (void) charray_merge LDAP_P(( char ***a, char **s ));
 LDAP_SLAPD_F (void) charray_free LDAP_P(( char **array ));
 LDAP_SLAPD_F (int) charray_inlist LDAP_P(( char **a, const char *s ));
 LDAP_SLAPD_F (char **) charray_dup LDAP_P(( char **a ));
 LDAP_SLAPD_F (char **) str2charray LDAP_P(( const char *str, const char *brkstr ));
+LDAP_SLAPD_F (int) charray_strcmp LDAP_P(( const char **a1, const char **a2 ));
+LDAP_SLAPD_F (int) charray_strcasecmp LDAP_P(( const char **a1, const char **a2 ));
+       
 
 /*
  * controls.c
@@ -315,6 +322,7 @@ LDAP_SLAPD_F (int) dn_issuffix LDAP_P(( const char *dn, const char *suffix ));
 LDAP_SLAPD_F (int) rdn_validate LDAP_P(( const char* str ));
 LDAP_SLAPD_F (char *) rdn_attr_value LDAP_P(( const char * rdn ));
 LDAP_SLAPD_F (char *) rdn_attr_type LDAP_P(( const char * rdn ));
+LDAP_SLAPD_F (int) rdn_attrs LDAP_P(( const char * rdn, char ***ptypes, char ***pvals ));
 
 LDAP_SLAPD_F (void) build_new_dn LDAP_P(( char ** new_dn,
        const char *e_dn,
@@ -388,6 +396,19 @@ LDAP_SLAPD_F (void) filter_print LDAP_P(( Filter *f ));
 LDAP_SLAPD_F (int) test_filter LDAP_P((
        Backend *be, Connection *conn, Operation *op, Entry *e, Filter  *f ));
 
+/*
+ * limits.c
+ */
+LDAP_SLAPD_F (int) get_limits LDAP_P((
+       Backend *be, const char *ndn, struct slap_limits_set **limit ));
+LDAP_SLAPD_F (int) add_limits LDAP_P((
+       Backend *be, int type, const char *pattern, 
+       struct slap_limits_set *limit ));
+LDAP_SLAPD_F (int) parse_limits LDAP_P((
+        Backend *be, const char *fname, int lineno, int argc, char **argv ));
+LDAP_SLAPD_F (int) parse_limit LDAP_P(( const char *arg, 
+       struct slap_limits_set *limit ));
+
 /*
  * lock.c
  */
@@ -441,13 +462,10 @@ LDAP_SLAPD_F (void) *module_resolve LDAP_P((
 #endif /* SLAPD_MODULES */
 
 /*
- * monitor.c
+ * controls.c
  */
 LDAP_SLAPD_F (char *) supportedControls[];
 
-LDAP_SLAPD_F (int) monitor_info LDAP_P((
-       Entry **entry, const char **text ));
-
 /*
  * mra.c
  */
@@ -484,7 +502,7 @@ LDAP_SLAPD_F (char *) phonetic LDAP_P(( char *s ));
 /*
  * repl.c
  */
-
+LDAP_SLAPD_F (int) add_replica_info LDAP_P(( Backend *be, const char *host ));
 LDAP_SLAPD_F (void) replog LDAP_P(( Backend *be, Operation *op, char *dn, void *change ));
 
 /*
@@ -671,7 +689,8 @@ int oc_check_allowed(
        struct berval **oclist );
 LDAP_SLAPD_F (int) entry_schema_check LDAP_P((
        Entry *e, Attribute *attrs,
-       const char** text ));
+       const char** text,
+       char *textbuf, size_t textlen ));
 
 
 /*
@@ -685,12 +704,17 @@ LDAP_SLAPD_F (int) schema_prep LDAP_P((void));
  * schemaparse.c
  */
 
-LDAP_SLAPD_F (void) parse_oc_old LDAP_P(( Backend *be, const char *fname, int lineno, int argc, char **argv ));
-LDAP_SLAPD_F (void) parse_oc LDAP_P(( const char *fname, int lineno, char *line, char **argv ));
-LDAP_SLAPD_F (void) parse_at LDAP_P(( const char *fname, int lineno, char *line, char **argv ));
-LDAP_SLAPD_F (void) parse_oidm LDAP_P(( const char *fname, int lineno, int argc, char **argv ));
+LDAP_SLAPD_F (int) parse_oc_old LDAP_P((
+       Backend *be, const char *fname, int lineno, int argc, char **argv ));
+LDAP_SLAPD_F (int) parse_oc LDAP_P((
+       const char *fname, int lineno, char *line, char **argv ));
+LDAP_SLAPD_F (int) parse_at LDAP_P((
+       const char *fname, int lineno, char *line, char **argv ));
+LDAP_SLAPD_F (int) parse_oidm LDAP_P((
+       const char *fname, int lineno, int argc, char **argv ));
 LDAP_SLAPD_F (char *) scherr2str LDAP_P((int code)) LDAP_GCCATTR((const));
-LDAP_SLAPD_F (int) dscompare LDAP_P(( const char *s1, const char *s2del, char delim ));
+LDAP_SLAPD_F (int) dscompare LDAP_P(( const char *s1, const char *s2del,
+       char delim ));
 
 
 /*
@@ -794,7 +818,10 @@ 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)
+
 LDAP_SLAPD_F (ber_len_t) sockbuf_max_incoming;
+LDAP_SLAPD_F (ber_len_t) sockbuf_max_incoming_auth;
 
 LDAP_SLAPD_F (slap_mask_t)     global_restrictops;
 LDAP_SLAPD_F (slap_mask_t)     global_allows;
@@ -805,8 +832,7 @@ 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[];
-LDAP_SLAPD_F (int)             defsize;
-LDAP_SLAPD_F (int)             deftime;
+LDAP_SLAPD_F (struct slap_limits_set)          deflimit;
 LDAP_SLAPD_F (int)             g_argc;
 LDAP_SLAPD_F (slap_access_t)   global_default_access;
 LDAP_SLAPD_F (int)             global_lastmod;