From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 17 Jan 2001 05:30:03 +0000 (+0000)
Subject: Fix bad merge
X-Git-Tag: OPENLDAP_REL_ENG_2_0_8~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f341940c81505ede89c166f439c01c305771cd7;p=thirdparty%2Fopenldap.git

Fix bad merge
---

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index 2c971a2fbc..3c98a285e0 100644
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -891,14 +891,10 @@ ldap_pvt_tls_set_option( struct ldapoptions *lo, int option, void *arg )
 int
 ldap_pvt_tls_start ( LDAP *ld, Sockbuf *sb, void *ctx_arg )
 {
-<<<<<<< tls.c
-	ldap_pvt_tls_init();
-=======
 	char *peer_cert_cn, *peer_hostname;
 	void *ssl;
 
 	(void) ldap_pvt_tls_init();
->>>>>>> 1.40
 
 	/*
 	 * Fortunately, the lib uses blocking io...