From 0f341940c81505ede89c166f439c01c305771cd7 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 17 Jan 2001 05:30:03 +0000 Subject: [PATCH] Fix bad merge --- libraries/libldap/tls.c | 4 ---- 1 file changed, 4 deletions(-) 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... -- 2.47.2