Blame SOURCES/openldap-cbinding-Make-prototypes-available-where-needed.patch

ad145f
NOTE: The patch has been adjusted to match the base code before backporting.
ad145f
ad145f
From cd914149a665167b2c5ae16baa0c438824588819 Mon Sep 17 00:00:00 2001
ad145f
From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= <ondra@openldap.org>
ad145f
Date: Tue, 19 Feb 2019 10:26:39 +0000
ad145f
Subject: [PATCH] Make prototypes available where needed
ad145f
ad145f
---
ad145f
 libraries/libldap/tls2.c   | 3 +++
ad145f
 servers/slapd/config.c     | 1 +
ad145f
 servers/slapd/proto-slap.h | 4 ++++
ad145f
 3 files changed, 8 insertions(+)
ad145f
ad145f
diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
ad145f
index 1a96b62c3..869de2eb5 100644
ad145f
--- a/libraries/libldap/tls2.c
ad145f
+++ b/libraries/libldap/tls2.c
ad145f
@@ -76,6 +76,9 @@ static oid_name oids[] = {
ad145f
 
ad145f
 #ifdef HAVE_TLS
ad145f
 
ad145f
+LDAP_F(int) ldap_pvt_tls_check_hostname LDAP_P(( LDAP *ld, void *s, const char *name_in ));
ad145f
+LDAP_F(int) ldap_pvt_tls_get_peercert LDAP_P(( void *s, struct berval *der ));
ad145f
+
ad145f
 void
ad145f
 ldap_pvt_tls_ctx_free ( void *c )
ad145f
 {
ad145f
diff --git a/servers/slapd/config.c b/servers/slapd/config.c
ad145f
index 778365fd0..2816455a3 100644
ad145f
--- a/servers/slapd/config.c
ad145f
+++ b/servers/slapd/config.c
ad145f
@@ -48,6 +48,7 @@
ad145f
 #endif
ad145f
 #include "lutil.h"
ad145f
 #include "lutil_ldap.h"
ad145f
+#include "ldif.h"
ad145f
 #include "config.h"
ad145f
 
ad145f
 #ifdef _WIN32
ad145f
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
ad145f
index 4bfdcf930..e33e3b7d9 100644
ad145f
--- a/servers/slapd/proto-slap.h
ad145f
+++ b/servers/slapd/proto-slap.h
ad145f
@@ -755,6 +755,7 @@ LDAP_SLAPD_F (int) bindconf_unparse LDAP_P((
ad145f
 LDAP_SLAPD_F (int) bindconf_tls_set LDAP_P((
ad145f
 	slap_bindconf *bc, LDAP *ld ));
ad145f
 LDAP_SLAPD_F (void) bindconf_free LDAP_P(( slap_bindconf *bc ));
ad145f
+LDAP_SLAPD_F (void) slap_client_keepalive LDAP_P(( LDAP *ld, slap_keepalive *sk ));
ad145f
 LDAP_SLAPD_F (int) slap_client_connect LDAP_P(( LDAP **ldp, slap_bindconf *sb ));
ad145f
 LDAP_SLAPD_F (int) config_generic_wrapper LDAP_P(( Backend *be,
ad145f
 	const char *fname, int lineno, int argc, char **argv ));
ad145f
@@ -1683,6 +1684,9 @@ LDAP_SLAPD_F (int) slap_sasl_external( Connection *c,
ad145f
 	slap_ssf_t ssf,	/* relative strength of external security */
ad145f
 	struct berval *authid );	/* asserted authenication id */
ad145f
 
ad145f
+LDAP_SLAPD_F (int) slap_sasl_cbinding( Connection *c,
ad145f
+	struct berval *cbv );
ad145f
+
ad145f
 LDAP_SLAPD_F (int) slap_sasl_reset( Connection *c );
ad145f
 LDAP_SLAPD_F (int) slap_sasl_close( Connection *c );
ad145f
 
ad145f
-- 
ad145f
2.26.2
ad145f