Re: (ITS#8671) Declare ldap_init_fd() in ldap.h to help external consumers

[quanah@symas.com]

Hi Alexander,

Your submission appears to be missing an IPR statement as noted at 
<https://www.openldap.org/devel/contributing.html#notice>.  This is 
required for your submission to be evaluated.  Please add an IPR at your 
earliest convenience.

Thanks!

--Quanah

--On Wednesday, June 07, 2017 11:44 AM +0000 abokovoy@redhat.com wrote:

>
> --ce5n3c4hsgyizewc
> Content-Type: text/plain; charset=us-ascii; format=flowed
> Content-Disposition: inline
>
> Patch attached.
>
> --
> / Alexander Bokovoy
>
> --ce5n3c4hsgyizewc
> Content-Type: text/plain; charset=us-ascii
> Content-Disposition: attachment;
> filename="abokovoy-ldap_init_fd-move-ldap_init_fd-definition-to-ldap.h.pa
> tch" Content-Transfer-Encoding: quoted-printable
>
> =46rom 2c1f3afd8098b2a345a900effa1a2e5c3f9e3b08 Mon Sep 17 00:00:00 2001
> =46rom: Alexander Bokovoy <abokovoy@redhat.com>
> Date: Mon, 5 Jun 2017 14:43:58 +0300
> Subject: [PATCH] ldap_init_fd: move ldap_init_fd() definition to ldap.h
>
> While OpenLDAP team position is that all code in OpenLDAP source
> distribution can be used by users, most distributions do not ship
> ldap_pvt.h as part of openldap-devel (sub)package.
>
> Move ldap_init_fd() to ldap.h to facilitate external users who have a
> need to integrate OpenLDAP with their own event loop processing.
> ---
>  doc/man/man3/ldap_open.3 | 5 +----
>  include/ldap.h           | 8 ++++++++
>  include/ldap_pvt.h       | 2 --
>  3 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/doc/man/man3/ldap_open.3 b/doc/man/man3/ldap_open.3
> index 1d5e2b5..4f980f2 100644
> --- a/doc/man/man3/ldap_open.3
> +++ b/doc/man/man3/ldap_open.3
> @@ -3,7 +3,7 @@
>  .\" Copyright 1998-2017 The OpenLDAP Foundation All Rights Reserved.
>  .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
>  .SH NAME
> -ldap_init, ldap_initialize, ldap_open \- Initialize the LDAP library and
> o= pen a connection to an LDAP server
> +ldap_init, ldap_initialize, ldap_open, ldap_init_fd \- Initialize the
> LDAP=  library and open a connection to an LDAP server
>  .SH LIBRARY
>  OpenLDAP LDAP (libldap, \-lldap)
>  .SH SYNOPSIS
> @@ -45,9 +45,6 @@ LDAPURLDesc **url;
>  void *params;
>  .LP
>  .ft B
> -#include <ldap_pvt.h>
> -.LP
> -.ft B
>  int ldap_init_fd(fd, proto, uri, ldp)
>  .ft
>  ber_socket_t fd;
> diff --git a/include/ldap.h b/include/ldap.h
> index 588e906..dd0c118 100644
> --- a/include/ldap.h
> +++ b/include/ldap.h
> @@ -1548,6 +1548,14 @@ LDAP_F( LDAP * )
>  ldap_dup LDAP_P((
>  	LDAP *old ));
> =20
> +/* open */
> +LDAP_F (int)
> +ldap_init_fd LDAP_P((
> +	ber_socket_t fd,
> +	int proto,
> +	LDAP_CONST char *url,
> +	LDAP **ldp ));
> +
>  /*
>   * in tls.c
>   */
> diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
> index f1d93ac..49f674c 100644
> --- a/include/ldap_pvt.h
> +++ b/include/ldap_pvt.h
> @@ -344,8 +344,6 @@ ldap_get_message_ber LDAP_P((
>  /* 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 ));
> =20
>  /* sasl.c */
>  LDAP_F (int) ldap_pvt_sasl_generic_install LDAP_P(( Sockbuf *sb,
> --=20
> 2.9.3
>
>
> --ce5n3c4hsgyizewc--
>
>
>



--

Quanah Gibson-Mount
Product Architect
Symas Corporation
Packaged, certified, and supported LDAP solutions powered by OpenLDAP:
<http://www.symas.com>