[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa
Stephen Gran
steve at lobefin.net
Thu Sep 4 12:36:49 UTC 2008
The following commit has been merged in the debian/unstable branch:
commit f8c64bb13e44ddd12ba2fec980d26c6d96aeb792
Author: Stephen Gran <steve at lobefin.net>
Date: Thu Sep 4 13:25:25 2008 +0100
Revert "reapply r3852, which somehow got lost (bb #1039)."
This reverts commit 71eff3ee6760eb60c596637e6da3606010c16306.
diff --git a/libclamav/mbox.c b/libclamav/mbox.c
index 5f50bfc..586ccad 100644
--- a/libclamav/mbox.c
+++ b/libclamav/mbox.c
@@ -4456,9 +4456,6 @@ my_r_gethostbyname(const char *hostname, struct hostent *hp, char *buf, size_t l
{
struct hostent *hp2;
int ret = -1;
-#ifdef CL_THREAD_SAFE
- static pthread_mutex_t hostent_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
if((hostname == NULL) || (hp == NULL))
return -1;
@@ -4483,8 +4480,9 @@ my_r_gethostbyname(const char *hostname, struct hostent *hp, char *buf, size_t l
return h_errno;
#else
/* Single thread the code e.g. VS2005 */
-
#ifdef CL_THREAD_SAFE
+ static pthread_mutex_t hostent_mutex = PTHREAD_MUTEX_INITIALIZER;
+
pthread_mutex_lock(&hostent_mutex);
#endif
if((hp2 = gethostbyname(hostname)) == NULL) {
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list