@@ -1,3 +1,8 @@

+Mon Jan  2 18:02:20 GMT 2006 (njh)

+----------------------------------

+  * libclamav/mbox.c:	Bug fix to the patch of 28/12 for versions of curl

+  				that don't support curl_easy_strerror()

+

 Mon Jan  2 17:38:35 GMT 2006 (njh)

 ----------------------------------

   * libclamav/mbox.c:	NEW_WORLD code (not enabled by default) now finds all

@@ -15,7 +15,7 @@

  *  along with this program; if not, write to the Free Software

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.266 2006/01/02 17:37:57 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.267 2006/01/02 18:01:54 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -3880,10 +3880,13 @@ getURL(struct arg *arg)

 #ifdef	CURLOPT_ERRORBUFFER

 	if(curl_easy_perform(curl) != CURLE_OK)

 		cli_warnmsg("URL %s failed to download: %s\n", url, errorbuffer);

-#else

+#elif	(LIBCURL_VERSION_NUM >= 0x070C00)

 	if((res = curl_easy_perform(curl)) != CURLE_OK)

 		cli_warnmsg("URL %s failed to download: %s\n", url,

 			curl_easy_strerror(res));

+#else

+	if((res = curl_easy_perform(curl)) != CURLE_OK)

+		cli_warnmsg("URL %s failed to download\n", url);

 #endif

 	fclose(fp);