X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fproto-slap.h;h=c79c434f8ca644792f3daea9af9ab6d531ab12b8;hb=2c7f30061933e3bc65477ea2d9561b264497a6c9;hp=0b0fd90cf0083a9f6b722cec7e3e0beae65feda4;hpb=662cb94e06ab708f8588eda44b4cec7e4dfe05f0;p=openldap

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 0b0fd90cf0..c79c434f8c 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,24 +34,11 @@ LDAP_BEGIN_DECL
 /*
  * aci.c
  */
-#ifdef SLAPD_ACI_ENABLED
-LDAP_SLAPD_F (int) aci_mask LDAP_P((
-	Operation *op, Entry *e,
-	AttributeDescription *desc,
-	struct berval *val,
-	struct berval *aci,
-	int nmatch,
-	regmatch_t *matches,
-	slap_access_t *grant,
-	slap_access_t *deny,
-	slap_aci_scope_t scope));
 #ifdef SLAP_DYNACL
+#ifdef SLAPD_ACI_ENABLED
 LDAP_SLAPD_F (int) dynacl_aci_init LDAP_P(( void ));
-#else /* !SLAP_DYNACL */
-LDAP_SLAPD_F (int) aci_init LDAP_P(( void ));
-LDAP_SLAPD_V (AttributeDescription *) slap_ad_aci;
-#endif /* !SLAP_DYNACL */
 #endif /* SLAPD_ACI_ENABLED */
+#endif /* SLAP_DYNACL */
 
 /*
  * acl.c
@@ -185,6 +172,7 @@ LDAP_SLAPD_F (AttributeName *) file2anlist LDAP_P((
 LDAP_SLAPD_F (int) an_find LDAP_P(( AttributeName *a, struct berval *s ));
 LDAP_SLAPD_F (int) ad_define_option LDAP_P(( const char *name,
 	const char *fname, int lineno ));
+LDAP_SLAPD_F (void) ad_unparse_options LDAP_P(( BerVarray *res ));
 
 LDAP_SLAPD_F (MatchingRule *) ad_mr(
 	AttributeDescription *ad,
@@ -571,12 +559,15 @@ LDAP_SLAPD_F (int) get_ctrls LDAP_P((
 	Operation *op,
 	SlapReply *rs,
 	int senderrors ));
-LDAP_SLAPD_F (int) register_supported_control LDAP_P((
+LDAP_SLAPD_F (int) register_supported_control2 LDAP_P((
 	const char *controloid,
 	slap_mask_t controlmask,
 	char **controlexops,
 	SLAP_CTRL_PARSE_FN *controlparsefn,
+	unsigned flags,
 	int *controlcid ));
+#define register_supported_control(oid, mask, exops, fn, cid) \
+	register_supported_control2((oid), (mask), (exops), (fn), 0, (cid))
 LDAP_SLAPD_F (int) slap_controls_init LDAP_P ((void));
 LDAP_SLAPD_F (void) controls_destroy LDAP_P ((void));
 LDAP_SLAPD_F (int) controls_root_dse_info LDAP_P ((Entry *e));
@@ -618,7 +609,7 @@ LDAP_SLAPD_F (int) bindconf_unparse LDAP_P((
 LDAP_SLAPD_F (void) bindconf_free LDAP_P(( slap_bindconf *bc ));
 LDAP_SLAPD_F (int) config_generic_wrapper LDAP_P(( Backend *be,
 	const char *fname, int lineno, int argc, char **argv ));
-LDAP_SLAPD_F (char *) anlist_unparse LDAP_P(( AttributeName *, char * ));
+LDAP_SLAPD_F (char *) anlist_unparse LDAP_P(( AttributeName *, char *, ber_len_t buflen ));
 
 #ifdef LDAP_SLAPI
 LDAP_SLAPD_V (int) slapi_plugins_used;
@@ -869,16 +860,23 @@ LDAP_SLAPD_V( const struct berval ) slap_EXOP_CANCEL;
 LDAP_SLAPD_V( const struct berval ) slap_EXOP_WHOAMI;
 LDAP_SLAPD_V( const struct berval ) slap_EXOP_MODIFY_PASSWD;
 LDAP_SLAPD_V( const struct berval ) slap_EXOP_START_TLS;
+#ifdef LDAP_X_TXN
+LDAP_SLAPD_V( const struct berval ) slap_EXOP_TXN_START;
+LDAP_SLAPD_V( const struct berval ) slap_EXOP_TXN_END;
+#endif
 
 typedef int (SLAP_EXTOP_MAIN_FN) LDAP_P(( Operation *op, SlapReply *rs ));
 
 typedef int (SLAP_EXTOP_GETOID_FN) LDAP_P((
 	int index, struct berval *oid, int blen ));
 
-LDAP_SLAPD_F (int) load_extop LDAP_P((
+LDAP_SLAPD_F (int) load_extop2 LDAP_P((
 	const struct berval *ext_oid,
 	slap_mask_t flags,
-	SLAP_EXTOP_MAIN_FN *ext_main ));
+	SLAP_EXTOP_MAIN_FN *ext_main,
+	unsigned tmpflags ));
+#define load_extop(ext_oid, flags, ext_main) \
+	load_extop2((ext_oid), (flags), (ext_main), 0)
 
 LDAP_SLAPD_F (int) extops_init LDAP_P(( void ));
 
@@ -886,6 +884,15 @@ LDAP_SLAPD_F (int) extops_kill LDAP_P(( void ));
 
 LDAP_SLAPD_F (struct berval *) get_supported_extop LDAP_P((int index));
 
+/*
+ * txn.c
+ */
+#ifdef LDAP_X_TXN
+LDAP_SLAPD_F ( SLAP_CTRL_PARSE_FN ) txn_spec_ctrl;
+LDAP_SLAPD_F ( SLAP_EXTOP_MAIN_FN ) txn_start_extop;
+LDAP_SLAPD_F ( SLAP_EXTOP_MAIN_FN ) txn_end_extop;
+#endif
+
 /*
  * cancel.c
  */
@@ -904,6 +911,7 @@ LDAP_SLAPD_F (void) filter_free LDAP_P(( Filter *f ));
 LDAP_SLAPD_F (void) filter_free_x LDAP_P(( Operation *op, Filter *f ));
 LDAP_SLAPD_F (void) filter2bv LDAP_P(( Filter *f, struct berval *bv ));
 LDAP_SLAPD_F (void) filter2bv_x LDAP_P(( Operation *op, Filter *f, struct berval *bv ));
+LDAP_SLAPD_F (Filter *) filter_dup LDAP_P(( Filter *f, void *memctx ));
 
 LDAP_SLAPD_F (int) get_vrFilter LDAP_P(( Operation *op, BerElement *ber,
 	ValuesReturnFilter **f,
@@ -992,10 +1000,10 @@ LDAP_SLAPD_F (int) limits_parse_one LDAP_P(( const char *arg,
 	struct slap_limits_set *limit ));
 LDAP_SLAPD_F (int) limits_check LDAP_P((
 	Operation *op, SlapReply *rs ));
-LDAP_SLAPD_F (void) limits_unparse_one LDAP_P(( 
-	struct slap_limits_set *limit, int which, struct berval *bv ));
-LDAP_SLAPD_F (void) limits_unparse LDAP_P(( 
-	struct slap_limits *limit, struct berval *bv ));
+LDAP_SLAPD_F (int) limits_unparse_one LDAP_P(( 
+	struct slap_limits_set *limit, int which, struct berval *bv, ber_len_t buflen ));
+LDAP_SLAPD_F (int) limits_unparse LDAP_P(( 
+	struct slap_limits *limit, struct berval *bv, ber_len_t buflen ));
 LDAP_SLAPD_F (void) limits_destroy LDAP_P(( struct slap_limits **lm ));
 
 /*
@@ -1005,6 +1013,14 @@ LDAP_SLAPD_F (FILE *) lock_fopen LDAP_P(( const char *fname,
 	const char *type, FILE **lfp ));
 LDAP_SLAPD_F (int) lock_fclose LDAP_P(( FILE *fp, FILE *lfp ));
 
+/*
+ * main.c
+ */
+LDAP_SLAPD_F (int)
+parse_debug_level LDAP_P(( const char *arg, int *levelp, char ***unknowns ));
+LDAP_SLAPD_F (int)
+parse_debug_unknowns LDAP_P(( char **unknowns, int *levelp ));
+
 /*
  * matchedValues.c
  */
@@ -1018,13 +1034,7 @@ LDAP_SLAPD_F (int) filter_matched_values(
  */
 LDAP_SLAPD_F (int) slap_modrdn2mods LDAP_P((
 	Operation	*op,
-	SlapReply	*rs,
-	Entry		*e,
-	LDAPRDN		oldrdn,
-	LDAPRDN		newrdn,
-	Modifications	**pmod ));
-
-LDAP_SLAPD_F (void) slap_modrdn2mods_free LDAP_P(( Modifications *mod ));
+	SlapReply	*rs ));
 
 /*
  * modify.c
@@ -1367,6 +1377,10 @@ LDAP_SLAPD_F (int) slap_discover_feature LDAP_P((
 LDAP_SLAPD_F (int) supported_feature_load LDAP_P(( struct berval *f ));
 LDAP_SLAPD_F (int) supported_feature_destroy LDAP_P(( void ));
 
+LDAP_SLAPD_F (int) entry_info_register LDAP_P(( SLAP_ENTRY_INFO_FN func, void *arg ));
+LDAP_SLAPD_F (int) entry_info_unregister LDAP_P(( SLAP_ENTRY_INFO_FN func, void *arg ));
+LDAP_SLAPD_F (void) entry_info_destroy LDAP_P(( void ));
+
 /*
  * sasl.c
  */
@@ -1574,7 +1588,7 @@ LDAP_SLAPD_F (Filter *) str2filter_x LDAP_P(( Operation *op, const char *str ));
  * syncrepl.c
  */
 
-LDAP_SLAPD_F (void)  syncrepl_add_glue LDAP_P(( 
+LDAP_SLAPD_F (int)  syncrepl_add_glue LDAP_P(( 
 					Operation*, Entry* ));
 LDAP_SLAPD_F (void) syncinfo_free LDAP_P(( struct syncinfo_s * ));
 
@@ -1820,8 +1834,8 @@ LDAP_SLAPD_F (int) fe_access_allowed LDAP_P((
 
 /* NOTE: this macro assumes that bv has been allocated
  * by ber_* malloc functions or is { 0L, NULL } */
-#if defined(HAVE_BIGNUM)
-#define UI2BVX(bv,ui,ctx) \
+#ifdef USE_MP_BIGNUM
+# define UI2BVX(bv,ui,ctx) \
 	do { \
 		char		*val; \
 		ber_len_t	len; \
@@ -1839,12 +1853,13 @@ LDAP_SLAPD_F (int) fe_access_allowed LDAP_P((
 			BER_BVZERO( (bv) ); \
 		} \
 	} while ( 0 )
-#elif defined(HAVE_GMP)
+
+#elif defined( USE_MP_GMP )
 /* NOTE: according to the documentation, the result 
  * of mpz_sizeinbase() can exceed the length of the
  * string representation of the number by 1
  */
-#define UI2BVX(bv,ui,ctx) \
+# define UI2BVX(bv,ui,ctx) \
 	do { \
 		ber_len_t	len = mpz_sizeinbase( (ui), 10 ); \
 		if ( len > (bv)->bv_len ) { \
@@ -1856,13 +1871,19 @@ LDAP_SLAPD_F (int) fe_access_allowed LDAP_P((
 		} \
 		(bv)->bv_len = len; \
 	} while ( 0 )
-#else /* ! HAVE_BIGNUM && ! HAVE_GMP */
-#ifdef HAVE_LONG_LONG
-#define UI2BV_FORMAT	"%llu"
-#else /* ! HAVE_LONG_LONG */
-#define UI2BV_FORMAT	"%lu"
-#endif /* ! HAVE_LONG_LONG */
-#define UI2BVX(bv,ui,ctx) \
+
+#else
+# if USE_MP_LONG_LONG
+#  define UI2BV_FORMAT	"%llu"
+# elif USE_MP_LONG_LONG
+#  define UI2BV_FORMAT	"%lu"
+# elif HAVE_LONG_LONG
+#  define UI2BV_FORMAT	"%llu"
+# else
+#  define UI2BV_FORMAT	"%lu"
+# endif
+
+# define UI2BVX(bv,ui,ctx) \
 	do { \
 		char		buf[] = "+9223372036854775807L"; \
 		ber_len_t	len; \
@@ -1873,7 +1894,7 @@ LDAP_SLAPD_F (int) fe_access_allowed LDAP_P((
 		(bv)->bv_len = len; \
 		AC_MEMCPY( (bv)->bv_val, buf, len + 1 ); \
 	} while ( 0 )
-#endif /* ! HAVE_GMP */
+#endif
 
 #define UI2BV(bv,ui)	UI2BVX(bv,ui,NULL)