From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 5 Sep 2014 12:29:28 +0000 (+0200)
Subject: reentrant fixes for gnutls_x509_trust_list_add_trust_dir() handle unknown file types
X-Git-Tag: gnutls_3_4_0~980
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3362b784a2c5f4a6bb1bf4c3afc6fa6e1c8a35a6;p=thirdparty%2Fgnutls.git

reentrant fixes for gnutls_x509_trust_list_add_trust_dir() handle unknown file types
---

diff --git a/lib/x509/verify-high2.c b/lib/x509/verify-high2.c
index fd90a99c05..058746ca54 100644
--- a/lib/x509/verify-high2.c
+++ b/lib/x509/verify-high2.c
@@ -303,12 +303,14 @@ int load_dir_certs(const char *dirname,
 	dirp = opendir(dirname);
 	if (dirp != NULL) {
 		do {
+#ifdef _WIN32
 			d = readdir(dirp);
-			if (d != NULL
-#ifndef _WIN32
-				&& d->d_type == DT_REG
+			if (d != NULL) {
+#else
+			struct dirent e;
+			ret = readdir_r(dirp, &e, &d);
+			if (ret == 0 && (d->d_type == DT_REG || d->d_type == DT_LNK || d->d_type == DT_UNKNOWN)) {
 #endif
-				) {
 				snprintf(path, sizeof(path), "%s/%s",
 					 dirname, d->d_name);