X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap_pvt.h;h=1506983757700e2b67e7f658cd6340376fa1f57d;hb=eea5e60bf0b2ec0cc5cfd4065cc188c786ed25b6;hp=dbaad7b97a4311ad34948d6e48a3adae2b513672;hpb=162f00f348b3faaf661d5ba40549d0765412b14f;p=openldap diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h index dbaad7b97a..1506983757 100644 --- a/include/ldap_pvt.h +++ b/include/ldap_pvt.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2007 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,6 +27,7 @@ LDAP_BEGIN_DECL #define LDAP_PROTO_TCP 1 /* ldap:// */ #define LDAP_PROTO_UDP 2 /* reserved */ #define LDAP_PROTO_IPC 3 /* ldapi:// */ +#define LDAP_PROTO_EXT 4 /* user-defined socket/sockbuf */ LDAP_F ( int ) ldap_pvt_url_scheme2proto LDAP_P(( @@ -41,10 +42,48 @@ ldap_pvt_url_scheme_port LDAP_P(( struct ldap_url_desc; /* avoid pulling in */ +#define LDAP_PVT_URL_PARSE_NONE (0x00U) +#define LDAP_PVT_URL_PARSE_NOEMPTY_HOST (0x01U) +#define LDAP_PVT_URL_PARSE_DEF_PORT (0x02U) +#define LDAP_PVT_URL_PARSE_NOEMPTY_DN (0x04U) +#define LDAP_PVT_URL_PARSE_NODEF_SCOPE (0x08U) +#define LDAP_PVT_URL_PARSE_HISTORIC (LDAP_PVT_URL_PARSE_NODEF_SCOPE | \ + LDAP_PVT_URL_PARSE_NOEMPTY_HOST | \ + LDAP_PVT_URL_PARSE_DEF_PORT) + LDAP_F( int ) ldap_url_parse_ext LDAP_P(( LDAP_CONST char *url, - struct ldap_url_desc **ludpp )); + struct ldap_url_desc **ludpp, + unsigned flags )); + +LDAP_F (int) ldap_url_parselist LDAP_P(( /* deprecated, use ldap_url_parselist_ext() */ + struct ldap_url_desc **ludlist, + const char *url )); + +LDAP_F (int) ldap_url_parselist_ext LDAP_P(( + struct ldap_url_desc **ludlist, + const char *url, + const char *sep, + unsigned flags )); + +LDAP_F (char *) ldap_url_list2urls LDAP_P(( + struct ldap_url_desc *ludlist )); + +LDAP_F (void) ldap_free_urllist LDAP_P(( + struct ldap_url_desc *ludlist )); + +LDAP_F (int) ldap_pvt_scope2bv LDAP_P (( + int scope, struct berval *bv )); + +LDAP_F (LDAP_CONST char *) ldap_pvt_scope2str LDAP_P (( + int scope )); + +LDAP_F (int) ldap_pvt_bv2scope LDAP_P (( + struct berval *bv )); + +LDAP_F (int) ldap_pvt_str2scope LDAP_P (( + LDAP_CONST char * )); LDAP_F( char * ) ldap_pvt_ctime LDAP_P(( @@ -156,12 +195,10 @@ LDAP_F (void) ldap_pvt_hex_unescape LDAP_P(( char *s )); /* controls.c */ struct ldapcontrol; -LDAP_F (struct ldapcontrol *) ldap_control_dup LDAP_P(( - const struct ldapcontrol *ctrl )); - -LDAP_F (struct ldapcontrol **) ldap_controls_dup LDAP_P(( - struct ldapcontrol *const *ctrls )); - +LDAP_F (int) +ldap_pvt_put_control LDAP_P(( + const struct ldapcontrol *c, + BerElement *ber )); LDAP_F (int) ldap_pvt_get_controls LDAP_P(( BerElement *be, struct ldapcontrol ***ctrlsp)); @@ -172,6 +209,9 @@ struct sasl_security_properties; /* avoid pulling in */ 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)); @@ -190,14 +230,21 @@ LDAP_F (void) ldap_pvt_sasl_remove LDAP_P(( struct sockbuf * )); struct ldap; struct ldapmsg; -LDAP_F (int) ldap_open_internal_connection LDAP_P(( - struct ldap **ldp, ber_socket_t *fdp )); +/* abandon */ +LDAP_F ( int ) ldap_pvt_discard LDAP_P(( + struct ldap *ld, ber_int_t msgid )); /* messages.c */ LDAP_F( BerElement * ) ldap_get_message_ber LDAP_P(( struct ldapmsg * )); +/* open */ +LDAP_F (int) ldap_open_internal_connection LDAP_P(( + struct ldap **ldp, ber_socket_t *fdp )); +LDAP_F (int) ldap_init_fd LDAP_P(( + ber_socket_t fd, int proto, LDAP_CONST char *url, struct ldap **ldp )); + /* search.c */ LDAP_F( int ) ldap_pvt_put_filter LDAP_P(( BerElement *ber, @@ -209,6 +256,13 @@ ldap_pvt_find_wildcard LDAP_P(( const char *s )); LDAP_F( ber_slen_t ) ldap_pvt_filter_value_unescape LDAP_P(( char *filter )); +LDAP_F( ber_len_t ) +ldap_bv2escaped_filter_value_len LDAP_P(( struct berval *in )); + +LDAP_F( int ) +ldap_bv2escaped_filter_value_x LDAP_P(( struct berval *in, struct berval *out, + int inplace, void *ctx )); + /* string.c */ LDAP_F( char * ) ldap_pvt_str2upper LDAP_P(( char *str )); @@ -232,15 +286,17 @@ 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_init_def_ctx LDAP_P(( int is_server )); 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 )); +LDAP_F (void) ldap_pvt_tls_ctx_free 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, @@ -253,29 +309,25 @@ LDAP_END_DECL * Multiple precision stuff * * May use OpenSSL's BIGNUM if built with TLS, - * or GNU's multiple precision library. + * or GNU's multiple precision library. But if + * long long is available, that's big enough + * and much more efficient. * * If none is available, unsigned long data is used. */ -#ifdef HAVE_BIGNUM + +#ifdef USE_MP_BIGNUM /* * Use OpenSSL's BIGNUM */ -#if defined(HAVE_OPENSSL_CRYPTO_H) #include -#elif HAVE_CRYPTO_H -#include -#endif /* HAVE_OPENSSL_CRYPTO_H || HAVE_CRYPTO_H */ -#ifdef HAVE_OPENSSL_BN_H #include -#elif HAVE_BN_H -#include -#endif /* HAVE_OPENSSL_BN_H || HAVE_BN_H */ -typedef BIGNUM* ldap_pvt_mp_t; +typedef BIGNUM* ldap_pvt_mp_t; +#define LDAP_PVT_MP_INIT (NULL) #define ldap_pvt_mp_init(mp) \ - (mp) = BN_new() + do { (mp) = BN_new(); } while (0) /* FIXME: we rely on mpr being initialized */ #define ldap_pvt_mp_init_set(mpr,mpv) \ @@ -290,15 +342,15 @@ typedef BIGNUM* ldap_pvt_mp_t; #define ldap_pvt_mp_clear(mp) \ do { BN_free((mp)); (mp) = 0; } while (0) -#elif defined(HAVE_GMP) +#elif defined(USE_MP_GMP) /* * Use GNU's multiple precision library */ -#ifdef HAVE_GMP_H #include -#endif typedef mpz_t ldap_pvt_mp_t; +#define LDAP_PVT_MP_INIT { 0 } + #define ldap_pvt_mp_init(mp) \ mpz_init((mp)) @@ -314,30 +366,42 @@ typedef mpz_t ldap_pvt_mp_t; #define ldap_pvt_mp_clear(mp) \ mpz_clear((mp)) -#else /* ! HAVE_BIGNUM && ! HAVE_GMP */ +#else /* - * Use unsigned long + * Use unsigned long long */ -typedef unsigned long ldap_pvt_mp_t; +#ifdef USE_MP_LONG_LONG +typedef unsigned long long ldap_pvt_mp_t; +#define LDAP_PVT_MP_INIT (0LL) +#elif defined(USE_MP_LONG) +typedef unsigned long ldap_pvt_mp_t; +#define LDAP_PVT_MP_INIT (0L) +#elif defined(HAVE_LONG_LONG) +typedef unsigned long long ldap_pvt_mp_t; +#define LDAP_PVT_MP_INIT (0LL) +#else +typedef unsigned long ldap_pvt_mp_t; +#define LDAP_PVT_MP_INIT (0L) +#endif #define ldap_pvt_mp_init(mp) \ - (mp) = 0 + do { (mp) = 0; } while (0) #define ldap_pvt_mp_init_set(mpr,mpv) \ - (mpr) = (mpv) + do { (mpr) = (mpv); } while (0) #define ldap_pvt_mp_add(mpr,mpv) \ - (mpr) += (mpv) + do { (mpr) += (mpv); } while (0) #define ldap_pvt_mp_add_ulong(mp,v) \ - (mp) += (v) + do { (mp) += (v); } while (0) #define ldap_pvt_mp_clear(mp) \ - (mp) = 0 + do { (mp) = 0; } while (0) -#endif /* ! HAVE_BIGNUM && ! HAVE_GMP */ +#endif /* MP */ #include "ldap_pvt_uc.h" -#endif +#endif /* _LDAP_PVT_H */