ITS#8671 Expose OpenLDAP specific interfaces in openldap.h

This commit is contained in:
Ondřej Kuzník 2019-06-14 11:21:27 +02:00
parent 02df0b485a
commit 6a5e30674b
4 changed files with 42 additions and 9 deletions

View File

@ -50,7 +50,7 @@ LDAPURLDesc **url;
void *params;
.LP
.ft B
#include <ldap_pvt.h>
#include <openldap.h>
.LP
.ft B
int ldap_init_fd(fd, proto, uri, ldp)

View File

@ -21,7 +21,7 @@ install-local: FORCE
$(srcdir)/ldap.h $(srcdir)/ldap_cdefs.h \
$(srcdir)/ldap_schema.h $(srcdir)/ldap_utf8.h \
$(srcdir)/slapi-plugin.h ldap_features.h \
$(srcdir)/ldif.h ; \
$(srcdir)/ldif.h $(srcdir)/openldap.h ; \
do \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$header $(DESTDIR)$(includedir); \
done

View File

@ -20,16 +20,12 @@
#ifndef _LDAP_PVT_H
#define _LDAP_PVT_H 1
#include <openldap.h> /* get public interfaces */
#include <lber.h> /* get ber_slen_t */
#include <lber_pvt.h> /* get Sockbuf_Buf */
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((
const char * ));
@ -349,8 +345,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 ));
/* sasl.c */
LDAP_F (int) ldap_pvt_sasl_generic_install LDAP_P(( Sockbuf *sb,

39
include/openldap.h Normal file
View File

@ -0,0 +1,39 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
* Copyright 2019 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted only as authorized by the OpenLDAP
* Public License.
*
* A copy of this license is available in file LICENSE in the
* top-level directory of the distribution or, alternatively, at
* <http://www.OpenLDAP.org/license.html>.
*/
/* openldap.h - Header for openldap specific interfaces. */
#ifndef _OPENLDAP_H
#define _OPENLDAP_H 1
#include <ldap.h>
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_init_fd LDAP_P((
ber_socket_t fd,
int proto,
LDAP_CONST char *url,
LDAP **ldp ));
LDAP_END_DECL
#endif /* _OPENLDAP_H */