FIx olcMirrorMode keyword

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

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 41ddfe18043e8a66534f842494704398b1f47ee4..c79c434f8ca644792f3daea9af9ab6d531ab12b8 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -172,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,
@@ -859,6 +860,10 @@ 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 ));
 
@@ -879,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
  */
@@ -897,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,
@@ -1002,7 +1017,9 @@ 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 ));
+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
@@ -1817,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; \
@@ -1836,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 ) { \
@@ -1853,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; \
@@ -1870,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)