[Date Prev][Date Next] [Chronological] [Thread] [Top]

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

--cWoXeonUoKmBZSoM
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline

Hi Quanah,

On ti, 12 syys 2017, Quanah Gibson-Mount wrote:
>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.
Attached is a re-based patch set since there were changes in git master
in last month or so that affected the same area.

There are two patches: one for git master, one for 2.4 branch. Since
there is no functional change in the code, I'd like to see the 2.4
version in an upcoming release as that would greatly help Samba.

I'm also including an IPR notice below:

Red Hat, Inc. hereby place the following modifications to OpenLDAP
Software (and only these modifications) into the public domain.
Hence, these modifications may be freely used and/or redistributed
for any purpose with or without attribution and/or other notice.

Regards,
-- 
/ Alexander Bokovoy

--cWoXeonUoKmBZSoM
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="abokovoy-master-ldap_init_fd-move-ldap_init_fd-definition-to-ldap.h.patch"
Content-Transfer-Encoding: quoted-printable

=46rom 7abe0a2be015d8c169e5d25078a91adaaa4d799f 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           | 7 +++++++
 include/ldap_pvt.h       | 2 --
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc/man/man3/ldap_open.3 b/doc/man/man3/ldap_open.3
index 66b0b98f8..ac2c13a86 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
@@ -50,9 +50,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 e3f292dba..46de9ecf1 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -1551,6 +1551,13 @@ ldap_dup LDAP_P((
 LDAP_F( int )
 ldap_connect( LDAP *ld );
=20
+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 f1d93ac37..49f674ce5 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.13.6


--cWoXeonUoKmBZSoM
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="abokovoy-v2.4-ldap_init_fd-move-ldap_init_fd-definition-to-ldap.h.patch"
Content-Transfer-Encoding: quoted-printable

=46rom f03eb7efe69d0a929e85df4cb5b4f47c7017e0d4 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           | 7 +++++++
 include/ldap_pvt.h       | 2 --
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc/man/man3/ldap_open.3 b/doc/man/man3/ldap_open.3
index 1d5e2b5e2..4f980f2cb 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 db6869da8..b39d985dc 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -1526,6 +1526,13 @@ LDAP_F( LDAP * )
 ldap_dup LDAP_P((
 	LDAP *old ));
=20
+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 ce53cf157..bf09d6c4c 100644
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -333,8 +333,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.13.6


--cWoXeonUoKmBZSoM--