Better delta syncrepl support, fallback to full refresh.

[openldap] / include / ldap_pvt.h

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index ea73f3c53989670aa8cf1cd7117a4e9dde566d13..2d810b04e0125e7cfa1c6cf42ef6ac8c84540b3f 100644 (file)
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * 
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -172,6 +172,9 @@ struct sasl_security_properties; /* avoid pulling in <sasl.h> */
 LDAP_F (int) ldap_pvt_sasl_secprops LDAP_P((
        const char *in,
        struct sasl_security_properties *secprops ));
+LDAP_F (void) ldap_pvt_sasl_secprops_unparse LDAP_P((
+       struct sasl_security_properties *secprops,
+       struct berval *out ));
 
 LDAP_F (void *) ldap_pvt_sasl_mutex_new LDAP_P((void));
 LDAP_F (int) ldap_pvt_sasl_mutex_lock LDAP_P((void *mutex));
@@ -241,6 +244,9 @@ LDAP_F (int) ldap_pvt_tls_init_default_ctx LDAP_P(( void ));
 
 typedef int LDAPDN_rewrite_dummy LDAP_P (( void *dn, unsigned flags ));
 
+typedef int (LDAP_TLS_CONNECT_CB) LDAP_P (( struct ldap *ld, void *ssl,
+       void *ctx, void *arg ));
+
 LDAP_F (int) ldap_pvt_tls_get_my_dn LDAP_P(( void *ctx, struct berval *dn,
        LDAPDN_rewrite_dummy *func, unsigned flags ));
 LDAP_F (int) ldap_pvt_tls_get_peer_dn LDAP_P(( void *ctx, struct berval *dn,
@@ -275,7 +281,7 @@ LDAP_END_DECL
 typedef        BIGNUM*         ldap_pvt_mp_t;
 
 #define        ldap_pvt_mp_init(mp) \
-       do { (mp) = BN_new(); BN_init((mp)); } while (0)
+       (mp) = BN_new()
 
 /* FIXME: we rely on mpr being initialized */
 #define        ldap_pvt_mp_init_set(mpr,mpv) \
@@ -319,7 +325,11 @@ typedef mpz_t              ldap_pvt_mp_t;
  * Use unsigned long
  */
 
-typedef        unsigned long   ldap_pvt_mp_t;
+#ifdef HAVE_LONG_LONG
+typedef        unsigned long long      ldap_pvt_mp_t;
+#else /* !HAVE_LONG_LONG */
+typedef        unsigned long           ldap_pvt_mp_t;
+#endif /* !HAVE_LONG_LONG */
 
 #define ldap_pvt_mp_init(mp) \
        (mp) = 0