mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-01 14:15:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Kurt Zeilenga 2001-01-17 05:30:03 +00:00
parent 54e0a5bbec
commit 0f341940c8
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/libldap/tls.c
View File

@ -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...