diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2015-09-17 15:21:27 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2015-09-17 15:21:27 +0000 |
| commit | af3dabbf15fa4d0e7e45a43fbf9a2195edfa941c (patch) | |
| tree | ee00f42bccdce0e3581d05a17f58bb7429f0ceda /util/net_help.c | |
| parent | 0ea28240053521a309698413a426b4d730a3d60c (diff) | |
Diffstat (limited to 'util/net_help.c')
| -rw-r--r-- | util/net_help.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/net_help.c b/util/net_help.c index e2b7c38783ab7..8b39af6b3b0dc 100644 --- a/util/net_help.c +++ b/util/net_help.c @@ -43,8 +43,8 @@ #include "util/data/dname.h" #include "util/module.h" #include "util/regional.h" -#include "ldns/parseutil.h" -#include "ldns/wire2str.h" +#include "sldns/parseutil.h" +#include "sldns/wire2str.h" #include <fcntl.h> #ifdef HAVE_OPENSSL_SSL_H #include <openssl/ssl.h> @@ -770,7 +770,7 @@ static lock_basic_t *ub_openssl_locks = NULL; static unsigned long ub_crypto_id_cb(void) { - return (unsigned long)ub_thread_self(); + return (unsigned long)log_thread_get(); } static void @@ -789,8 +789,8 @@ int ub_openssl_lock_init(void) { #if defined(HAVE_SSL) && defined(OPENSSL_THREADS) && !defined(THREADS_DISABLED) int i; - ub_openssl_locks = (lock_basic_t*)malloc( - sizeof(lock_basic_t)*CRYPTO_num_locks()); + ub_openssl_locks = (lock_basic_t*)reallocarray( + NULL, (size_t)CRYPTO_num_locks(), sizeof(lock_basic_t)); if(!ub_openssl_locks) return 0; for(i=0; i<CRYPTO_num_locks(); i++) { |