Fix some formatting issues

[openldap] / include / ldap_pvt.h

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index 2f7da1dfbc34e627a03660fb99c1b36b2e2916b8..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
@@ -40,13 +39,6 @@ ldap_url_parse_ext LDAP_P((
        LDAP_CONST char *url,
        struct ldap_url_desc **ludpp ));
 
-LDAP_F ( int )
-ldap_pvt_domain2dn LDAP_P((
-       LDAP_CONST char *domain,
-       char **dn ));
-
-struct hostent;        /* avoid pulling in <netdb.h> */
-
 LDAP_F( char * )
 ldap_pvt_ctime LDAP_P((
        const time_t *tp,
@@ -54,9 +46,11 @@ ldap_pvt_ctime LDAP_P((
 
 LDAP_F( char *) ldap_pvt_get_fqdn LDAP_P(( char * ));
 
+struct hostent;        /* avoid pulling in <netdb.h> */
+
 LDAP_F( int )
 ldap_pvt_gethostbyname_a LDAP_P((
-       const char *name, 
+       const char *name,
        struct hostent *resbuf,
        char **buf,
        struct hostent **result,
@@ -107,28 +101,25 @@ ldap_charray2str LDAP_P((
 
 /* url.c */
 LDAP_F (void) ldap_pvt_hex_unescape LDAP_P(( char *s ));
-LDAP_F (int) ldap_pvt_unhex( int c );
 
-/* these macros assume 'x' is an ASCII x */
-#define LDAP_DNSEPARATOR(c)    ((c) == ',' || (c) == ';')
-#define LDAP_SEPARATOR(c)      ((c) == ',' || (c) == ';' || (c) == '+')
+/*
+ * 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')
+#define LDAP_UPPER(c)          ((c) >= 'A' && (c) <= 'Z')
+#define LDAP_ALPHA(c)          (LDAP_LOWER(c) || LDAP_UPPER(c))
+#define LDAP_ALNUM(c)          (LDAP_ALPHA(c) || LDAP_DIGIT(c))
 
-#define LDAP_LOWER(c)          ( (c) >= 'a' && (c) <= 'z' )
-#define LDAP_UPPER(c)          ( (c) >= 'A' && (c) <= 'Z' )
-#define LDAP_ALPHA(c)          ( LDAP_LOWER(c) || LDAP_UPPER(c) )
-#define LDAP_DIGIT(c)          ( (c) >= '0' && (c) <= '9' )
-#define LDAP_ALNUM(c)          ( LDAP_ALPHA(c) || LDAP_DIGIT(c) )
-
-#define LDAP_LEADKEYCHAR(c)    ( LDAP_ALPHA(c) )
-#define LDAP_KEYCHAR(c)                ( LDAP_ALNUM(c) || (c) == '-' )
-#define LDAP_LEADOIDCHAR(c)    ( LDAP_DIGIT(c) )
-#define LDAP_OIDCHAR(c)                ( LDAP_DIGIT(c) || (c) == '.' )
+#define LDAP_LDH(c)                    (LDAP_ALNUM(c) || (c) == '-')
 
-#define LDAP_LEADATTRCHAR(c)   ( LDAP_LEADKEYCHAR(c) || LDAP_LEADOIDCHAR(c) )
-#define LDAP_ATTRCHAR(c)               ( LDAP_KEYCHAR(c) || LDAP_OIDCHAR(c) )
-
-#define LDAP_NEEDSESCAPE(c)    ((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 */
@@ -154,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 ));
 
@@ -167,24 +162,37 @@ 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_pvt_tls_init LDAP_P(( void ));
-LDAP_F (int) ldap_pvt_tls_connect LDAP_P(( struct ldap *ld,
-       Sockbuf *sb, void *ctx_arg ));
-LDAP_F (int) ldap_pvt_tls_accept LDAP_P(( Sockbuf *sb, void *ctx_arg ));
-LDAP_F (void *) ldap_pvt_tls_sb_handle LDAP_P(( Sockbuf *sb ));
-LDAP_F (void *) ldap_pvt_tls_get_handle LDAP_P(( struct ldap *ld ));
-LDAP_F (char *) ldap_pvt_tls_get_peer LDAP_P(( void *handle ));
-LDAP_F (char *) ldap_pvt_tls_get_peer_dn LDAP_P(( void *handle ));
-LDAP_F (int) ldap_pvt_tls_get_strength LDAP_P(( void *handle ));
-LDAP_F (int) ldap_pvt_tls_inplace LDAP_P(( Sockbuf *sb ));
-LDAP_F (int) ldap_pvt_tls_start LDAP_P(( struct ldap *ld,
-       Sockbuf *sb, void *ctx_arg ));
+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,
        int option, void *arg ));
 
+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_sb_ctx LDAP_P(( Sockbuf *sb ));
+
+LDAP_F (int) ldap_pvt_tls_init_default_ctx LDAP_P(( void ));
+
+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
 
 #include "ldap_pvt_uc.h"