Fix ITS#1983, handle writing of large requests. Only one pending request is

[openldap] / include / ldap_pvt.h

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index 82ab24d25817d60bcdc776b92eaf9751b12a5d3d..5100b14b7763ce9566103a2ad8342f28d603822d 100644 (file)
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,6 @@
 #ifndef _LDAP_PVT_H
 #define _LDAP_PVT_H 1
 
-#include <ldap_cdefs.h>
 #include <lber.h>                              /* get ber_slen_t */
 
 LDAP_BEGIN_DECL
@@ -107,6 +106,7 @@ LDAP_F (void) ldap_pvt_hex_unescape LDAP_P(( char *s ));
  * these macros assume 'x' is an ASCII x
  * and assume the "C" locale
  */
+#define LDAP_ASCII(c)          (!((c) & 0x80))
 #define LDAP_SPACE(c)          ((c) == ' ' || (c) == '\t' || (c) == '\n')
 #define LDAP_DIGIT(c)          ((c) >= '0' && (c) <= '9')
 #define LDAP_LOWER(c)          ((c) >= 'a' && (c) <= 'z')
@@ -114,6 +114,12 @@ LDAP_F (void) ldap_pvt_hex_unescape LDAP_P(( char *s ));
 #define LDAP_ALPHA(c)          (LDAP_LOWER(c) || LDAP_UPPER(c))
 #define LDAP_ALNUM(c)          (LDAP_ALPHA(c) || LDAP_DIGIT(c))
 
+#define LDAP_LDH(c)                    (LDAP_ALNUM(c) || (c) == '-')
+
+#define LDAP_HEXLOWER(c)       ((c) >= 'a' && (c) <= 'f')
+#define LDAP_HEXUPPER(c)       ((c) >= 'A' && (c) <= 'F')
+#define LDAP_HEX(c)                    (LDAP_DIGIT(c) || \
+                                                               LDAP_HEXLOWER(c) || LDAP_HEXUPPER(c))
 
 #ifdef HAVE_CYRUS_SASL
 /* cyrus.c */
@@ -139,6 +145,10 @@ LDAP_F (int) ldap_open_internal_connection LDAP_P((
        struct ldap **ldp, ber_socket_t *fdp ));
 
 /* search.c */
+LDAP_F( int ) ldap_pvt_put_filter LDAP_P((
+       BerElement *ber,
+       const char *str ));
+
 LDAP_F( char * )
 ldap_pvt_find_wildcard LDAP_P((        const char *s ));
 
@@ -152,7 +162,15 @@ ldap_pvt_str2upper LDAP_P(( char *str ));
 LDAP_F( char * )
 ldap_pvt_str2lower LDAP_P(( char *str ));
 
+LDAP_F( struct berval * )
+ldap_pvt_str2upperbv LDAP_P(( char *str, struct berval *bv ));
+
+LDAP_F( struct berval * )
+ldap_pvt_str2lowerbv LDAP_P(( char *str, struct berval *bv ));
+
 /* tls.c */
+LDAP_F (int) ldap_int_tls_config LDAP_P(( struct ldap *ld,
+       int option, const char *arg ));
 LDAP_F (int) ldap_pvt_tls_get_option LDAP_P(( struct ldap *ld,
        int option, void *arg ));
 LDAP_F (int) ldap_pvt_tls_set_option LDAP_P(( struct ldap *ld,
@@ -160,14 +178,19 @@ LDAP_F (int) ldap_pvt_tls_set_option LDAP_P(( struct ldap *ld,
 
 LDAP_F (void) ldap_pvt_tls_destroy LDAP_P(( void ));
 LDAP_F (int) ldap_pvt_tls_init LDAP_P(( void ));
+LDAP_F (int) ldap_pvt_tls_init_def_ctx LDAP_P(( void ));
 LDAP_F (int) ldap_pvt_tls_accept LDAP_P(( Sockbuf *sb, void *ctx_arg ));
 LDAP_F (int) ldap_pvt_tls_inplace LDAP_P(( Sockbuf *sb ));
-LDAP_F (void *) ldap_pvt_tls_get_ctx LDAP_P(( Sockbuf *sb ));
+LDAP_F (void *) ldap_pvt_tls_sb_ctx LDAP_P(( Sockbuf *sb ));
 
 LDAP_F (int) ldap_pvt_tls_init_default_ctx LDAP_P(( void ));
 
-LDAP_F (char *) ldap_pvt_tls_get_peer LDAP_P(( void *ctx ));
-LDAP_F (char *) ldap_pvt_tls_get_peer_dn LDAP_P(( void *ctx ));
+typedef int LDAPDN_rewrite_dummy LDAP_P (( void *dn, unsigned flags ));
+
+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,
+       LDAPDN_rewrite_dummy *func, unsigned flags ));
 LDAP_F (int) ldap_pvt_tls_get_strength LDAP_P(( void *ctx ));
 
 LDAP_END_DECL