X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap_pvt.h;h=c145046f2959d930f7d5b3f70fe6c8454d305a93;hb=371f8efb9c7bcc00d6d6870079b0b078ba60bdbc;hp=f849375d1c4e8aad9ee84c1b09b75a12e04b4d5d;hpb=5a0bbd7eed189cf627c9b3b186eb277df30de5e8;p=openldap

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index f849375d1c..c145046f29 100644
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -21,19 +21,33 @@
 
 LDAP_BEGIN_DECL
 
-LIBLDAP_F ( int )
+#define LDAP_PROTO_TCP 1 /* ldap://  */
+#define LDAP_PROTO_UDP 2 /* reserved */
+#define LDAP_PROTO_IPC 3 /* ldapi:// */
+
+LDAP_F ( int )
+ldap_pvt_url_scheme2proto LDAP_P((
+	const char * ));
+LDAP_F ( int )
+ldap_pvt_url_scheme2tls LDAP_P((
+	const char * ));
+
+
+LDAP_F ( int )
 ldap_pvt_domain2dn LDAP_P((
 	LDAP_CONST char *domain,
 	char **dn ));
 
 struct hostent;	/* avoid pulling in <netdb.h> */
 
-LIBLDAP_F( char * )
+LDAP_F( char * )
 ldap_pvt_ctime LDAP_P((
 	const time_t *tp,
 	char *buf ));
 
-LIBLDAP_F( int )
+LDAP_F( char *) ldap_pvt_get_fqdn LDAP_P(( char * ));
+
+LDAP_F( int )
 ldap_pvt_gethostbyname_a LDAP_P((
 	const char *name, 
 	struct hostent *resbuf,
@@ -41,7 +55,7 @@ ldap_pvt_gethostbyname_a LDAP_P((
 	struct hostent **result,
 	int *herrno_ptr ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_pvt_gethostbyaddr_a LDAP_P((
 	const char *addr,
 	int len,
@@ -54,40 +68,44 @@ ldap_pvt_gethostbyaddr_a LDAP_P((
 
 /* charray.c */
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_charray_add LDAP_P((
     char	***a,
     char	*s ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_charray_merge LDAP_P((
     char	***a,
     char	**s ));
 
-LIBLDAP_F( void )
+LDAP_F( void )
 ldap_charray_free LDAP_P(( char **a ));
 
-LIBLDAP_F( int )
+LDAP_F( int )
 ldap_charray_inlist LDAP_P((
     char	**a,
     char	*s ));
 
-LIBLDAP_F( char ** )
+LDAP_F( char ** )
 ldap_charray_dup LDAP_P(( char **a ));
 
-LIBLDAP_F( char ** )
+LDAP_F( char ** )
 ldap_str2charray LDAP_P((
-	char *str,
-	char *brkstr ));
+	const char *str,
+	const char *brkstr ));
+
+LDAP_F( char * )
+ldap_charray2str LDAP_P((
+	char **array, const char* sep ));
 
 /* url.c */
-LIBLDAP_F (void) ldap_pvt_hex_unescape LDAP_P(( char *s ));
-LIBLDAP_F (int) ldap_pvt_unhex( int 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) == '+')
-#define LDAP_SPACE(c)		((c) == ' ' || (c) == '\n')
+#define LDAP_SPACE(c)		((c) == ' ' || (c) == '\t' || (c) == '\n')
 
 #define LDAP_LOWER(c)		( (c) >= 'a' && (c) <= 'z' )
 #define LDAP_UPPER(c)		( (c) >= 'A' && (c) <= 'Z' )
@@ -101,49 +119,66 @@ LIBLDAP_F (int) ldap_pvt_unhex( int c );
 #define LDAP_OIDCHAR(c)		( LDAP_DIGIT(c) || (c) == '.' )
 
 #define LDAP_LEADATTRCHAR(c)	( LDAP_LEADKEYCHAR(c) || LDAP_LEADOIDCHAR(c) )
-#define LDAP_ATTRCHAR(c)		( LDAP_KEYCHAR((c)) || (c) == '.' )
+#define LDAP_ATTRCHAR(c)		( LDAP_KEYCHAR(c) || LDAP_OIDCHAR(c) )
 
 #define LDAP_NEEDSESCAPE(c)	((c) == '\\' || (c) == '"')
 
 #ifdef HAVE_CYRUS_SASL
-/* sasl.c */
+/* cyrus.c */
+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_mutex_new LDAP_P((void));
+LDAP_F (int) ldap_pvt_sasl_mutex_lock LDAP_P((void *mutex));
+LDAP_F (int) ldap_pvt_sasl_mutex_unlock LDAP_P((void *mutex));
+LDAP_F (void) ldap_pvt_sasl_mutex_dispose LDAP_P((void *mutex));
+
+struct sockbuf; /* avoid pulling in <lber.h> */
+LDAP_F (int) ldap_pvt_sasl_install LDAP_P(( struct sockbuf *, void * ));
+#endif /* HAVE_CYRUS_SASL */
 
-#include <sasl.h>
-#include <ldap.h> 
+#define LDAP_PVT_SASL_LOCAL_SSF	71	/* SSF for Unix Domain Sockets */
 
-LIBLDAP_F (int) ldap_pvt_sasl_init LDAP_P(( void )); /* clientside init */
-LIBLDAP_F (int) ldap_pvt_sasl_install LDAP_P(( Sockbuf *, void * ));
-LIBLDAP_F (int) ldap_pvt_sasl_err2ldap LDAP_P(( int ));
-LIBLDAP_F (int) ldap_pvt_sasl_bind LDAP_P(( LDAP *, LDAP_CONST char *, LDAP_CONST char *, LDAP_CONST sasl_callback_t *, LDAPControl **, LDAPControl ** ));
-#endif /* HAVE_CYRUS_SASL */
+struct ldap;
+LDAP_F (int) ldap_open_internal_connection LDAP_P((
+	struct ldap **ldp, ber_socket_t *fdp ));
 
 /* search.c */
-LIBLDAP_F( char * )
-ldap_pvt_find_wildcard LDAP_P((	char *s ));
+LDAP_F( char * )
+ldap_pvt_find_wildcard LDAP_P((	const char *s ));
 
-LIBLDAP_F( ber_slen_t )
+LDAP_F( ber_slen_t )
 ldap_pvt_filter_value_unescape LDAP_P(( char *filter ));
 
 /* string.c */
-LIBLDAP_F( char * )
+LDAP_F( char * )
 ldap_pvt_str2upper LDAP_P(( char *str ));
 
-LIBLDAP_F( char * )
+LDAP_F( char * )
 ldap_pvt_str2lower LDAP_P(( char *str ));
 
 /* tls.c */
 struct ldapoptions;
+struct ldap;
 
-LIBLDAP_F (int) ldap_pvt_tls_init LDAP_P(( void ));
-LIBLDAP_F (int) ldap_pvt_tls_config LDAP_P(( struct ldapoptions *lo, int option, const char *arg ));
-LIBLDAP_F (int) ldap_pvt_tls_connect LDAP_P(( Sockbuf *sb, void *ctx_arg ));
-LIBLDAP_F (int) ldap_pvt_tls_accept LDAP_P(( Sockbuf *sb, void *ctx_arg ));
-LIBLDAP_F (int) ldap_pvt_tls_get_option LDAP_P(( struct ldapoptions *lo, int option, void *arg ));
-LIBLDAP_F (int) ldap_pvt_tls_set_option LDAP_P(( struct ldapoptions *lo, int option, void *arg ));
-LIBLDAP_F (int) ldap_pvt_tls_inplace LDAP_P(( Sockbuf *sb ));
-LIBLDAP_F (int) ldap_pvt_tls_start LDAP_P(( Sockbuf *sb, void *ctx_arg ));
+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 (const char *) ldap_pvt_tls_get_peer 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_pvt_tls_get_option LDAP_P(( struct ldapoptions *lo, int option, void *arg ));
+LDAP_F (int) ldap_pvt_tls_set_option LDAP_P(( struct ldapoptions *lo, int option, void *arg ));
 
 LDAP_END_DECL
 
+#include "ldap_pvt_uc.h"
+
 #endif