From 5efa557460512e58d85eaa0d6fb8935fb08f583a Mon Sep 17 00:00:00 2001 From: jmatthew Date: Thu, 21 Dec 2017 05:09:56 +0000 Subject: [PATCH] Close the right file descriptor and clean up the tls context in aldap_close(). ok zhuk@ deraadt@ --- usr.sbin/ypldap/aldap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/ypldap/aldap.c b/usr.sbin/ypldap/aldap.c index e1092c74a36..64b52d3bbd8 100644 --- a/usr.sbin/ypldap/aldap.c +++ b/usr.sbin/ypldap/aldap.c @@ -1,5 +1,5 @@ -/* $Id: aldap.c,v 1.37 2017/05/30 09:33:31 jmatthew Exp $ */ -/* $OpenBSD: aldap.c,v 1.37 2017/05/30 09:33:31 jmatthew Exp $ */ +/* $Id: aldap.c,v 1.38 2017/12/21 05:09:56 jmatthew Exp $ */ +/* $OpenBSD: aldap.c,v 1.38 2017/12/21 05:09:56 jmatthew Exp $ */ /* * Copyright (c) 2008 Alexander Schrijver @@ -70,10 +70,11 @@ aldap_application(struct ber_element *elm) int aldap_close(struct aldap *al) { - if (al->fd != -1) - if (close(al->ber.fd) == -1) - return (-1); - + if (al->tls != NULL) { + tls_close(al->tls); + tls_free(al->tls); + } + close(al->fd); ber_free(&al->ber); evbuffer_free(al->buf); free(al); @@ -120,7 +121,6 @@ aldap_tls(struct aldap *ldap, struct tls_config *cfg, const char *name) return (-1); } - ldap->fd = -1; return (0); } -- 2.20.1