diff options
| author |   benno <benno@openbsd.org> | 2015-12-30 15:59:55 +0000 |
|---|---|---|
| committer | benno <benno@openbsd.org> | 2015-12-30 15:59:55 +0000 |
| commit | 41d6941e451c6c3202044e9325b9ca98bdd76fe7 (patch) | |
| tree | 1914421ce6e4ef1f653eaca885d81fd4e95cf661 | |
| parent | add another combo for home/end keys that works in tmux. (diff) | |
| download | wireguard-openbsd-41d6941e451c6c3202044e9325b9ca98bdd76fe7.tar.xz wireguard-openbsd-41d6941e451c6c3202044e9325b9ca98bdd76fe7.zip | |
SSL_CTX_free() and SSL_free() check for null so dont do it in ldapd
ok jung@ tedu@ deraadt@
| -rw-r--r-- | usr.sbin/ldapd/ssl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.sbin/ldapd/ssl.c b/usr.sbin/ldapd/ssl.c index 0e6090d3580..e723e2af809 100644 --- a/usr.sbin/ldapd/ssl.c +++ b/usr.sbin/ldapd/ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.c,v 1.9 2015/12/10 18:40:46 mmcc Exp $ */ +/* $OpenBSD: ssl.c,v 1.10 2015/12/30 15:59:55 benno Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -392,8 +392,7 @@ ssl_setup(struct ldapd_config *env, struct listener *l) return; err: - if (l->ssl_ctx != NULL) - SSL_CTX_free(l->ssl_ctx); + SSL_CTX_free(l->ssl_ctx); ssl_error("ssl_setup"); fatal("ssl_setup: cannot set SSL up"); } @@ -501,8 +500,7 @@ ssl_session_init(struct conn *s) return; err: - if (ssl != NULL) - SSL_free(ssl); + SSL_free(ssl); ssl_error("ssl_session_init"); } |